Skip to content

Commit

Permalink
Merge pull request #717 from ember-animation/pnpm-v9
Browse files Browse the repository at this point in the history
bump pnpm to v9
  • Loading branch information
SergeAstapov authored Oct 31, 2024
2 parents 1a7840f + 5c6b9d6 commit 3e57b50
Show file tree
Hide file tree
Showing 10 changed files with 13,034 additions and 11,233 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.x

- name: Install Node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -56,8 +54,6 @@ jobs:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.x

- name: Install Node
uses: actions/setup-node@v4
Expand All @@ -81,8 +77,6 @@ jobs:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.x

- name: Install Node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -125,8 +119,6 @@ jobs:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.x

- name: Install Node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -161,8 +153,6 @@ jobs:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.x

- name: Install Node
uses: actions/setup-node@v4
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
- uses: actions/checkout@v3
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.x

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.x

- name: Install Node
uses: actions/setup-node@v4
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8

- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/**
* This is to fix an error like
*
* Could not find module `@ember-data/adapter` imported from `ember-cli-addon-docs/adapters/-addon-docs`
* Could not find module `@ember-data/serializer` imported from `ember-cli-addon-docs/serializers/-addon-docs`
*
* which should not happen even though ember-cli-addon-docs declares ember-data as dependency and has those imports.
*/
import Adapter from '@ember-data/adapter';
import Serializer from '@ember-data/serializer';

export class AddonDocsAdapter extends Adapter {}
export class AddonDocsSerializer extends Serializer {}

function initialize() {}

export default {
initialize,
};
1 change: 1 addition & 0 deletions docs/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function (defaults) {
const app = new EmberApp(defaults, {
autoImport: {
forbidEval: true,
watchDependencies: ['ember-animated'],
},
'ember-cli-addon-docs': {
Expand Down
6 changes: 4 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@
},
"devDependencies": {
"@babel/core": "^7.23.9",
"@ember-data/adapter": "^5.3.8",
"@babel/eslint-parser": "^7.24.8",
"@babel/plugin-proposal-decorators": "^7.23.9",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@faker-js/faker": "^8.4.1",
"@fortawesome/ember-fontawesome": "^0.3.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/ember-fontawesome": "^2.0.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
Expand Down
11 changes: 2 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
"type": "git",
"url": "https://github.com/ember-animation/ember-animated.git"
},
"workspaces": [
"addon",
"docs",
"test-app"
],
"scripts": {
"build": "pnpm --filter ember-animated build",
"lint": "pnpm --filter '*' lint",
Expand All @@ -22,16 +17,14 @@
"test:ember": "pnpm --filter '*' test:ember"
},
"devDependencies": {
"@fortawesome/fontawesome-svg-core": "^1.3.0",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@release-it-plugins/lerna-changelog": "^7.0.0",
"@release-it-plugins/workspaces": "^4.2.0",
"concurrently": "^8.2.2",
"release-it": "^17.6.0"
},
"volta": {
"node": "18.20.4",
"pnpm": "8.15.9"
"pnpm": "9.12.2"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand All @@ -43,7 +36,7 @@
"@types/eslint": "8.4.1"
}
},
"packageManager": "pnpm@8.15.9",
"packageManager": "pnpm@9.12.2",
"release-it": {
"hooks": {
"after:bump": "pnpm install",
Expand Down
Loading

0 comments on commit 3e57b50

Please sign in to comment.