Skip to content

Commit 2ad3300

Browse files
Update babel, deps, ember, switch to pnpm (#1595)
* 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
1 parent fd6c6b2 commit 2ad3300

File tree

22 files changed

+19578
-16045
lines changed

22 files changed

+19578
-16045
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/blueprints/*/files/
33

44
# compiled output
5+
/declarations/
56
/dist/
67

78
# misc

.github/workflows/ci-cd.yml

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@ jobs:
2020
runs-on: ubuntu-latest
2121
timeout-minutes: 7
2222
steps:
23-
- name: Check out a copy of the repo
24-
uses: actions/checkout@v3
25-
26-
- name: Use Node.js ${{ env.NODE_VERSION }}
23+
- uses: actions/checkout@v4
24+
- name: Install Node
2725
uses: actions/setup-node@v3
2826
with:
29-
node-version: ${{ env.NODE_VERSION }}
30-
cache: yarn
31-
27+
node-version: 18.x
28+
- uses: pnpm/action-setup@v2
29+
with:
30+
version: 9
3231
- name: Install dependencies
33-
run: yarn install --frozen-lockfile
34-
32+
run: pnpm i --frozen-lockfile
3533
- name: Lint
36-
run: yarn lint
34+
run: pnpm lint
3735

3836
test-addon-floating:
3937
name: Test addon (floating dependencies)
@@ -47,20 +45,20 @@ jobs:
4745
- 'test-apps'
4846
timeout-minutes: 7
4947
steps:
50-
- name: Check out a copy of the repo
51-
uses: actions/checkout@v3
52-
53-
- name: Use Node.js ${{ env.NODE_VERSION }}
48+
- uses: actions/checkout@v4
49+
- name: Install Node
5450
uses: actions/setup-node@v3
5551
with:
56-
node-version: ${{ env.NODE_VERSION }}
57-
cache: yarn
52+
node-version: 18.x
53+
- uses: pnpm/action-setup@v2
54+
with:
55+
version: 9
5856

5957
- name: Install dependencies
60-
run: yarn install --no-lockfile --non-interactive
58+
run: pnpm i --no-lockfile
6159

6260
- name: Test
63-
run: yarn test:${{ matrix.script-name }}
61+
run: pnpm test:${{ matrix.script-name }}
6462

6563
test-addon-locked:
6664
name: Test addon (locked dependencies)
@@ -74,20 +72,20 @@ jobs:
7472
- 'test-apps'
7573
timeout-minutes: 7
7674
steps:
77-
- name: Check out a copy of the repo
78-
uses: actions/checkout@v3
79-
80-
- name: Use Node.js ${{ env.NODE_VERSION }}
75+
- uses: actions/checkout@v4
76+
- name: Install Node
8177
uses: actions/setup-node@v3
8278
with:
83-
node-version: ${{ env.NODE_VERSION }}
84-
cache: yarn
79+
node-version: 18.x
80+
- uses: pnpm/action-setup@v2
81+
with:
82+
version: 9
8583

8684
- name: Install dependencies
87-
run: yarn install --frozen-lockfile
85+
run: pnpm i --frozen-lockfile
8886

8987
- name: Test
90-
run: yarn test:${{ matrix.script-name }}
88+
run: pnpm test:${{ matrix.script-name }}
9189

9290
test-compatibility:
9391
name: Test compatibility
@@ -99,26 +97,27 @@ jobs:
9997
- ember-lts-4.4
10098
- ember-lts-4.8
10199
- ember-lts-4.12
100+
- ember-lts-5.4
102101
- ember-release
103102
- ember-beta
104103
- ember-canary
105104
- embroider-safe
106105
timeout-minutes: 7
107106
steps:
108-
- name: Check out a copy of the repo
109-
uses: actions/checkout@v3
110-
111-
- name: Use Node.js ${{ env.NODE_VERSION }}
107+
- uses: actions/checkout@v4
108+
- name: Install Node
112109
uses: actions/setup-node@v3
113110
with:
114-
node-version: ${{ env.NODE_VERSION }}
115-
cache: yarn
111+
node-version: 18.x
112+
- uses: pnpm/action-setup@v2
113+
with:
114+
version: 9
116115

117116
- name: Install dependencies
118-
run: yarn install --frozen-lockfile
117+
run: pnpm i --frozen-lockfile
119118

120119
- name: Test
121-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
120+
run: pnpm ember try:one ${{ matrix.try-scenario }}
122121

123122
deploy-app:
124123
name: Deploy app
@@ -145,10 +144,10 @@ jobs:
145144
uses: actions/setup-node@v3
146145
with:
147146
node-version: ${{ env.NODE_VERSION }}
148-
cache: yarn
147+
cache: pnpm
149148

150149
- name: Install dependencies
151-
run: yarn install --frozen-lockfile
150+
run: pnpm i --frozen-lockfile
152151

153152
- name: Deploy
154-
run: yarn deploy
153+
run: pnpm deploy

.npmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
/ember-cli-build.js
2323
/testem.js
2424
/tests/
25+
/tsconfig.declarations.json
26+
/tsconfig.json
2527
/yarn-error.log
2628
/yarn.lock
2729
.gitkeep

.tool-versions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
nodejs 18.19.0
1+
nodejs 18.20.3
2+
pnpm 9.9.0

CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
## Installation
44

5-
* `git clone <repository-url>`
6-
* `cd ember-cli-addon-docs`
7-
* `yarn install`
5+
- `git clone <repository-url>`
6+
- `cd ember-cli-addon-docs`
7+
- `pnpm install`
88

99
## Linting
1010

11-
* `yarn lint`
12-
* `yarn lint:fix`
11+
- `pnpm lint`
12+
- `pnpm lint:fix`
1313

1414
## Running tests
1515

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

2020
## Running the dummy application
2121

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

2525
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

addon/adapters/-addon-docs.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Adapter from '@ember-data/adapter';
2-
import fetch from 'fetch';
32
import { getRootURL } from 'ember-cli-addon-docs/-private/config';
43

54
export default class AddonDocsAdapter extends Adapter {

addon/services/docs-search.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Service from '@ember/service';
22
import lunr from 'lunr';
3-
import fetch from 'fetch';
43
import { enqueueTask } from 'ember-concurrency';
54
import {
65
getAddonDocsConfig,

addon/services/project-version.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Service from '@ember/service';
22
import { task } from 'ember-concurrency';
3-
import fetch from 'fetch';
43
import { tracked } from '@glimmer/tracking';
54
import {
65
addonDocsConfig,

ember-cli-addon-docs.sketch

-152 KB
Binary file not shown.

0 commit comments

Comments
 (0)