diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 126088bcaa0..d5c498209b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3355,15 +3355,33 @@ importers: tests/embroider-basic-compat: dependencies: + '@ember-data/adapter': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/adapter(@babel/core@7.23.2)(@ember-data/legacy-compat@5.5.0-alpha.11)(@ember-data/store@5.5.0-alpha.11)(@ember/string@3.1.1)(ember-inflector@4.0.2) + '@ember-data/legacy-compat': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/legacy-compat(@babel/core@7.23.2)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/json-api@5.5.0-alpha.11)(@ember-data/request@5.5.0-alpha.11)(@ember-data/store@5.5.0-alpha.11)(@warp-drive/core-types@5.5.0-alpha.11) + '@ember-data/model': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/model(@babel/core@7.23.2)(@ember-data/debug@5.5.0-alpha.11)(@ember-data/graph@5.5.0-alpha.11)(@ember-data/json-api@5.5.0-alpha.11)(@ember-data/legacy-compat@5.5.0-alpha.11)(@ember-data/store@5.5.0-alpha.11)(@ember-data/tracking@5.5.0-alpha.11)(@ember/string@3.1.1)(@warp-drive/core-types@5.5.0-alpha.11)(ember-inflector@4.0.2) + '@ember-data/request': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/request(@babel/core@7.23.2)(@warp-drive/core-types@5.5.0-alpha.11) + '@ember-data/store': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/store(@babel/core@7.23.2)(@ember-data/request@5.5.0-alpha.11)(@ember-data/tracking@5.5.0-alpha.11)(@ember/string@3.1.1)(@warp-drive/core-types@5.5.0-alpha.11) + '@ember-data/tracking': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/tracking(@babel/core@7.23.2)(ember-source@5.4.0) '@ember/string': specifier: 3.1.1 version: 3.1.1(@babel/core@7.23.2) + '@warp-drive/core-types': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/core-types(@babel/core@7.23.2) ember-auto-import: specifier: ^2.6.3 version: 2.6.3(webpack@5.89.0) - ember-data: - specifier: workspace:5.5.0-alpha.11 - version: file:packages/-ember-data(@babel/core@7.23.2)(@ember/string@3.1.1)(ember-source@5.4.0) ember-inflector: specifier: ^4.0.2 version: 4.0.2(@babel/core@7.23.2) @@ -3453,14 +3471,26 @@ importers: specifier: ^3.0.0 version: 3.0.0 typescript: - specifier: ~5.2.2 + specifier: ^5.2.2 version: 5.2.2 dependenciesMeta: + '@ember-data/adapter': + injected: true + '@ember-data/legacy-compat': + injected: true + '@ember-data/model': + injected: true + '@ember-data/request': + injected: true + '@ember-data/store': + injected: true + '@ember-data/tracking': + injected: true '@ember-data/unpublished-test-infra': injected: true '@ember/string': injected: true - ember-data: + '@warp-drive/core-types': injected: true ember-inflector: injected: true @@ -4172,6 +4202,9 @@ importers: '@babel/runtime': specifier: ^7.23.2 version: 7.23.2 + '@ember-data/debug': + specifier: workspace:5.5.0-alpha.11 + version: file:packages/debug(@ember-data/store@5.5.0-alpha.11)(@ember/string@3.1.1) '@ember-data/graph': specifier: workspace:5.5.0-alpha.11 version: file:packages/graph(@babel/core@7.23.2)(@ember-data/store@5.5.0-alpha.11)(@warp-drive/core-types@5.5.0-alpha.11) @@ -4299,6 +4332,8 @@ importers: specifier: ^5.89.0 version: 5.89.0 dependenciesMeta: + '@ember-data/debug': + injected: true '@ember-data/graph': injected: true '@ember-data/json-api': diff --git a/tests/embroider-basic-compat/app/adapters/application.ts b/tests/embroider-basic-compat/app/adapters/application.ts index 091f5ab1225..c93f8124c4f 100644 --- a/tests/embroider-basic-compat/app/adapters/application.ts +++ b/tests/embroider-basic-compat/app/adapters/application.ts @@ -2,9 +2,9 @@ import RESTAdapter from '@ember-data/adapter/rest'; import type { SnapshotRecordArray } from '@ember-data/legacy-compat/-private'; export default class ApplicationAdapter extends RESTAdapter { - namespace = 'api'; + override namespace = 'api'; - urlForFindAll(type: string, snapshots: SnapshotRecordArray) { + override urlForFindAll(type: string, snapshots: SnapshotRecordArray) { let url = super.urlForFindAll(type, snapshots); if (url.endsWith('/')) { url = url.substring(0, url.length - 2); diff --git a/tests/embroider-basic-compat/package.json b/tests/embroider-basic-compat/package.json index 87d7885aa5d..260863aa8e1 100644 --- a/tests/embroider-basic-compat/package.json +++ b/tests/embroider-basic-compat/package.json @@ -18,22 +18,26 @@ "build": "ember build", "lint:hbs": "ember-template-lint .", "lint:old": "eslint --config ../../.eslintrc.js --ignore-path ../../.eslintignore .", + "check:types": "tsc --noEmit", "start": "ember serve", "test:embroider": "ember test --test-port=0", "_syncPnpm": "bun run sync-dependencies-meta-injected" }, "dependencies": { "@ember/string": "3.1.1", + "@ember-data/adapter": "workspace:5.5.0-alpha.11", + "@ember-data/legacy-compat": "workspace:5.5.0-alpha.11", + "@ember-data/model": "workspace:5.5.0-alpha.11", + "@ember-data/request": "workspace:5.5.0-alpha.11", + "@ember-data/store": "workspace:5.5.0-alpha.11", + "@ember-data/tracking": "workspace:5.5.0-alpha.11", + "@warp-drive/core-types": "workspace:5.5.0-alpha.11", "ember-auto-import": "^2.6.3", - "ember-data": "workspace:5.5.0-alpha.11", "ember-inflector": "^4.0.2", "pnpm-sync-dependencies-meta-injected": "0.0.10", "webpack": "^5.89.0" }, "dependenciesMeta": { - "ember-data": { - "injected": true - }, "@ember-data/unpublished-test-infra": { "injected": true }, @@ -42,6 +46,27 @@ }, "ember-inflector": { "injected": true + }, + "@ember-data/model": { + "injected": true + }, + "@ember-data/legacy-compat": { + "injected": true + }, + "@ember-data/store": { + "injected": true + }, + "@ember-data/tracking": { + "injected": true + }, + "@warp-drive/core-types": { + "injected": true + }, + "@ember-data/adapter": { + "injected": true + }, + "@ember-data/request": { + "injected": true } }, "devDependencies": { @@ -71,7 +96,7 @@ "loader.js": "^4.7.0", "qunit": "^2.20.0", "qunit-dom": "^3.0.0", - "typescript": "~5.2.2" + "typescript": "^5.2.2" }, "engines": { "node": ">= 20.9.0" diff --git a/tests/embroider-basic-compat/tsconfig.json b/tests/embroider-basic-compat/tsconfig.json new file mode 100644 index 00000000000..3a781c7337e --- /dev/null +++ b/tests/embroider-basic-compat/tsconfig.json @@ -0,0 +1,30 @@ +{ + "include": ["app/**/*", "config/**/*", "tests/**/*"], + "baseUrl": ".", + "compilerOptions": { + "lib": ["DOM", "ESNext"], + "module": "esnext", + "target": "esnext", + "moduleResolution": "bundler", + "moduleDetection": "force", + "strict": true, + "downlevelIteration": true, + "skipLibCheck": true, + "allowSyntheticDefaultImports": true, + "forceConsistentCasingInFileNames": true, + "allowJs": true, + + "noImplicitOverride": true, + + "experimentalDecorators": true, + + "incremental": true, + + "noEmit": true, + "declaration": false, + + "types": ["ember-source/types"], + "paths": {} + }, + "references": [] +} diff --git a/tests/warp-drive__schema-record/package.json b/tests/warp-drive__schema-record/package.json index e7f1ba17810..173339a97ff 100644 --- a/tests/warp-drive__schema-record/package.json +++ b/tests/warp-drive__schema-record/package.json @@ -64,6 +64,9 @@ }, "ember-inflector": { "injected": true + }, + "@ember-data/debug": { + "injected": true } }, "devDependencies": { @@ -110,7 +113,8 @@ "qunit-dom": "^3.0.0", "silent-error": "^1.1.1", "typescript": "^5.2.2", - "webpack": "^5.89.0" + "webpack": "^5.89.0", + "@ember-data/debug": "workspace:5.5.0-alpha.11" }, "ember": { "edition": "octane"