From 635404c33a6d1002a58579d70a049e47130b6799 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Tue, 22 Feb 2022 10:13:14 -0500 Subject: [PATCH 1/6] fix(package): remove type:module for embroider compat --- ember-resources/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ember-resources/package.json b/ember-resources/package.json index ca15dcd55..cb4986fb8 100644 --- a/ember-resources/package.json +++ b/ember-resources/package.json @@ -7,7 +7,6 @@ "description": "An implementation of Resources with some helpful utilities", "repository": "https://github.com/NullVoxPopuli/ember-resources", "license": "MIT", - "type": "module", "main": "dist/index.js", "types": "declarations", "author": "NullVoxPopuli", From 950731dbdb9e76889cc0ea3a4c59e3416e383b98 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Tue, 22 Feb 2022 10:13:31 -0500 Subject: [PATCH 2/6] chore(internal): re-enable embroider testing in ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e4988651..841eda71b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,8 +76,8 @@ jobs: - ember-release - ember-beta - ember-canary - # - embroider-safe - # - embroider-optimized + - embroider-safe + - embroider-optimized steps: - uses: actions/checkout@v2 - uses: volta-cli/action@v1 From 458d720893627f6da171889478d7ccfb6edffbe7 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Tue, 22 Feb 2022 11:42:11 -0500 Subject: [PATCH 3/6] chore(test-app): move test-waiters to dependencies, because it must exist at runtime --- testing/ember-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/ember-app/package.json b/testing/ember-app/package.json index f18e63c34..2bfd93616 100644 --- a/testing/ember-app/package.json +++ b/testing/ember-app/package.json @@ -24,6 +24,7 @@ }, "dependencies": { "@embroider/macros": "^1.2.0", + "@ember/test-waiters": "^3.0.1", "ember-concurrency": "^2.0.0", "ember-concurrency-ts": "^0.3.1", "ember-resources": "*" @@ -31,7 +32,6 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.6.0", - "@ember/test-waiters": "^3.0.1", "@embroider/test-setup": "^1.2.0", "@glimmer/component": "^1.0.4", "@glimmer/tracking": "^1.0.4", From 018e5ab65b13fd9c403a3e5b35a16f0ab5afa33a Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Tue, 22 Feb 2022 11:58:39 -0500 Subject: [PATCH 4/6] chore: declare test-waiters as a dependency and configure renovate to handle it --- .github/renovate.json5 | 7 +++++++ ember-resources/package.json | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 8b698a302..aaf9b8304 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -101,6 +101,13 @@ "semantic-release*" ] }, + { + // Max Semver compatibility + "packagePatterns": [ + "@ember/test-waiters" + ], + "rangeStrategy": "widen" + }, { // changing peerDependencies *at all* is a breaking change "matchDepTypes": ["peerDependencies"], diff --git a/ember-resources/package.json b/ember-resources/package.json index cb4986fb8..6004e6449 100644 --- a/ember-resources/package.json +++ b/ember-resources/package.json @@ -39,9 +39,7 @@ }, "dependencies": { "@embroider/addon-shim": "^1.2.0", - "@embroider/macros": "^1.2.0" - }, - "peerDependencies": { + "@embroider/macros": "^1.2.0", "@ember/test-waiters": "^3.0.0" }, "devDependencies": { From a5e113229bc8b0525be45e33c5680e39a1afa974 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Tue, 22 Feb 2022 12:04:03 -0500 Subject: [PATCH 5/6] chore(internal): don't build type declarations twice --- ember-resources/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ember-resources/package.json b/ember-resources/package.json index 6004e6449..0b0122fd2 100644 --- a/ember-resources/package.json +++ b/ember-resources/package.json @@ -25,7 +25,6 @@ "start": "rollup -c --watch", "build": "FORCE_COLOR=1 npm-run-all --aggregate-output --parallel \"build:*\"", "build:js": "rollup -c", - "build:types": "tsc --build", "build:docs": "cp ../README.md ./README.md", "lint": "FORCE_COLOR=1 npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"", "lint:fix": "FORCE_COLOR=1 npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix", From 5c0a783c9905072dc8398a179492cf6f8ceef0ab Mon Sep 17 00:00:00 2001 From: NullVoxPopuli Date: Tue, 22 Feb 2022 12:13:06 -0500 Subject: [PATCH 6/6] chore(ci): we no longer need the types workflow --- .github/workflows/types.yml | 68 ------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 .github/workflows/types.yml diff --git a/.github/workflows/types.yml b/.github/workflows/types.yml deleted file mode 100644 index 6c5f48730..000000000 --- a/.github/workflows/types.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: "Types" -on: - pull_request: - push: - # filtering branches here prevents duplicate builds from pull_request and push - branches: - - main - - master - -env: - CI: true - -jobs: - install_dependencies: - if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')" - name: Install Dependencies - runs-on: ubuntu-latest - timeout-minutes: 15 - - steps: - - uses: actions/checkout@v2 - - uses: volta-cli/action@v1 - - uses: actions/cache@v2 - with: - path: '**/node_modules' - key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} - - run: yarn install - - types: - if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')" - name: "Type Correctness" - runs-on: ubuntu-latest - timeout-minutes: 5 - needs: [install_dependencies] - - steps: - - uses: actions/checkout@v2 - - uses: volta-cli/action@v1 - - uses: actions/cache@v2 - with: - path: '**/node_modules' - key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} - - run: yarn build:types - working-directory: ./ember-resources - # - run: npm run prepack - # - run: yarn tsc --build - # - run: npm run prepack - # - run: npm exec tsc --build - - types_concurrency_1: - if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')" - name: "Type Correctness (w/ concurrency@v1)" - runs-on: ubuntu-latest - timeout-minutes: 5 - needs: [install_dependencies] - - steps: - - uses: actions/checkout@v2 - - uses: volta-cli/action@v1 - - uses: actions/cache@v2 - with: - path: '**/node_modules' - key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }} - - run: | - cd ember-resources - yarn build:types - cd ../testing/ember-concurrency-v1/ - tsc --build