Skip to content

Commit fe6e203

Browse files
authored
Merge pull request #81 from jrjohnson/update-ember-512
[breaking] Update to Ember CLI 5.12.0
2 parents f461766 + a78fe0e commit fe6e203

35 files changed

+5233
-5824
lines changed

.ember-cli

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
3+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
4+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
75
*/
8-
"disableAnalytics": false
6+
"isTypeScriptProject": false
97
}

.eslintignore

+1-15
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# ember-try
2014
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try
26-
27-
# types
28-
/types/

.eslintrc.js

+14-7
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
14-
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
17+
extends: [
18+
'eslint:recommended',
19+
'plugin:ember/recommended',
20+
'plugin:prettier/recommended',
21+
],
1522
env: {
1623
browser: true,
1724
},
@@ -22,6 +29,7 @@ module.exports = {
2229
files: [
2330
'./.eslintrc.js',
2431
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2533
'./.template-lintrc.js',
2634
'./ember-cli-build.js',
2735
'./index.js',
@@ -37,8 +45,7 @@ module.exports = {
3745
browser: false,
3846
node: true,
3947
},
40-
plugins: ['node'],
41-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
4249
},
4350
{
4451
// test files

.github/workflows/ci.yml

+17-20
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,21 @@ on:
1111
- cron: '0 3 * * *' # daily, at 3am
1212

1313
concurrency:
14-
group: ci-${{ github.head_ref || github.ref }}
15-
cancel-in-progress: true
14+
group: ci-${{ github.head_ref || github.ref }}
15+
cancel-in-progress: true
1616

1717
jobs:
1818
test:
1919
name: "Tests"
2020
runs-on: ubuntu-latest
21+
timeout-minutes: 10
2122

2223
steps:
23-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
2425
- name: Install Node
25-
uses: actions/setup-node@v2
26+
uses: actions/setup-node@v3
2627
with:
27-
node-version: 14.x
28+
node-version: 18
2829
cache: yarn
2930
- name: Install Dependencies
3031
run: yarn install --frozen-lockfile
@@ -36,12 +37,13 @@ jobs:
3637
floating:
3738
name: "Floating Dependencies"
3839
runs-on: ubuntu-latest
40+
timeout-minutes: 10
3941

4042
steps:
41-
- uses: actions/checkout@v2
42-
- uses: actions/setup-node@v2
43+
- uses: actions/checkout@v3
44+
- uses: actions/setup-node@v3
4345
with:
44-
node-version: 14.x
46+
node-version: 18
4547
cache: yarn
4648
- name: Install Dependencies
4749
run: yarn install --no-lockfile
@@ -51,32 +53,27 @@ jobs:
5153
try-scenarios:
5254
name: ${{ matrix.try-scenario }}
5355
runs-on: ubuntu-latest
54-
needs: 'test'
56+
needs: "test"
57+
timeout-minutes: 10
5558

5659
strategy:
5760
fail-fast: false
5861
matrix:
5962
try-scenario:
60-
- ember-lts-3.8
61-
- ember-lts-3.12
62-
- ember-lts-3.16
63-
- ember-lts-3.20
64-
- ember-lts-3.24
65-
- ember-lts-3.28
63+
- ember-lts-4.12
64+
- ember-lts-5.4
6665
- ember-release
6766
- ember-beta
6867
- ember-canary
69-
- ember-classic
70-
- ember-default-with-jquery
7168
- embroider-safe
7269
- embroider-optimized
7370

7471
steps:
75-
- uses: actions/checkout@v2
72+
- uses: actions/checkout@v3
7673
- name: Install Node
77-
uses: actions/setup-node@v2
74+
uses: actions/setup-node@v3
7875
with:
79-
node-version: 14.x
76+
node-version: 18
8077
cache: yarn
8178
- name: Install Dependencies
8279
run: yarn install --frozen-lockfile

.gitignore

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
2619
/npm-shrinkwrap.json.ember-try
2720
/package.json.ember-try
2821
/package-lock.json.ember-try
2922
/yarn.lock.ember-try
23+
24+
# broccoli-debug
25+
/DEBUG/

.npmignore

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
@@ -18,22 +14,23 @@
1814
/.gitignore
1915
/.prettierignore
2016
/.prettierrc.js
17+
/.stylelintignore
18+
/.stylelintrc.js
2119
/.template-lintrc.js
2220
/.travis.yml
2321
/.watchmanconfig
24-
/bower.json
25-
/config/ember-try.js
2622
/CONTRIBUTING.md
2723
/ember-cli-build.js
2824
/testem.js
2925
/tests/
26+
/tsconfig.declarations.json
27+
/tsconfig.json
3028
/yarn-error.log
3129
/yarn.lock
3230
.gitkeep
3331

3432
# ember-try
3533
/.node_modules.ember-try/
36-
/bower.json.ember-try
3734
/npm-shrinkwrap.json.ember-try
3835
/package.json.ember-try
3936
/package-lock.json.ember-try

.prettierignore

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

.prettierrc.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
module.exports = {
2-
singleQuote: true,
3-
trailingComma: 'es5',
4-
printWidth: 100,
2+
overrides: [
3+
{
4+
files: '*.{js,ts}',
5+
options: {
6+
singleQuote: true,
7+
},
8+
},
9+
],
510
};

.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

.stylelintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

.template-lintrc.js

+3
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22

33
module.exports = {
44
extends: 'recommended',
5+
rules: {
6+
'no-at-ember-render-modifiers': false,
7+
},
58
};

.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
## Running tests
1515

16-
- `ember test` – Runs the test suite on the current Ember version
17-
- `ember test --server` – Runs the test suite in "watch mode"
18-
- `ember try:each` – Runs the test suite against multiple Ember versions
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
1919

2020
## Running the dummy application
2121

22-
- `ember serve`
22+
- `yarn start`
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/).

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ most use-cases where you might want to reach for this package.
3131

3232
## Compatibility
3333

34-
- Ember.js v3.20 or above
35-
- Ember CLI v3.20 or above
36-
- Node.js v12 or above
34+
- Ember.js v4.12 or above
35+
- Ember CLI v4.12 or above
36+
- Node.js v18 or above
3737

3838
## Installation
3939

4040
```
4141
ember install @ember/render-modifiers
4242
```
4343

44-
## Usage Examples
44+
## Usage
4545

4646
### Example: Scrolling an element to a position
4747

addon/modifiers/did-insert.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ import { macroCondition, dependencySatisfies } from '@embroider/macros';
4848
export default setModifierManager(
4949
() => ({
5050
capabilities: capabilities(
51-
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1')) ? '3.22' : '3.13',
52-
{ disableAutoTracking: true }
51+
macroCondition(dependencySatisfies('ember-source', '>= 3.22.0-beta.1'))
52+
? '3.22'
53+
: '3.13',
54+
{ disableAutoTracking: true },
5355
),
5456

5557
createModifier() {},
@@ -61,5 +63,5 @@ export default setModifierManager(
6163
updateModifier() {},
6264
destroyModifier() {},
6365
}),
64-
class DidInsertModifier {}
66+
class DidInsertModifier {},
6567
);

0 commit comments

Comments
 (0)