Skip to content

Commit

Permalink
Merge pull request #576 from adopted-ember-addons/pnpm
Browse files Browse the repository at this point in the history
use pnpm
  • Loading branch information
mansona authored Jan 25, 2024
2 parents 01ba506 + 0448dbb commit db8edd1
Show file tree
Hide file tree
Showing 9 changed files with 16,379 additions and 14,405 deletions.
38 changes: 11 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,17 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v1
- uses: volta-cli/action@v1
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v2
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn --frozen-lockfile
version: 8
- run: pnpm i --frozen-lockfile
- name: lint
run: yarn lint
run: pnpm run lint
- name: test
run: yarn test:ember
run: pnpm run test:ember
- id: set-matrix
run: echo "::set-output name=matrix::$(yarn --silent scenario-tester list --files ./scenarios.js --matrix 'yarn qunit ./scenarios.js --filter %s:')"
run: echo "::set-output name=matrix::$(pnpm --silent scenario-tester list --files ./scenarios.js --matrix 'pnpm qunit ./scenarios.js --filter %s:')"
working-directory: test-app

compat-scenarios:
Expand All @@ -43,19 +35,11 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.test.outputs.matrix)}}
steps:
- uses: actions/checkout@v1
- uses: volta-cli/action@v1
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v2
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn install --no-lockfile
version: 8
- run: pnpm install --no-lockfile
- name: test
run: ${{ matrix.command }}
working-directory: test-app
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ignore-workspace-root-check=true
use-node-version=20.11.0
29 changes: 6 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,20 @@
],
"scripts": {
"clean": "rm -rf dist node_modules test-app/node_modules",
"link-test-app": "addon-dev link-test-app",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
"lint:devdeps": "addon-dev sync-dev-deps --lint",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"prepare": "npm-run-all prepublishOnly link-test-app",
"prepare": "npm-run-all prepublishOnly",
"prepublishOnly": "rollup --config",
"scenario:list": "scenario-tester list --files test-app/scenarios.js",
"scenario:output": "scenario-tester output --files test-app/scenarios.js --outdir scenario --scenario ",
"scenario:run": "cd test-app && qunit scenarios.js --filter ",
"start": "npm-run-all --parallel start:*",
"start:build": "rollup --config --watch",
"start:test-app": "cd test-app && ember serve",
"sync-dev-deps": "addon-dev sync-dev-deps",
"test": "npm-run-all lint:* test:*",
"test:ember": "cd test-app && ember test",
"test:ember-compatibility": "cd test-app && qunit scenarios.js"
"test:ember-compatibility": "cd test-app && pnpm qunit scenarios.js"
},
"dependencies": {
"@embroider/addon-shim": "^0.50.2",
Expand All @@ -52,7 +49,7 @@
"@babel/plugin-proposal-decorators": "^7.16.7",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/addon-dev": "^0.50.2",
"@embroider/addon-dev": "^4.1.3",
"@embroider/compat": "npm:@embroider/compat@latest",
"@embroider/core": "npm:@embroider/core@latest",
"@embroider/test-setup": "npm:@embroider/test-setup@latest",
Expand All @@ -73,7 +70,6 @@
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "0.1.6",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
Expand All @@ -84,27 +80,18 @@
"ember-source-channel-url": "^3.0.0",
"ember-source-latest": "npm:ember-source@latest",
"ember-template-lint": "^3.15.0",
"ember-try": "^1.4.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-qunit": "^6.2.0",
"jquery": "^3.6.0",
"loader.js": "^4.7.0",
"moment-timezone": "^0.5.33",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit-console-grouper": "^0.3.0",
"qunit-dom": "^1.6.0",
"release-it": "14.0.0",
"release-it-lerna-changelog": "^4.0.1",
"rollup": "^2.63.0",
"scenario-tester": "^2.0.1",
"sinon": "^17.0.1",
"webpack": "^5.65.0"
"rollup": "^4.9.6",
"scenario-tester": "^3.1.0"
},
"peerDependencies": {
"@ember/test-helpers": "^2",
Expand All @@ -123,7 +110,7 @@
}
},
"engines": {
"node": "20.11.0"
"node": ">= 20"
},
"ember-addon": {
"version": 2,
Expand All @@ -135,10 +122,6 @@
"./modifiers/pikaday.js": "./dist/_app_/modifiers/pikaday.js"
}
},
"volta": {
"node": "20.11.0",
"yarn": "1.22.11"
},
"release-it": {
"plugins": {
"release-it-lerna-changelog": {
Expand Down
Loading

0 comments on commit db8edd1

Please sign in to comment.