Skip to content

Commit

Permalink
Fix deps, (because re-rolling the lockfile breaks everything) (#680)
Browse files Browse the repository at this point in the history
* Does CI have failing jobs right now?

* Set resolutions

* Pin, don't use ^

* Add @glimmer/interfaces to pinned list

* Set more resolutions

* re-roll lockfile

* Force a specific version of all the glimmer deps
  • Loading branch information
NullVoxPopuli authored Jan 14, 2024
1 parent 785a439 commit ea64ec5
Show file tree
Hide file tree
Showing 5 changed files with 3,184 additions and 2,943 deletions.
7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,17 @@
"typescript": "~4.8.0"
},
"resolutions:notes": {
"@glimmer/validator": "Newer versions of @glimmer/* are ESM-only, and Glint is compiled to CJS, so newer versions of @glimmer/* are not compatible",
"@types/yargs": "Locking temporarily to avoid an issue with the ESM types in 17.0.14; see DT#63373",
"@types/node": "Locking to avoid conflicts between the declared version in packages/core and floating '*' versions when we run in CI without the lockfile"
},
"resolutions": {
"@glimmer/manager": "0.84.3",
"@glimmer/interfaces": "0.84.3",
"@glimmer/runtime": "0.84.3",
"@glimmer/reference": "0.84.3",
"@glimmer/util": "0.84.3",
"@glimmer/validator": "0.84.3",
"@types/yargs": "17.0.13",
"@types/node": "^20.10.6",
"ember-cli-htmlbars": "^6.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"typescript": ">=4.8.0"
},
"dependencies": {
"@glimmer/syntax": "^0.84.2",
"@glimmer/syntax": "^0.84.3",
"escape-string-regexp": "^4.0.0",
"semver": "^7.5.2",
"silent-error": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion test-packages/js-glimmerx-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@glimmerx/babel-preset": "^0.6.7",
"@glimmer/babel-plugin-glimmer-env": "~2.0.0-beta.12",
"@glimmer/env": "^0.1.7",
"@glimmer/syntax": "^0.84.2",
"@glimmer/syntax": "^0.84.3",
"@glimmerx/component": "^0.6.7",
"@glimmerx/core": "^0.6.7",
"@glimmerx/eslint-plugin": "^0.6.7",
Expand Down
2 changes: 1 addition & 1 deletion test-packages/ts-glimmerx-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@babel/preset-typescript": "^7.10.1",
"@glimmer/babel-plugin-glimmer-env": "~2.0.0-beta.12",
"@glimmer/env": "^0.1.7",
"@glimmer/syntax": "^0.84.2",
"@glimmer/syntax": "^0.84.3",
"@glimmerx/babel-preset": "^0.6.7",
"@glimmerx/component": "^0.6.7",
"@glimmerx/core": "^0.6.7",
Expand Down
Loading

0 comments on commit ea64ec5

Please sign in to comment.