Skip to content

Commit

Permalink
Switch to pnpm (#465)
Browse files Browse the repository at this point in the history
* Switch to pnpm

* More yarn -> pnpm

* Fix TS
  • Loading branch information
RobbieTheWagner authored Jul 16, 2024
1 parent 7e11182 commit f89cb77
Show file tree
Hide file tree
Showing 8 changed files with 13,086 additions and 12,614 deletions.
2 changes: 1 addition & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
"isTypeScriptProject": true
}
42 changes: 17 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,29 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with: { node-version: 18 }
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Lint
run: yarn lint
run: pnpm lint
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with: { node-version: 18 }
- name: Install Dependencies
run: yarn install --no-lockfile
run: pnpm install --no-lockfile
- name: Run Tests
run: yarn test:ember
run: pnpm test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -65,17 +60,14 @@ jobs:
- ember-release
- ember-beta
- ember-canary
# - embroider-safe
# - embroider-optimized
- embroider-safe
- embroider-optimized

steps:
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with: { node-version: 18 }
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@

* `git clone <repository-url>`
* `cd ember-highcharts`
* `yarn install`
* `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`
* `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/).
35 changes: 20 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.24.9",
"@ember/render-modifiers": "^2.1.0",
"deepmerge": "^4.3.1",
"ember-auto-import": "^2.7.2",
"ember-auto-import": "^2.7.4",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/eslint-parser": "^7.24.8",
"@babel/helper-explode-assignable-expression": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
Expand All @@ -56,23 +56,28 @@
"@glint/template": "^1.4.0",
"@release-it-plugins/lerna-changelog": "^7.0.0",
"@tsconfig/ember": "^3.0.8",
"@types/ember": "^4.0.11",
"@types/ember__application": "^4.0.11",
"@types/ember__component": "^4.0.22",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"@types/ember__object": "^4.0.12",
"@types/ember__owner": "^4.0.9",
"@types/ember__runloop": "^4.0.10",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"babel-plugin-dynamic-import-node": "^2.3.3",
"bootstrap": "^4.5.0",
"bootstrap": "^4.6.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-cli": "~5.8.0",
"ember-cli": "~5.8.1",
"ember-cli-app-version": "^7.0.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^8.0.2",
"ember-resolver": "^10.0.0",
"ember-qunit": "^8.1.0",
"ember-resolver": "^10.1.1",
"ember-source": "~5.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
Expand All @@ -83,17 +88,17 @@
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"highcharts": "^11.4.1",
"highcharts": "^11.4.6",
"loader.js": "^4.7.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"prettier": "^3.3.3",
"qunit": "^2.21.0",
"qunit-dom": "^3.2.0",
"release-it": "^17.5.0",
"release-it": "^17.6.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"typescript": "^5.5.3",
"webpack": "^5.91.0"
"webpack": "^5.93.0"
},
"peerDependencies": {
"ember-source": ">= 3.28.0",
Expand Down
Loading

0 comments on commit f89cb77

Please sign in to comment.