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

Update babel, deps, ember, switch to pnpm #1595

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/blueprints/*/files/

# compiled output
/declarations/
/dist/

# misc
Expand Down
73 changes: 36 additions & 37 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,18 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn

node-version: 18.x
- uses: pnpm/action-setup@v2
with:
version: 9
- name: Install dependencies
run: yarn install --frozen-lockfile

run: pnpm i --frozen-lockfile
- name: Lint
run: yarn lint
run: pnpm lint

test-addon-floating:
name: Test addon (floating dependencies)
Expand All @@ -47,20 +45,20 @@ jobs:
- 'test-apps'
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
node-version: 18.x
- uses: pnpm/action-setup@v2
with:
version: 9

- name: Install dependencies
run: yarn install --no-lockfile --non-interactive
run: pnpm i --no-lockfile

- name: Test
run: yarn test:${{ matrix.script-name }}
run: pnpm test:${{ matrix.script-name }}

test-addon-locked:
name: Test addon (locked dependencies)
Expand All @@ -74,20 +72,20 @@ jobs:
- 'test-apps'
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
node-version: 18.x
- uses: pnpm/action-setup@v2
with:
version: 9

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm i --frozen-lockfile

- name: Test
run: yarn test:${{ matrix.script-name }}
run: pnpm test:${{ matrix.script-name }}

test-compatibility:
name: Test compatibility
Expand All @@ -99,26 +97,27 @@ jobs:
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-release
- ember-beta
- ember-canary
- embroider-safe
timeout-minutes: 7
steps:
- name: Check out a copy of the repo
uses: actions/checkout@v3

- name: Use Node.js ${{ env.NODE_VERSION }}
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
node-version: 18.x
- uses: pnpm/action-setup@v2
with:
version: 9

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm i --frozen-lockfile

- name: Test
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
run: pnpm ember try:one ${{ matrix.try-scenario }}

deploy-app:
name: Deploy app
Expand All @@ -145,10 +144,10 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn
cache: pnpm

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm i --frozen-lockfile

- name: Deploy
run: yarn deploy
run: pnpm deploy
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
/ember-cli-build.js
/testem.js
/tests/
/tsconfig.declarations.json
/tsconfig.json
/yarn-error.log
/yarn.lock
.gitkeep
Expand Down
3 changes: 2 additions & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
nodejs 18.19.0
nodejs 18.20.3
pnpm 9.9.0
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

## Installation

* `git clone <repository-url>`
* `cd ember-cli-addon-docs`
* `yarn install`
- `git clone <repository-url>`
- `cd ember-cli-addon-docs`
- `pnpm install`

## Linting

* `yarn lint`
* `yarn lint:fix`
- `pnpm lint`
- `pnpm lint:fix`

## Running tests

* `yarn test` – Runs the test suite on the current Ember version
* `yarn test:ember --server` – Runs the test suite in "watch mode"
* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
- `pnpm test` – Runs the test suite on the current Ember version
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `yarn start`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
- `pnpm start`
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
65 changes: 46 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test --test-port=0",
"test:node": "mocha tests-node --recursive",
"test:test-apps": "cd test-apps/new-addon && yarn test"
"test:test-apps": "cd test-apps/new-addon && pnpm test"
},
"dependencies": {
"@csstools/postcss-sass": "^5.0.1",
Expand All @@ -49,9 +49,9 @@
"broccoli-source": "^3.0.0",
"broccoli-stew": "^3.0.0",
"chalk": "4.1.2",
"ember-auto-import": "^2.7.0",
"ember-auto-import": "^2.7.4",
"ember-cli-autoprefixer": "^2.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-babel": "^8.2.0",
"ember-cli-clipboard": "^1.1.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-postcss": "^8.0.0",
Expand Down Expand Up @@ -101,12 +101,21 @@
"yuidocjs": "^0.10.2"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-decorators": "^7.23.6",
"@babel/preset-env": "^7.23.6",
"@ember/optional-features": "^2.0.0",
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@babel/helper-environment-visitor": "^7.24.7",
"@babel/helper-function-name": "^7.24.7",
"@babel/helper-hoist-variables": "^7.24.7",
"@babel/helper-split-export-declaration": "^7.24.7",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@babel/preset-env": "^7.25.4",
"@ember-data/adapter": "^5.3.8",
"@ember-data/model": "^5.3.8",
"@ember-data/serializer": "^5.3.8",
"@ember-data/store": "^5.3.8",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.1",
"@ember/test-helpers": "^3.3.1",
"@embroider/test-setup": "^3.0.3",
"@fullhuman/postcss-purgecss": "^4.0.3",
"@release-it-plugins/lerna-changelog": "^6.0.0",
Expand All @@ -115,7 +124,7 @@
"common-tags": "^1.8.2",
"concurrently": "^8.2.2",
"ember-classy-page-object": "0.8.0-beta.2",
"ember-cli": "~5.5.0",
"ember-cli": "~5.11.0",
"ember-cli-addon-docs-yuidoc": "^1.0.0",
"ember-cli-blueprint-test-helpers": "^0.19.2",
"ember-cli-clean-css": "^3.0.0",
Expand All @@ -127,39 +136,57 @@
"ember-cli-mirage": "^3.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~5.3.0",
"ember-data": "~5.3.8",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^8.0.2",
"ember-qunit": "^8.1.0",
"ember-resolver": "^11.0.1",
"ember-source": "~5.5.0",
"ember-source": "~5.11.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-test-selectors": "^6.0.0",
"ember-try": "^3.0.0",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.5.0",
"eslint-plugin-prettier": "^5.1.0",
"eslint-plugin-qunit": "^8.0.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"miragejs": "^0.1.48",
"mocha": "^10.1.0",
"prettier": "^3.1.1",
"qunit": "^2.20.0",
"prettier": "^3.3.3",
"qunit": "^2.22.0",
"qunit-dom": "^3.0.0",
"release-it": "^16.3.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"webpack": "^5.89.0"
"webpack": "^5.94.0"
},
"peerDependencies": {
"@ember-data/adapter": ">= 3.0.0",
"@ember-data/model": ">= 3.0.0",
"@ember-data/serializer": ">= 3.0.0",
"@ember-data/store": ">= 3.0.0",
"@ember/string": "^3.1.1 || ^4.0.0",
"ember-data": ">= 3.0.0",
"ember-fetch": "^8.1.1",
"ember-source": ">= 4.0.0"
},
"peerDependenciesMeta": {
"@ember-data/adapter": {
"optional": true
},
"@ember-data/model": {
"optional": true
},
"@ember-data/serializer": {
"optional": true
},
"@ember-data/store": {
"optional": true
}
},
"engines": {
"node": ">= 18"
},
Expand Down
Loading
Loading