Skip to content

Commit

Permalink
Migrate project to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
SanderKnauff committed Nov 22, 2023
1 parent 2be6e83 commit 03f6214
Show file tree
Hide file tree
Showing 13 changed files with 28,673 additions and 15,438 deletions.
60 changes: 16 additions & 44 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup node.js
uses: actions/setup-node@v4
with:
node-version: 18
- name: Install dependencies
uses: bahmutov/npm-install@v1
uses: wyvox/action@v1
- name: Lint
run: yarn lint
run: pnpm lint
- name: Test
run: yarn test:ember
run: pnpm test:ember

test-no-lock:
name: Floating Dependencies
Expand All @@ -36,17 +30,9 @@ jobs:
- test
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup node.js
uses: actions/setup-node@v4
with:
node-version: 18
- name: Install dependencies
uses: bahmutov/npm-install@v1
with:
useLockFile: false
uses: wyvox/action@v1
- name: Test
run: yarn test:ember
run: pnpm test:ember

test-try:
name: Scenario ${{ matrix.scenario }}, BS${{ matrix.bootstrap }}, ${{ matrix.browser}}
Expand Down Expand Up @@ -85,43 +71,29 @@ jobs:
bootstrap: 5
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup node.js
uses: actions/setup-node@v4
with:
node-version: 18
- name: Install dependencies
uses: bahmutov/npm-install@v1
with:
useLockFile: false
uses: wyvox/action@v1
- name: Test
run: yarn ember try:one ${{ matrix.scenario }}
run: pnpm ember try:one ${{ matrix.scenario }}
env:
BOOTSTRAPVERSION: ${{ matrix.bootstrap }}
BROWSER: ${{ matrix.browser }}

test-docs:
name: Docs
runs-on: ubuntu-latest
needs:
- test
# needs:
# - test
steps:
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18
- name: Install Dependencies of Ember Bootstrap addon
uses: bahmutov/npm-install@v1
- name: Install Dependencies of docs app
uses: bahmutov/npm-install@v1
with:
working-directory: docs
- name: Checkout code
uses: wyvox/action@v1
- name: Checkout code
working-directory: docs
run: pnpm install
- name: Run Ember Tests
run: yarn test
run: pnpm test
working-directory: docs
- name: Build including API docs
run: yarn run docs:build
run: pnpm run docs:build
# TODO: Perform some basic steps that the build contains API docs
# and works as expected.

Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup node.js
uses: actions/setup-node@v4
with:
node-version: 18
- name: Install addon dependencies
uses: bahmutov/npm-install@v1
- name: Install docs dependencies
uses: bahmutov/npm-install@v1
uses: wyvox/action@v1
- name: Checkout code
uses: wyvox/action@v1
with:
working-directory: docs
- name: Build docs
run: yarn run docs:build
run: pnpm run docs:build
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/pnpm.lock.ember-try

# broccoli-debug
/DEBUG/
Expand Down
5 changes: 5 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = async function () {
return {
usePnpm: true,
};
};
24 changes: 6 additions & 18 deletions docs/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,18 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 14.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Checkout code
uses: wyvox/action@v1
- name: Lint
run: yarn lint
run: pnpm run lint

test:
name: "Test"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 14.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Checkout code
uses: wyvox/action@v1
- name: Run Tests
run: yarn test
run: pnpm test
2 changes: 1 addition & 1 deletion docs/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--yarn",
"--pnpm",
"--no-welcome"
]
}
Expand Down
4 changes: 4 additions & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,9 @@
"paths": [
".."
]
},
"volta": {
"node": "18.18.2",
"pnpm": "8.10.5"
}
}
Loading

0 comments on commit 03f6214

Please sign in to comment.