diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d7c7d3d82..c7f414632 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -40,7 +40,9 @@ jobs: - name: Build addon working-directory: addon run: pnpm build + - run: pnpm i -f # sync injected dependencies - run: pnpm test + working-directory: test-app - name: own types working-directory: addon run: pnpm tsc --noEmit @@ -61,7 +63,9 @@ jobs: - name: Build addon working-directory: addon run: pnpm build + - run: pnpm i -f # sync injected dependencies - name: Run Tests + working-directory: test-app run: pnpm test - name: own types working-directory: addon @@ -103,6 +107,7 @@ jobs: - name: Build addon working-directory: addon run: pnpm build + - run: pnpm i -f # sync injected dependencies - name: test working-directory: test-app run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b1828850..17d1c3faf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -188,7 +188,7 @@ importers: version: 3.1.1 '@ember/test-helpers': specifier: workspace:* - version: link:../addon + version: file:addon(@babel/core@7.24.9)(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(webpack@5.93.0) '@embroider/test-setup': specifier: ^4.0.0 version: 4.0.0 @@ -239,7 +239,7 @@ importers: version: 7.0.0 ember-qunit: specifier: ^8.1.0 - version: 8.1.0(@ember/test-helpers@addon)(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(qunit@2.21.1) + version: 8.1.0(@ember/test-helpers@file:addon(@babel/core@7.24.9)(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(webpack@5.93.0))(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(qunit@2.21.1) ember-resolver: specifier: ^10.0.0 version: 10.1.1(@ember/string@3.1.1)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0)) @@ -297,6 +297,9 @@ importers: webpack: specifier: ^5.78.0 version: 5.93.0 + dependenciesMeta: + '@ember/test-helpers': + injected: true type-tests: devDependencies: @@ -1093,6 +1096,12 @@ packages: resolution: {integrity: sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==} engines: {node: 12.* || 14.* || >= 16} + '@ember/test-helpers@file:addon': + resolution: {directory: addon, type: directory} + engines: {node: 16.* || >= 18} + peerDependencies: + ember-source: ^4.0.0 || ^5.0.0 + '@ember/test-waiters@3.1.0': resolution: {integrity: sha512-bb9h95ktG2wKY9+ja1sdsFBdOms2lB19VWs8wmNpzgHv1NCetonBoV5jHBV4DHt0uS1tg9z66cZqhUVlYs96KQ==} engines: {node: 10.* || 12.* || >= 14.*} @@ -3391,6 +3400,7 @@ packages: ember-qunit@8.1.0: resolution: {integrity: sha512-55/xqvVQwhiNcnh/tCzWyvlYzrYqwDY0/cIPyDQbAxGKtkUt9jCfRUGllfyOofC6LX0fL/0fIi+5e9sg1m6vXw==} + version: 8.1.0 peerDependencies: '@ember/test-helpers': '>=3.0.3' ember-source: '>=4.0.0' @@ -8488,6 +8498,24 @@ snapshots: transitivePeerDependencies: - supports-color + '@ember/test-helpers@file:addon(@babel/core@7.24.9)(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(webpack@5.93.0)': + dependencies: + '@ember/test-waiters': 3.1.0 + '@embroider/macros': 1.16.5(@glint/template@1.4.0) + '@simple-dom/interface': 1.4.0 + broccoli-debug: 0.6.5 + broccoli-funnel: 3.0.8 + dom-element-descriptors: 0.5.1 + ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.93.0) + ember-cli-babel: 8.2.0(@babel/core@7.24.9) + ember-cli-htmlbars: 6.3.0 + ember-source: 4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0) + transitivePeerDependencies: + - '@babel/core' + - '@glint/template' + - supports-color + - webpack + '@ember/test-waiters@3.1.0': dependencies: calculate-cache-key-for-tree: 2.0.0 @@ -11974,9 +12002,9 @@ snapshots: transitivePeerDependencies: - supports-color - ember-qunit@8.1.0(@ember/test-helpers@addon)(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(qunit@2.21.1): + ember-qunit@8.1.0(@ember/test-helpers@file:addon(@babel/core@7.24.9)(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(webpack@5.93.0))(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(qunit@2.21.1): dependencies: - '@ember/test-helpers': link:addon + '@ember/test-helpers': file:addon(@babel/core@7.24.9)(@glint/template@1.4.0)(ember-source@4.12.4(@babel/core@7.24.9)(@glimmer/component@1.1.2(@babel/core@7.24.9))(@glint/template@1.4.0)(webpack@5.93.0))(webpack@5.93.0) '@embroider/addon-shim': 1.8.9 '@embroider/macros': 1.16.5(@glint/template@1.4.0) ember-cli-test-loader: 3.1.0 diff --git a/test-app/package.json b/test-app/package.json index 73bb5ad3a..611f80bcb 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -22,6 +22,11 @@ "test": "ember test", "test:ember": "ember test" }, + "dependenciesMeta": { + "@ember/test-helpers": { + "injected": true + } + }, "devDependencies": { "@babel/eslint-parser": "^7.21.3", "@babel/plugin-proposal-decorators": "^7.21.0", @@ -29,7 +34,6 @@ "@ember/optional-features": "^2.0.0", "@ember/string": "^3.0.1", "@ember/test-helpers": "workspace:*", - "pretender": "^3.4.7", "@embroider/test-setup": "^4.0.0", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", @@ -60,6 +64,7 @@ "eslint-plugin-qunit": "^7.3.4", "latest-version": "^5.0.0", "loader.js": "^4.7.0", + "pretender": "^3.4.7", "prettier": "^2.8.7", "qunit": "^2.21.1", "qunit-dom": "^3.2.0",