Skip to content

Commit

Permalink
chore: move from yarn to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
josemarluedke committed Nov 13, 2024
1 parent 1552a26 commit a5a6d8c
Show file tree
Hide file tree
Showing 7 changed files with 6,478 additions and 15,822 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@ 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
node-version: 20.x
- uses: actions/checkout@v2
- 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,13 +48,12 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- uses: actions/checkout@v4444
- uses: volta-cli/action@v4
with:
node-version: 14.x
yarn-version: 1.x
node-version: 20.x
- name: Install dependencies
run: yarn install
run: pnpminstall
- name: Test
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
Expand Down
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"
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"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",
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
Loading

0 comments on commit a5a6d8c

Please sign in to comment.