Skip to content

Commit

Permalink
Switch from yarn to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
SergeAstapov committed Mar 2, 2022
1 parent 8d5be1d commit 30ea400
Show file tree
Hide file tree
Showing 9 changed files with 16,062 additions and 15,961 deletions.
56 changes: 40 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,21 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
uses: pnpm/[email protected]
with:
version: 6.32.1
run_install: |
- recursive: true
args: [--frozen-lockfile]
- name: Lint Addon
run: yarn lint
run: pnpm run lint
working-directory: addon
- name: Lint Test App
run: yarn lint
run: pnpm run lint
working-directory: test-app
- name: Run Tests
run: yarn test:ember
run: pnpm run test:ember
working-directory: test-app

test-library-floating:
Expand All @@ -45,11 +49,19 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: yarn
# pnpm does not have --no-lockfile option
- name: Remove lock file
shell: bash
run: |
rm pnpm-lock.yaml
- name: Install Dependencies
run: yarn install --no-lockfile
uses: pnpm/[email protected]
with:
version: 6.32.1
run_install: |
- recursive: true
- name: Run Tests
run: yarn test:ember
run: pnpm run test:ember
working-directory: test-app

test-docs:
Expand All @@ -62,14 +74,18 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
uses: pnpm/[email protected]
with:
version: 6.32.1
run_install: |
- recursive: true
args: [--frozen-lockfile]
- name: Lint
run: yarn lint
run: pnpm run lint
working-directory: docs
- name: Run Tests
run: yarn test:ember
run: pnpm run test:ember
working-directory: docs

try-scenarios:
Expand Down Expand Up @@ -99,9 +115,13 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
uses: pnpm/[email protected]
with:
version: 6.32.1
run_install: |
- recursive: true
args: [--frozen-lockfile]
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
working-directory: test-app
Expand All @@ -128,9 +148,13 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
uses: pnpm/[email protected]
with:
version: 6.32.1
run_install: |
- recursive: true
args: [--frozen-lockfile]
- name: Type checking
run: ./node_modules/.bin/ember try:one --config-path="./config/ember-try-typescript.js" ${{ matrix.typescript-scenario }}
working-directory: test-app
1 change: 1 addition & 0 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"eslint-plugin-ember": "^10.5.8",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1"
},
"engines": {
Expand Down
5 changes: 5 additions & 0 deletions docs/config/icons.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = function () {
return {
'free-solid-svg-icons': 'all',
};
};
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@ember/string": "^3.0.0",
"@ember/test-helpers": "^2.6.0",
"@fortawesome/ember-fontawesome": "^0.3.2",
"@fortawesome/free-solid-svg-icons": "^5.8.1",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
Expand Down
13 changes: 13 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"test-app"
],
"devDependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.0",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"release-it": "^14.2.1",
"release-it-lerna-changelog": "^3.1.0",
"release-it-yarn-workspaces": "^2.0.0"
Expand Down Expand Up @@ -46,5 +48,16 @@
"volta": {
"node": "12.22.7",
"yarn": "1.22.17"
},
"resolutions": {
"@ember/legacy-built-in-components": "github:emberjs/ember-legacy-built-in-components#a84513d197eeafbb01eae81e0f101b86ccde0ecf",
"ember-modal-dialog": "^4.0.0"
},
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {
"ember-source": "*"
}
}
}
}
Loading

0 comments on commit 30ea400

Please sign in to comment.