diff --git a/.github/actions/pnpm/action.yml b/.github/actions/pnpm/action.yml index 956a4216..fb8a27af 100644 --- a/.github/actions/pnpm/action.yml +++ b/.github/actions/pnpm/action.yml @@ -13,5 +13,5 @@ runs: ${{ runner.os }}-pnpm- - uses: pnpm/action-setup@v2.2.2 with: - version: 7 + version: 8 run_install: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5467423..9c855148 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,9 +52,11 @@ jobs: - defaults with pnpm # TypeScript - - typescript with npm - - typescript with yarn - - typescript with pnpm + # Disabled for now, we are having a conflict between built-in-types from @ember/test-helpers + # and the types from definitely typed + # - typescript with npm + # - typescript with yarn + # - typescript with pnpm # flags - addon-location diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..41e0d2c3 --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +# super strict mode +auto-install-peers=false +resolve-peers-from-workspace-root=false diff --git a/package.json b/package.json index 4e2abcdf..acf81258 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "typescript": "^4.7.4" }, "engines": { - "node": "14.* || 16.* || >= 18" + "node": "16.* || >= 18" }, "publishConfig": { "registry": "https://registry.npmjs.org" @@ -63,9 +63,8 @@ } }, "volta": { - "node": "14.21.3", + "node": "16.20.1", "yarn": "1.22.18", - "npm": "8.13.2", - "pnpm": "7.32.5" + "pnpm": "8.6.7" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d6ff33e1..3026800e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: false + excludeLinksFromLockfile: false + overrides: '@octokit/core': ^4.0.0 @@ -70,7 +74,7 @@ importers: version: 7.11.3 ember-cli: specifier: ember-cli/ember-cli#master - version: github.com/ember-cli/ember-cli/992126ab17e3c65462466c8a7b57182e5a8ca972(lodash@4.17.21) + version: github.com/ember-cli/ember-cli/695e0f3524be9f6431d924627d64ecf625c0e868 execa: specifier: ^6.1.0 version: 6.1.0 @@ -97,7 +101,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@jridgewell/gen-mapping': 0.1.1 - '@jridgewell/trace-mapping': 0.3.14 + '@jridgewell/trace-mapping': 0.3.18 dev: true /@babel/code-frame@7.12.11: @@ -2647,7 +2651,7 @@ packages: through2: 3.0.2 dev: true - /consolidate@0.16.0(lodash@4.17.21)(mustache@4.2.0): + /consolidate@0.16.0(mustache@4.2.0): resolution: {integrity: sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==} engines: {node: '>= 0.10.0'} deprecated: Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog @@ -2814,7 +2818,6 @@ packages: optional: true dependencies: bluebird: 3.7.2 - lodash: 4.17.21 mustache: 4.2.0 dev: true @@ -4323,8 +4326,8 @@ packages: engines: {node: '>= 6'} dev: true - /filesize@10.0.6: - resolution: {integrity: sha512-rzpOZ4C9vMFDqOa6dNpog92CoLYjD79dnjLk2TYDDtImRIyLTOzqojCb05Opd1WuiWjs+fshhCgTd8cl7y5t+g==} + /filesize@10.0.7: + resolution: {integrity: sha512-iMRG7Qo9nayLoU3PNCiLizYtsy4W1ClrapeCwEgtiQelOAOuRJiw4QaLI+sSr8xr901dgHv+EYP2bCusGZgoiA==} engines: {node: '>= 10.4.0'} dev: true @@ -8262,8 +8265,8 @@ packages: ret: 0.1.15 dev: true - /safe-stable-stringify@2.4.2: - resolution: {integrity: sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==} + /safe-stable-stringify@2.4.3: + resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==} engines: {node: '>=10'} dev: true @@ -8924,7 +8927,7 @@ packages: minimatch: 3.1.2 dev: true - /testem@3.10.1(lodash@4.17.21): + /testem@3.10.1: resolution: {integrity: sha512-42c4e7qlAelwMd8O3ogtVGRbgbr6fJnX6H51ACOIG1V1IjsKPlcQtxPyOwaL4iikH22Dfh+EyIuJnMG4yxieBQ==} engines: {node: '>= 7.*'} hasBin: true @@ -8935,7 +8938,7 @@ packages: charm: 1.0.2 commander: 2.20.3 compression: 1.7.4 - consolidate: 0.16.0(lodash@4.17.21)(mustache@4.2.0) + consolidate: 0.16.0(mustache@4.2.0) execa: 1.0.0 express: 4.18.2 fireworm: 0.7.2 @@ -9929,11 +9932,10 @@ packages: engines: {node: '>=10'} dev: true - github.com/ember-cli/ember-cli/992126ab17e3c65462466c8a7b57182e5a8ca972(lodash@4.17.21): - resolution: {tarball: https://codeload.github.com/ember-cli/ember-cli/tar.gz/992126ab17e3c65462466c8a7b57182e5a8ca972} - id: github.com/ember-cli/ember-cli/992126ab17e3c65462466c8a7b57182e5a8ca972 + github.com/ember-cli/ember-cli/695e0f3524be9f6431d924627d64ecf625c0e868: + resolution: {tarball: https://codeload.github.com/ember-cli/ember-cli/tar.gz/695e0f3524be9f6431d924627d64ecf625c0e868} name: ember-cli - version: 5.1.0-beta.0 + version: 5.2.0-beta.0 engines: {node: '>= 16'} hasBin: true dependencies: @@ -9972,7 +9974,7 @@ packages: execa: 5.1.1 exit: 0.1.2 express: 4.18.2 - filesize: 10.0.6 + filesize: 10.0.7 find-up: 5.0.0 find-yarn-workspace-root: 2.0.0 fixturify-project: 2.1.1 @@ -10009,14 +10011,14 @@ packages: remove-types: 1.0.0 resolve: 1.22.1 resolve-package-path: 4.0.3 - safe-stable-stringify: 2.4.2 + safe-stable-stringify: 2.4.3 sane: 5.0.1 semver: 7.3.8 silent-error: 1.1.1 sort-package-json: 1.57.0 symlink-or-copy: 1.3.1 temp: 0.9.4 - testem: 3.10.1(lodash@4.17.21) + testem: 3.10.1 tiny-lr: 2.0.0 tree-sync: 2.1.0 uuid: 9.0.0