Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move from yarn to pnpm #92

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ jobs:
test:
name: Tests
runs-on: ubuntu-latest
env:
VOLTA_FEATURE_PNPM: true

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- uses: actions/checkout@v4
- uses: volta-cli/action@v4
with:
node-version: 14.x
yarn-version: 1.x
- uses: actions/checkout@v2
node-version: 22.x
- name: Install dependencies
run: yarn install
run: pnpm install
- name: Lint JS
run: yarn lint:js
run: pnpm lint:js
- name: Test
run: yarn test
run: pnpm test

try-scenarios:
name: ${{ matrix.ember-try-scenario }}
Expand All @@ -47,16 +47,15 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with:
node-version: 14.x
yarn-version: 1.x
node-version: 22
- name: Install dependencies
run: yarn install
run: pnpm install
- name: Test
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
run: yarn ember try:one $EMBER_TRY_SCENARIO
run: pnpm ember try:one $EMBER_TRY_SCENARIO

working-directory: packages/test-app
11 changes: 1 addition & 10 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,5 @@
"site"
],
"version": "1.1.0",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
"bootstrap": {
"npmClientArgs": [
"--frozen-lockfile",
"--non-interactive"
]
}
}
"npmClient": "pnpm"
}
18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,30 @@
"site"
],
"scripts": {
"prepare": "yarn workspace ember-focus-trap run prepare",
"prepare": "pnpm --filter ember-focus-trap prepare",
"start": "npm-run-all --parallel start:*",
"start:addon": "yarn workspace ember-focus-trap run start",
"start:test-app": "yarn workspace test-app run start",
"start:addon": "pnpm --filter ember-focus-trap start",
"start:test-app": "pnpm --filter test-app start",
"lint:js": "eslint . --ext .js,.ts",
"test": "yarn workspace test-app run test"
"test": "pnpm --filter test-app run test"
},
"devDependencies": {
"@underline/eslint-config-ember-typescript": "^0.12.0",
"@underline/eslint-config-node": "^0.12.0",
"@underline/eslint-config-typescript": "^0.12.0",
"eslint": "^8.6.0",
"eslint": "^8.57.1",
"lerna": "^4.0.0",
"npm-run-all": "4.1.5",
"typescript": "^4.5.5"
"typescript": "^4.9.5"
},
"dependencies": {
"eslint-plugin-qunit": "^7.2.0"
"eslint-plugin-qunit": "^7.3.4"
},
"resolutions": {
"@embroider/macros": "^1.0.0"
},
"volta": {
"node": "22.11.0",
"pnpm": "9.13.0"
}
}
5 changes: 3 additions & 2 deletions packages/ember-focus-trap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build": "rollup --config",
"start": "rollup --config --watch",
"test": "echo 'Addon does not have tests, run tests in test-app'",
"prepare": "yarn build"
"prepare": "pnpm build"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
Expand All @@ -32,7 +32,8 @@
"@embroider/addon-dev": "^1.0.0",
"@rollup/plugin-babel": "5.3.0",
"npm-run-all": "4.1.5",
"rollup": "2.66.1"
"rollup": "2.66.1",
"webpack": "^5.90.3"
},
"engines": {
"node": "12.* || >= 14"
Expand Down
2 changes: 1 addition & 1 deletion packages/test-app/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = async function () {
return {
useYarn: true,
usePnpm: true,
scenarios: [
{
name: 'ember-lts-3.16',
Expand Down
7 changes: 2 additions & 5 deletions packages/test-app/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@ module.exports = function (environment) {
modulePrefix: 'test-app',
environment,
rootURL: '/',
locationType: 'auto',
locationType: 'history',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false
}
EXTEND_PROTOTYPES: false
},

APP: {
Expand Down
18 changes: 9 additions & 9 deletions packages/test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,28 @@
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.4.0",
"ember-cli": "~4.1.1",
"ember-cli-babel": "^7.26.11",
"ember-cli": "~6.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-focus-trap": "^1.1.0",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "^4.1.0",
"ember-load-initializers": "^3.0.1",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.1.1",
"ember-resolver": "^13.0.2",
"ember-source": "^6.0.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.15.0",
"ember-try": "^2.0.0",
"ember-try": "^3.0.0",
"eslint": "^8.6.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit-dom": "^2.0.0",
"qunit-dom": "^3.3.0",
"sinon": "^12.0.1",
"webpack": "^5.67.0"
},
Expand Down
Loading
Loading