Skip to content

Commit

Permalink
Merge branch 'master' into allow-ember-test-helper-v4
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkszepp
mkszepp committed Oct 10, 2024
2 parents c3e0687 + be3540d commit d01bfc3
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 49 deletions.
26 changes: 13 additions & 13 deletions guides/typescript/1-configuration.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ potential volatility.
"compilerOptions": {
+ "types": [
+ "ember-source/types",
+ "ember-data/unstable-preview-types",
+ "@ember-data/store/unstable-preview-types",
+ "@ember-data/adapter/unstable-preview-types",
+ "@ember-data/graph/unstable-preview-types",
+ "@ember-data/json-api/unstable-preview-types",
+ "@ember-data/legacy-compat/unstable-preview-types",
+ "@ember-data/request/unstable-preview-types",
+ "@ember-data/request-utils/unstable-preview-types",
+ "@ember-data/model/unstable-preview-types",
+ "@ember-data/serializer//unstable-preview-types",
+ "@ember-data/tracking/unstable-preview-types",
+ "@warp-drive/core-types/unstable-preview-types"
+ "./node_modules/ember-data/unstable-preview-types",
+ "./node_modules/@ember-data/store/unstable-preview-types",
+ "./node_modules/@ember-data/adapter/unstable-preview-types",
+ "./node_modules/@ember-data/graph/unstable-preview-types",
+ "./node_modules/@ember-data/json-api/unstable-preview-types",
+ "./node_modules/@ember-data/legacy-compat/unstable-preview-types",
+ "./node_modules/@ember-data/request/unstable-preview-types",
+ "./node_modules/@ember-data/request-utils/unstable-preview-types",
+ "./node_modules/@ember-data/model/unstable-preview-types",
+ "./node_modules/@ember-data/serializer/unstable-preview-types",
+ "./node_modules/@ember-data/tracking/unstable-preview-types",
+ "./node_modules/@warp-drive/core-types/unstable-preview-types"
+ ]
}
}
Expand All @@ -64,7 +64,7 @@ potential volatility.
+ "@ember-data-types/request/unstable-preview-types",
+ "@ember-data-types/request-utils/unstable-preview-types",
+ "@ember-data-types/model/unstable-preview-types",
+ "@ember-data-types/serializer//unstable-preview-types",
+ "@ember-data-types/serializer/unstable-preview-types",
+ "@ember-data-types/tracking/unstable-preview-types",
+ "@warp-drive-types/core-types/unstable-preview-types"
+ ]
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@glint/environment-ember-template-imports": "^1.4.0",
"@glint/template": "^1.4.0",
"@types/semver": "^7.5.8",
"bun-types": "^1.1.8",
"bun-types": "^1.1.29",
"chalk": "^4.1.2",
"co": "^4.6.0",
"command-line-args": "^5.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/build-config/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@babel/core": "^7.24.5",
"pnpm-sync-dependencies-meta-injected": "0.0.14",
"typescript": "^5.4.5",
"bun-types": "^1.1.8",
"bun-types": "^1.1.29",
"vite": "^5.2.11"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/diagnostic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"@babel/preset-typescript": "^7.24.1",
"@babel/runtime": "^7.24.5",
"@warp-drive/internal-config": "workspace:5.4.0-alpha.109",
"bun-types": "^1.1.8",
"bun-types": "^1.1.29",
"@ember/test-helpers": "4.0.4",
"ember-source": "~5.8.0",
"@glimmer/component": "^1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/schema/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"peerDependencies": {},
"dependencies": {},
"devDependencies": {
"bun-types": "1.1.8"
"bun-types": "1.1.29"
},
"engines": {
"node": ">= 18.20.3"
Expand Down
76 changes: 47 additions & 29 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/ember-data__request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@warp-drive/diagnostic": "workspace:0.0.0-alpha.95",
"@warp-drive/holodeck": "workspace:0.0.0-alpha.95",
"@warp-drive/internal-config": "workspace:5.4.0-alpha.109",
"bun-types": "^1.1.8",
"bun-types": "^1.1.29",
"ember-auto-import": "^2.7.4",
"ember-cli": "~5.9.0",
"ember-cli-babel": "^8.2.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/embroider-basic-compat/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"ember-cli": "~5.9.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-fastboot": "^4.1.4",
"ember-cli-fastboot": "^4.1.5",
"ember-cli-fastboot-testing": "^0.6.2",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/fastboot/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"ember-cli": "~5.9.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-fastboot": "^4.1.4",
"ember-cli-fastboot": "^4.1.5",
"ember-cli-fastboot-testing": "^0.6.2",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand Down

0 comments on commit d01bfc3

Please sign in to comment.