Skip to content

Commit ecc2b4c

Browse files
committed
Update ember-source and @glimmer/* to get tests passing
We had missed some of the changes which affected how the two packages related; bumping both gets us back to passing. In a future (separate!) PR we can also bump ember-cli-babel to dodge a lot of these warnings, and others can also take us to using ember-source v4.
1 parent 5443048 commit ecc2b4c

File tree

4 files changed

+36
-17
lines changed

4 files changed

+36
-17
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
},
5454
"devDependencies": {
5555
"@ember/optional-features": "2.0.0",
56-
"@glimmer/component": "^1.0.4",
57-
"@glimmer/tracking": "^1.0.4",
56+
"@glimmer/component": "^1.1.2",
57+
"@glimmer/tracking": "^1.1.2",
5858
"@release-it-plugins/lerna-changelog": "^5.0.0",
5959
"@tsconfig/ember": "^1.0.0",
6060
"@typed-ember/renovate-config": "1.2.1",
@@ -98,7 +98,7 @@
9898
"ember-maybe-import-regenerator": "0.1.6",
9999
"ember-qunit": "4.6.0",
100100
"ember-resolver": "8.0.2",
101-
"ember-source": "3.23.0",
101+
"ember-source": "~3.28.0",
102102
"ember-try": "1.4.0",
103103
"eslint": "8.7.0",
104104
"eslint-config-prettier": "8.3.0",

ts/tsconfig.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
"esModuleInterop": true,
2424
// We *really* don't want this on, but our hand is forced somewhat at the
2525
// moment: the types for `console-ui` are correct for consuming `inquirer`
26-
// in the pre-Node16 world, but
26+
// in the pre-Node16 world, but don't interoperate correctly when consumed
27+
// by a CJS-default package in the TS Node16+ world *and* consume an ESM
28+
// package. Our path forward there is to update `console-ui` to publish a
29+
// dual-mode package with types and runtime code to support it.
2730
"skipLibCheck": true
2831
}
2932
}

tsconfig.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@
3232
"in-repo-b/*": [
3333
"tests/dummy/lib/in-repo-b/addon/*"
3434
]
35-
}
35+
},
36+
// We *really* don't want this on, but our hand is forced somewhat at the
37+
// moment: the types for `console-ui` are correct for consuming `inquirer`
38+
// in the pre-Node16 world, but don't interoperate correctly when consumed
39+
// by a CJS-default package in the TS Node16+ world *and* consume an ESM
40+
// package. Our path forward there is to update `console-ui` to publish a
41+
// dual-mode package with types and runtime code to support it.
42+
"skipLibCheck": true
3643
},
3744
"include": [
3845
"tests"

yarn.lock

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,7 @@
10591059
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
10601060
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
10611061

1062-
"@glimmer/component@^1.0.4", "@glimmer/component@^1.1.0":
1062+
"@glimmer/component@^1.1.0", "@glimmer/component@^1.1.2":
10631063
version "1.1.2"
10641064
resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c"
10651065
integrity sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==
@@ -1089,7 +1089,7 @@
10891089
resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
10901090
integrity sha512-JKF/a9I9jw6fGoz8kA7LEQslrwJ5jms5CXhu/aqkBWk+PmZ6pTl8mlb/eJ/5ujBGTiQzBhy5AIWF712iA+4/mw==
10911091

1092-
"@glimmer/tracking@^1.0.4":
1092+
"@glimmer/tracking@^1.1.2":
10931093
version "1.1.2"
10941094
resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.1.2.tgz#74e71be07b0a7066518d24044d2665d0cf8281eb"
10951095
integrity sha512-cyV32zsHh+CnftuRX84ALZpd2rpbDrhLhJnTXn9W//QpqdRZ5rdMsxSY9fOsj0CKEc706tmEU299oNnDc0d7tA==
@@ -1107,6 +1107,13 @@
11071107
resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.44.0.tgz#03d127097dc9cb23052cdb7fcae59d0a9dca53e1"
11081108
integrity sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==
11091109

1110+
"@glimmer/[email protected]":
1111+
version "0.80.3"
1112+
resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.3.tgz#434b62172318cac43830d3ac29818cf2c5f111c1"
1113+
integrity sha512-9ej6xlm5MzHBJ5am2l0dbbn8Z0wJoYoMpM8FcrGMlUP6SPMLWxvxpMsApgQo8u6dvZRCjR3/bw3fdf7GOy0AFw==
1114+
dependencies:
1115+
babel-plugin-debug-macros "^0.3.4"
1116+
11101117
11111118
version "4.2.1"
11121119
resolved "https://registry.yarnpkg.com/@hapi/b64/-/b64-4.2.1.tgz#bf8418d7907c5e73463f2e3b5c6fca7e9f2a1357"
@@ -5625,7 +5632,7 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.8.1:
56255632
ember-cli-version-checker "^2.1.2"
56265633
semver "^5.5.0"
56275634

5628-
ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.2, ember-cli-babel@^7.7.3:
5635+
ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.2, ember-cli-babel@^7.7.3:
56295636
version "7.26.11"
56305637
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
56315638
integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -6061,23 +6068,25 @@ ember-source-channel-url@^3.0.0:
60616068
dependencies:
60626069
node-fetch "^2.6.0"
60636070

6064-
ember-source@3.23.0:
6065-
version "3.23.0"
6066-
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.23.0.tgz#f40a92c63c4a36634cae9afdb34aaef95b246739"
6067-
integrity sha512-y7TqxqqbhnT3ZMMn6IX2/Dbd0bM/bqasys9qrAGdZYJbz3XFhI0Lm3SMPph+d77L+VgLgts7Yz+Kx2slV1ERiw==
6071+
ember-source@~3.28.0:
6072+
version "3.28.9"
6073+
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.28.9.tgz#804c56b2d71d3cc3decff15a3273bb35d668300a"
6074+
integrity sha512-Fy7V3yvj+3oyo2+ke52aaihKMcFnnF7Oj9ixj547yzh2faqRfqouB5ZSiwXFH8rxw22rKaM8DiuQO4JN2Ay6xQ==
60686075
dependencies:
60696076
"@babel/helper-module-imports" "^7.8.3"
60706077
"@babel/plugin-transform-block-scoping" "^7.8.3"
60716078
"@babel/plugin-transform-object-assign" "^7.8.3"
60726079
"@ember/edition-utils" "^1.2.0"
6073-
babel-plugin-debug-macros "^0.3.3"
6080+
"@glimmer/vm-babel-plugins" "0.80.3"
6081+
babel-plugin-debug-macros "^0.3.4"
60746082
babel-plugin-filter-imports "^4.0.0"
60756083
broccoli-concat "^4.2.4"
60766084
broccoli-debug "^0.6.4"
6085+
broccoli-file-creator "^2.1.1"
60776086
broccoli-funnel "^2.0.2"
60786087
broccoli-merge-trees "^4.2.0"
60796088
chalk "^4.0.0"
6080-
ember-cli-babel "^7.19.0"
6089+
ember-cli-babel "^7.23.0"
60816090
ember-cli-get-component-path-option "^1.0.0"
60826091
ember-cli-is-package-missing "^1.0.0"
60836092
ember-cli-normalize-entity-name "^1.0.0"
@@ -6086,9 +6095,9 @@ [email protected]:
60866095
ember-cli-version-checker "^5.1.1"
60876096
ember-router-generator "^2.0.0"
60886097
inflection "^1.12.0"
6089-
jquery "^3.5.0"
6098+
jquery "^3.5.1"
60906099
resolve "^1.17.0"
6091-
semver "^6.1.1"
6100+
semver "^7.3.4"
60926101
silent-error "^1.1.1"
60936102

60946103
ember-test-waiters@^1.1.1:
@@ -9157,7 +9166,7 @@ iterate-value@^1.0.2:
91579166
es-get-iterator "^1.0.2"
91589167
iterate-iterator "^1.0.1"
91599168

9160-
jquery@^3.5.0:
9169+
jquery@^3.5.1:
91619170
version "3.6.1"
91629171
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
91639172
integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==

0 commit comments

Comments
 (0)