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.

Sign up for GitHub

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

Require ember-auto-import 2 #933

Merged
merged 3 commits into from
Sep 13, 2021
Merged

Require ember-auto-import 2 #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c28503
Yarn upgrade
RobbieTheWagner Sep 13, 2021
dcbad56
ember-auto-import 2
RobbieTheWagner Sep 13, 2021
71670b0
Update package.json
RobbieTheWagner Sep 13, 2021
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
68 changes: 0 additions & 68 deletions .github/workflows/ci-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,12 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- name: Get Yarn cache path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Yarn cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
test-apps/new-addon/node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-

- name: Install dependencies
run: yarn install --frozen-lockfile
if: steps.cache-dependencies.outputs.cache-hit != 'true'

- name: Lint
run: yarn lint


test-addon-floating:
name: Test addon (floating dependencies)
runs-on: ubuntu-latest
Expand All @@ -72,7 +55,6 @@ jobs:
- name: Test
run: yarn test:${{ matrix.script-name }}


test-addon-locked:
name: Test addon (locked dependencies)
runs-on: ubuntu-latest
Expand All @@ -93,29 +75,12 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- name: Get Yarn cache path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Yarn cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
test-apps/new-addon/node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-

- name: Install dependencies
run: yarn install --frozen-lockfile
if: steps.cache-dependencies.outputs.cache-hit != 'true'

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


test-compatibility:
name: Test compatibility
runs-on: ubuntu-latest
Expand All @@ -142,29 +107,12 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- name: Get Yarn cache path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Yarn cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
test-apps/new-addon/node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ matrix.scenario }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ matrix.scenario }}-

- name: Install dependencies
run: yarn install --frozen-lockfile
if: steps.cache-dependencies.outputs.cache-hit != 'true'

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


deploy-app:
name: Deploy app
needs: [lint, test-addon-floating, test-addon-locked, test-compatibility]
Expand All @@ -191,24 +139,8 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- name: Get Yarn cache path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Yarn cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
test-apps/new-addon/node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-

- name: Install dependencies
run: yarn install --frozen-lockfile
if: steps.cache-dependencies.outputs.cache-hit != 'true'

- name: Deploy
run: yarn deploy
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@
},
"resolutions": {
"**/ember-cli-babel": "^7.26.6",
"**/@ember/string": "^3.0.0",
"**/@ember/render-modifiers": "cibernox/ember-render-modifiers#e3574ed03409ef7a048d7716b8bea361ed6cd6e2",
"**/ember-tether": "^2.0.1",
"**/tough-cookie": "~2.4.0"
"**/ember-tether": "^2.0.1"
},
"dependencies": {
"@csstools/postcss-sass": "^4.0.0",
"@ember/render-modifiers": "cibernox/ember-render-modifiers#e3574ed03409ef7a048d7716b8bea361ed6cd6e2",
"@glimmer/syntax": "^0.80.0",
"broccoli-bridge": "^1.0.0",
"broccoli-caching-writer": "^3.0.3",
Expand All @@ -51,7 +50,7 @@
"broccoli-source": "^3.0.0",
"broccoli-stew": "^3.0.0",
"chalk": "^4.1.0",
"ember-auto-import": "^1.11.3",
"ember-auto-import": "^2.2.0",
"ember-cli-autoprefixer": "^1.0.2",
"ember-cli-babel": "^7.26.6",
"ember-cli-clipboard": "jkusa/ember-cli-clipboard#e27143fe91c486baa4fe2abf654f73ef594b5216",
Expand Down Expand Up @@ -107,7 +106,7 @@
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.4.2",
"@embroider/test-setup": "^0.44.1",
"@fullhuman/postcss-purgecss": "^3.0.0",
"@fullhuman/postcss-purgecss": "^4.0.3",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
Expand Down Expand Up @@ -151,9 +150,10 @@
"npm-run-all": "^4.1.5",
"prettier": "^2.4.0",
"qunit": "^2.17.1",
"qunit-dom": "^1.6.0",
"qunit-dom": "^2.0.0",
"release-it": "^14.11.5",
"release-it-lerna-changelog": "^3.1.0"
"release-it-lerna-changelog": "^3.1.0",
"webpack": "^5.52.1"
},
"peerDependencies": {
"ember-data": ">= 3.0.0",
Expand Down
6 changes: 4 additions & 2 deletions test-apps/new-addon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"test:all": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "*"
"ember-cli-babel": "*",
"ember-auto-import": "*"
},
"devDependencies": {
"@ember/test-helpers": "*",
Expand Down Expand Up @@ -49,7 +50,8 @@
"eslint-plugin-node": "*",
"loader.js": "*",
"qunit": "*",
"qunit-dom": "*"
"qunit-dom": "*",
"webpack": "*"
},
"engines": {
"node": "12.* || >= 14.*"
Expand Down
Loading