Skip to content

Commit ed004b5

Browse files
RobbieTheWagnerRobbieTheWagner
authored
Require ember-auto-import 2 (#933)
* Yarn upgrade * ember-auto-import 2 * Update package.json
1 parent f7e47b1 commit ed004b5

File tree

4 files changed

+414
-140
lines changed

4 files changed

+414
-140
lines changed

‎.github/workflows/ci-cd.yml

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,12 @@ jobs:
2323
with:
2424
node-version: ${{ env.NODE_VERSION }}
2525

26-
- name: Get Yarn cache path
27-
id: yarn-cache-dir-path
28-
run: echo "::set-output name=dir::$(yarn cache dir)"
29-
30-
- name: Cache Yarn cache and node_modules
31-
id: cache-dependencies
32-
uses: actions/cache@v2
33-
with:
34-
path: |
35-
${{ steps.yarn-cache-dir-path.outputs.dir }}
36-
node_modules
37-
test-apps/new-addon/node_modules
38-
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
39-
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-
40-
4126
- name: Install dependencies
4227
run: yarn install --frozen-lockfile
43-
if: steps.cache-dependencies.outputs.cache-hit != 'true'
4428

4529
- name: Lint
4630
run: yarn lint
4731

48-
4932
test-addon-floating:
5033
name: Test addon (floating dependencies)
5134
runs-on: ubuntu-latest
@@ -72,7 +55,6 @@ jobs:
7255
- name: Test
7356
run: yarn test:${{ matrix.script-name }}
7457

75-
7658
test-addon-locked:
7759
name: Test addon (locked dependencies)
7860
runs-on: ubuntu-latest
@@ -93,29 +75,12 @@ jobs:
9375
with:
9476
node-version: ${{ env.NODE_VERSION }}
9577

96-
- name: Get Yarn cache path
97-
id: yarn-cache-dir-path
98-
run: echo "::set-output name=dir::$(yarn cache dir)"
99-
100-
- name: Cache Yarn cache and node_modules
101-
id: cache-dependencies
102-
uses: actions/cache@v2
103-
with:
104-
path: |
105-
${{ steps.yarn-cache-dir-path.outputs.dir }}
106-
node_modules
107-
test-apps/new-addon/node_modules
108-
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
109-
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-
110-
11178
- name: Install dependencies
11279
run: yarn install --frozen-lockfile
113-
if: steps.cache-dependencies.outputs.cache-hit != 'true'
11480

11581
- name: Test
11682
run: yarn test:${{ matrix.script-name }}
11783

118-
11984
test-compatibility:
12085
name: Test compatibility
12186
runs-on: ubuntu-latest
@@ -142,29 +107,12 @@ jobs:
142107
with:
143108
node-version: ${{ env.NODE_VERSION }}
144109

145-
- name: Get Yarn cache path
146-
id: yarn-cache-dir-path
147-
run: echo "::set-output name=dir::$(yarn cache dir)"
148-
149-
- name: Cache Yarn cache and node_modules
150-
id: cache-dependencies
151-
uses: actions/cache@v2
152-
with:
153-
path: |
154-
${{ steps.yarn-cache-dir-path.outputs.dir }}
155-
node_modules
156-
test-apps/new-addon/node_modules
157-
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ matrix.scenario }}-${{ hashFiles('**/yarn.lock') }}
158-
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ matrix.scenario }}-
159-
160110
- name: Install dependencies
161111
run: yarn install --frozen-lockfile
162-
if: steps.cache-dependencies.outputs.cache-hit != 'true'
163112

164113
- name: Test
165114
run: yarn test:ember-compatibility ${{ matrix.scenario }}
166115

167-
168116
deploy-app:
169117
name: Deploy app
170118
needs: [lint, test-addon-floating, test-addon-locked, test-compatibility]
@@ -191,24 +139,8 @@ jobs:
191139
with:
192140
node-version: ${{ env.NODE_VERSION }}
193141

