Skip to content

Commit e9d104d

Browse files
authored
Merge pull request #875 from embermap/ember-cli-update
Sync with latest addon blueprint via ember-cli-update
2 parents 93b2340 + 93aa093 commit e9d104d

34 files changed

Lines changed: 4385 additions & 4544 deletions

.ember-cli

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
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.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

.eslintignore

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +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

.eslintrc.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ module.exports = {
77
root: true,
88
parser: '@babel/eslint-parser',
99
parserOptions: {
10-
ecmaVersion: 2021,
10+
ecmaVersion: 'latest',
1111
sourceType: 'module',
12-
ecmaFeatures: {
13-
legacyDecorators: true,
14-
},
1512
requireConfigFile: false,
1613
babelOptions: {
17-
plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
14+
plugins: [
15+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
16+
],
1817
},
1918
},
2019
plugins: ['ember'],
@@ -33,14 +32,15 @@ module.exports = {
3332
files: [
3433
'./.eslintrc.js',
3534
'./.prettierrc.js',
35+
'./.stylelintrc.js',
3636
'./.template-lintrc.js',
3737
'./ember-cli-build.js',
3838
'./index.js',
3939
'./testem.js',
4040
'./blueprints/*/index.js',
4141
'./config/**/*.js',
42-
'./tests/dummy/config/**/*.js',
4342
'./lib/helpers.js',
43+
'./tests/dummy/config/**/*.js',
4444
],
4545
parserOptions: {
4646
sourceType: 'script',

.github/workflows/ci.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
timeout-minutes: 10
2020

2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- name: Install Node
24-
uses: actions/setup-node@v3
24+
uses: actions/setup-node@v4
2525
with:
26-
node-version: 18.x
26+
node-version: 18
2727
cache: yarn
2828

2929
- name: Install Dependencies
@@ -41,10 +41,10 @@ jobs:
4141
timeout-minutes: 10
4242

4343
steps:
44-
- uses: actions/checkout@v3
45-
- uses: actions/setup-node@v3
44+
- uses: actions/checkout@v4
45+
- uses: actions/setup-node@v4
4646
with:
47-
node-version: 18.x
47+
node-version: 18
4848
cache: yarn
4949

5050
- name: Install Dependencies
@@ -58,11 +58,11 @@ jobs:
5858
runs-on: ubuntu-latest
5959

6060
steps:
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262
- name: Install Node
63-
uses: actions/setup-node@v3
63+
uses: actions/setup-node@v4
6464
with:
65-
node-version: 18.x
65+
node-version: 18
6666
cache: yarn
6767

6868
- name: Install Dependencies
@@ -84,22 +84,24 @@ jobs:
8484
- ember-lts-3.28
8585
- ember-lts-4.4
8686
- ember-lts-4.8
87+
- ember-lts-4.12
88+
- ember-lts-5.4
89+
- ember-lts-5.8
8790
- fastboot-1.2
8891
- fastboot-2.0
8992
- fastboot-3.0
9093
- ember-release
9194
- ember-beta
9295
# - ember-canary
93-
- ember-classic
9496
- embroider-safe
9597
- embroider-optimized
9698

9799
steps:
98-
- uses: actions/checkout@v3
100+
- uses: actions/checkout@v4
99101
- name: Install Node
100-
uses: actions/setup-node@v3
102+
uses: actions/setup-node@v4
101103
with:
102-
node-version: 18.x
104+
node-version: 18
103105
cache: yarn
104106

105107
- name: Install Dependencies
@@ -115,11 +117,11 @@ jobs:
115117
needs: [ test, try-scenarios ]
116118

117119
steps:
118-
- uses: actions/checkout@v3
120+
- uses: actions/checkout@v4
119121
- name: Install Node
120-
uses: actions/setup-node@v3
122+
uses: actions/setup-node@v4
121123
with:
122-
node-version: 18.x
124+
node-version: 18
123125
cache: yarn
124126

125127
- name: Install Dependencies

.gitignore

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
21
# compiled output
32
/dist/
4-
/tmp/
3+
/declarations/
54

65
# dependencies
7-
/bower_components/
86
/node_modules/
97

108
# misc
119
/.env*
1210
/.pnp*
13-
/.sass-cache
1411
/.eslintcache
15-
/connect.lock
1612
/coverage/
17-
/libpeerconnection.log
1813
/npm-debug.log*
1914
/testem.log
2015
/yarn-error.log
2116

2217
# ember-try
2318
/.node_modules.ember-try/
24-
/bower.json.ember-try
2519
/npm-shrinkwrap.json.ember-try
2620
/package.json.ember-try
2721
/package-lock.json.ember-try

.npmignore

Lines changed: 4 additions & 10 deletions
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,25 +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/addon-docs.js
26-
/config/deploy.js
27-
/config/ember-try.js
2822
/CONTRIBUTING.md
2923
/ember-cli-build.js
3024
/testem.js
3125
/tests/
32-
/vendor/tailwind.min.css
26+
/tsconfig.declarations.json
27+
/tsconfig.json
3328
/yarn-error.log
3429
/yarn.lock
3530
.gitkeep
3631

3732
# ember-try
3833
/.node_modules.ember-try/
39-
/bower.json.ember-try
4034
/npm-shrinkwrap.json.ember-try
4135
/package.json.ember-try
4236
/package-lock.json.ember-try

.prettierignore

Lines changed: 1 addition & 13 deletions
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

.stylelintignore

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

.stylelintrc.js

Lines changed: 5 additions & 0 deletions
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+
};

.watchmanconfig

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

0 commit comments

Comments
 (0)