Skip to content

Commit 8e1aa28

Browse files
authored
chore: update ember-auto-import to v2 & ember-cli v4 (#370)
BREAKING CHANGE: This commit contains many breaking changes: - Drops ember classic component support (glimmer only) - Drops support for `sendAction` - Requires ember-auto-import 2.x - `<CopyButton>` component arg name changes: | Old Argument Name | New Argument Name | | ------------------ | -------------------------------------- | | `@clipboardText` | `@text` | | `@clipboardTarget` | `@target` | | `@clipboardAction` | `@action` | | `@success` | `@onSuccess` | | `@error` | `@onError` | | `@title` | no longer supported, pass as attribute | | `@disabled` | no longer supported, pass as attribute | | `@aria-label` | no longer supported, pass as attribute |
1 parent fae8d89 commit 8e1aa28

39 files changed

+13302
-11216
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = {
4545
extends: ['plugin:node/recommended'],
4646
},
4747
{
48-
// Test files:
48+
// test files
4949
files: ['tests/**/*-test.{js,ts}'],
5050
extends: ['plugin:qunit/recommended'],
5151
},

.github/workflows/ci.yml

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,79 @@
11
name: CI
22

33
on:
4-
pull_request:
54
push:
6-
# filtering branches here prevents duplicate builds from pull_request and push
75
branches:
86
- main
9-
schedule:
10-
- cron: '0 3 * * 0' # every Sunday at 3am
7+
- master
8+
pull_request: {}
119

12-
env:
13-
CI: true
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1413

1514
jobs:
16-
tests:
17-
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
18-
name: Base Tests
19-
timeout-minutes: 5
15+
test:
16+
name: 'Tests'
2017
runs-on: ubuntu-latest
21-
strategy:
22-
matrix:
23-
node:
24-
- '12'
25-
- '14'
18+
timeout-minutes: 10
19+
2620
steps:
27-
- uses: actions/checkout@v2
28-
- uses: volta-cli/action@v1
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
2924
with:
30-
node-version: ${{ matrix.node }}
31-
32-
- run: npm ci
33-
34-
- name: Test with ${{ matrix.node }}
25+
node-version: 14.x
26+
cache: npm
27+
- name: Install Dependencies
28+
run: npm ci
29+
- name: Lint
30+
run: npm run lint
31+
- name: Run Tests
3532
run: npm run test:ember
3633

37-
floating-dependencies:
38-
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
39-
name: Floating Dependencies
40-
timeout-minutes: 5
34+
floating:
35+
name: 'Floating Dependencies'
4136
runs-on: ubuntu-latest
42-
strategy:
43-
matrix:
44-
node:
45-
- '12'
46-
- '14'
37+
timeout-minutes: 10
4738

4839
steps:
49-
- uses: actions/checkout@v2
50-
- uses: volta-cli/action@v1
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
5142
with:
52-
node-version: ${{ matrix.node }}
53-
54-
- run: npm install --no-package-lock
55-
- name: Test with Node ${{ matrix.node }}
43+
node-version: 14.x
44+
cache: npm
45+
- name: Install Dependencies
46+
run: npm install --no-shrinkwrap
47+
- name: Run Tests
5648
run: npm run test:ember
5749

5850
try-scenarios:
59-
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
60-
name: 'Compatibility'
61-
timeout-minutes: 5
51+
name: ${{ matrix.try-scenario }}
6252
runs-on: ubuntu-latest
63-
needs: tests
53+
needs: 'test'
54+
timeout-minutes: 10
6455

6556
strategy:
66-
fail-fast: true
57+
fail-fast: false
6758
matrix:
68-
ember-try-scenario:
69-
- ember-lts-3.20
59+
try-scenario:
7060
- ember-lts-3.24
61+
- ember-lts-3.28
7162
- ember-release
72-
# - ember-beta
73-
# - ember-canary
63+
- ember-beta
64+
- ember-canary
7465
- ember-classic
66+
- embroider-safe
67+
- embroider-optimized
68+
7569
steps:
76-
- uses: actions/checkout@v2
77-
- uses: volta-cli/action@v1
70+
- uses: actions/checkout@v3
71+
- name: Install Node
72+
uses: actions/setup-node@v3
7873
with:
7974
node-version: 14.x
80-
- name: install dependencies
75+
cache: npm
76+
- name: Install Dependencies
8177
run: npm ci
82-
- name: test
83-
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
78+
- name: Run Tests
79+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.github/workflows/lint.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
@@ -33,4 +34,7 @@
3334
# ember-try
3435
/.node_modules.ember-try/
3536
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
3638
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try
2226

2327
# ignore due to block indent issues for code samples
2428
/tests/dummy/app/templates/application.hbs

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
- `ember serve`
2323
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

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

0 commit comments

Comments
 (0)