194-
- name: Get Yarn cache path
195-
id: yarn-cache-dir-path
196-
run: echo "::set-output name=dir::$(yarn cache dir)"
197-
198-
- name: Cache Yarn cache and node_modules
199-
id: cache-dependencies
200-
uses: actions/cache@v2
201-
with:
202-
path: |
203-
${{ steps.yarn-cache-dir-path.outputs.dir }}
204-
node_modules
205-
test-apps/new-addon/node_modules
206-
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
207-
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-
208-
209142
- name: Install dependencies
210143
run: yarn install --frozen-lockfile
211-
if: steps.cache-dependencies.outputs.cache-hit != 'true'
212144

213145
- name: Deploy
214146
run: yarn deploy

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@
3232
},
3333
"resolutions": {
3434
"**/ember-cli-babel": "^7.26.6",
35-
"**/@ember/string": "^3.0.0",
3635
"**/@ember/render-modifiers": "cibernox/ember-render-modifiers#e3574ed03409ef7a048d7716b8bea361ed6cd6e2",
37-
"**/ember-tether": "^2.0.1",
38-
"**/tough-cookie": "~2.4.0"
36+
"**/ember-tether": "^2.0.1"
3937
},
4038
"dependencies": {
4139
"@csstools/postcss-sass": "^4.0.0",
40+
"@ember/render-modifiers": "cibernox/ember-render-modifiers#e3574ed03409ef7a048d7716b8bea361ed6cd6e2",
4241
"@glimmer/syntax": "^0.80.0",
4342
"broccoli-bridge": "^1.0.0",
4443
"broccoli-caching-writer": "^3.0.3",
@@ -51,7 +50,7 @@
5150
"broccoli-source": "^3.0.0",
5251
"broccoli-stew": "^3.0.0",
5352
"chalk": "^4.1.0",
54-
"ember-auto-import": "^1.11.3",
53+
"ember-auto-import": "^2.2.0",
5554
"ember-cli-autoprefixer": "^1.0.2",
5655
"ember-cli-babel": "^7.26.6",
5756
"ember-cli-clipboard": "jkusa/ember-cli-clipboard#e27143fe91c486baa4fe2abf654f73ef594b5216",
@@ -107,7 +106,7 @@
107106
"@ember/optional-features": "^2.0.0",
108107
"@ember/test-helpers": "^2.4.2",
109108
"@embroider/test-setup": "^0.44.1",
110-
"@fullhuman/postcss-purgecss": "^3.0.0",
109+
"@fullhuman/postcss-purgecss": "^4.0.3",
111110
"@glimmer/component": "^1.0.4",
112111
"@glimmer/tracking": "^1.0.4",
113112
"babel-eslint": "^10.1.0",
@@ -151,9 +150,10 @@
151150
"npm-run-all": "^4.1.5",
152151
"prettier": "^2.4.0",
153152
"qunit": "^2.17.1",
154-
"qunit-dom": "^1.6.0",
153+
"qunit-dom": "^2.0.0",
155154
"release-it": "^14.11.5",
156-
"release-it-lerna-changelog": "^3.1.0"
155+
"release-it-lerna-changelog": "^3.1.0",
156+
"webpack": "^5.52.1"
157157
},
158158
"peerDependencies": {
159159
"ember-data": ">= 3.0.0",

‎test-apps/new-addon/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"test:all": "ember try:each"
2121
},
2222
"dependencies": {
23-
"ember-cli-babel": "*"
23+
"ember-cli-babel": "*",
24+
"ember-auto-import": "*"
2425
},
2526
"devDependencies": {
2627
"@ember/test-helpers": "*",
@@ -49,7 +50,8 @@
4950
"eslint-plugin-node": "*",
5051
"loader.js": "*",
5152
"qunit": "*",
52-
"qunit-dom": "*"
53+
"qunit-dom": "*",
54+
"webpack": "*"
5355
},
5456
"engines": {
5557
"node": "12.* || >= 14.*"

0 commit comments

Comments
 (0)