Skip to content

Commit

Permalink
Update babel, deps, ember, switch to pnpm (#1595)
Browse files Browse the repository at this point in the history
* Update babel deps

* ember-cli-update

* Try adding this

* Install a bunch of ember-data

* Switch to pnpm

* Update ci-cd.yml

* Try more things

* Remove ember-fetch

* Add embroider-optimized test

* Try more things

* Add ember-inflector

* Try workspaces
  • Loading branch information
RobbieTheWagner authored Nov 19, 2024
1 parent fd6c6b2 commit 2ad3300
Show file tree
Hide file tree
Showing 22 changed files with 19,578 additions and 16,045 deletions.
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/).
1 change: 0 additions & 1 deletion addon/adapters/-addon-docs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Adapter from '@ember-data/adapter';
import fetch from 'fetch';
import { getRootURL } from 'ember-cli-addon-docs/-private/config';

export default class AddonDocsAdapter extends Adapter {
Expand Down
1 change: 0 additions & 1 deletion addon/services/docs-search.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Service from '@ember/service';
import lunr from 'lunr';
import fetch from 'fetch';
import { enqueueTask } from 'ember-concurrency';
import {
getAddonDocsConfig,
Expand Down
1 change: 0 additions & 1 deletion addon/services/project-version.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Service from '@ember/service';
import { task } from 'ember-concurrency';
import fetch from 'fetch';
import { tracked } from '@glimmer/tracking';
import {
addonDocsConfig,
Expand Down
Binary file removed ember-cli-addon-docs.sketch
Binary file not shown.
Loading

0 comments on commit 2ad3300

Please sign in to comment.