Skip to content

Commit f42f05a

Browse files
committed
Running ember-cli-update
This is prepping for a semver major release that will drop support for old node and ember versions.
1 parent 60d499b commit f42f05a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+4836
-7265
lines changed

.ember-cli

Lines changed: 3 additions & 5 deletions
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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,14 @@
33

44
# unconventional js
55
/blueprints/*/files/
6-
/vendor/
76

87
# compiled output
98
/dist/
10-
/tmp/
11-
12-
# dependencies
13-
/bower_components/
149

1510
# misc
1611
/coverage/
1712
!.*
1813
.*/
19-
.eslintcache
2014

2115
# ember-try
2216
/.node_modules.ember-try/
23-
/bower.json.ember-try
24-
/package.json.ember-try

.eslintrc.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
module.exports = {
22
root: true,
3-
parser: 'babel-eslint',
3+
parser: '@babel/eslint-parser',
44
parserOptions: {
5-
ecmaVersion: 2018,
5+
ecmaVersion: 'latest',
66
sourceType: 'module',
7+
requireConfigFile: false,
8+
babelOptions: {
9+
plugins: [
10+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
11+
],
12+
},
713
},
814
plugins: ['ember', 'prettier'],
9-
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
15+
extends: [
16+
'eslint:recommended',
17+
'plugin:ember/recommended',
18+
'plugin:prettier/recommended',
19+
],
1020
env: {
1121
browser: true,
1222
},
@@ -21,6 +31,7 @@ module.exports = {
2131
files: [
2232
'./.eslintrc.js',
2333
'./.prettierrc.js',
34+
'./.stylelintrc.js',
2435
'./.template-lintrc.js',
2536
'colocated-broccoli-plugin.js',
2637
'./ember-cli-build.js',
@@ -39,10 +50,7 @@ module.exports = {
3950
browser: false,
4051
node: true,
4152
},
42-
plugins: ['node'],
43-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
44-
// add your custom rules and overrides for node files here
45-
}),
53+
extends: ['plugin:n/recommended'],
4654
},
4755

4856
// node files
@@ -57,13 +65,11 @@ module.exports = {
5765
node: true,
5866
mocha: true,
5967
},
60-
plugins: ['node', 'mocha'],
61-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
62-
// add your custom rules and overrides for node files here
63-
}),
68+
plugins: ['mocha'],
69+
extends: ['plugin:n/recommended'],
6470
},
6571
{
66-
// Test files:
72+
// test files
6773
files: ['tests/**/*-test.{js,ts}'],
6874
extends: ['plugin:qunit/recommended'],
6975
},

.github/workflows/ci.yml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v3
2020
- uses: actions/setup-node@v3
2121
with:
22-
node-version: 12.x
22+
node-version: 18.x
2323
- name: install dependencies
2424
run: yarn install --frozen-lockfile
2525
- name: lint:js
@@ -35,7 +35,7 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: [ubuntu, windows]
38-
node-version: [12.x, 14.x]
38+
node-version: [18.x, 20.x]
3939

4040
steps:
4141
- uses: actions/checkout@v3
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@v3
6060
- uses: actions/setup-node@v3
6161
with:
62-
node-version: 12.x
62+
node-version: 18.x
6363
- name: install dependencies
6464
run: yarn install --ignore-lockfile
6565
- name: node tests
@@ -78,25 +78,18 @@ jobs:
7878
fail-fast: false
7979
matrix:
8080
ember-try-scenario:
81-
- ember-lts-3.8
82-
- ember-lts-3.12
83-
- ember-lts-3.16
84-
- ember-lts-3.20
85-
- ember-lts-3.24
86-
- ember-lts-3.28
81+
- ember-lts-4.12
8782
- ember-release
8883
- ember-beta
8984
- ember-canary
90-
- ember-classic
91-
- ember-default-with-jquery
9285
- embroider-safe
93-
- with-ember-cli-htmlbars-inline-precompile
86+
- embroider-optimized
9487

9588
steps:
9689
- uses: actions/checkout@v3
9790
- uses: actions/setup-node@v3
9891
with:
99-
node-version: 12.x
92+
node-version: 18.x
10093
- name: install dependencies
10194
run: yarn install
10295
- name: test

.gitignore

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
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
12-
/.sass-cache
13-
/connect.lock
9+
/.env*
10+
/.pnp*
11+
/.eslintcache
1412
/coverage/
15-
/libpeerconnection.log
1613
/npm-debug.log*
1714
/testem.log
1815
/yarn-error.log
1916
/.eslintcache
2017

2118
# ember-try
2219
/.node_modules.ember-try/
23-
/bower.json.ember-try
20+
/npm-shrinkwrap.json.ember-try
2421
/package.json.ember-try
22+
/package-lock.json.ember-try
23+
/yarn.lock.ember-try
24+
25+
# broccoli-debug
26+
/DEBUG/

.npmignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,22 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.eslintignore
139
/.eslintrc.js
10+
/.git/
11+
/.github/
1412
/.gitignore
1513
/.prettierignore
1614
/.prettierrc.js
15+
/.stylelintignore
16+
/.stylelintrc.js
1717
/.template-lintrc.js
1818
/.travis.yml
1919
/.watchmanconfig
20-
/.travis.yml
21-
/bower.json
22-
/config/ember-try.js
20+
/CONTRIBUTING.md
2321
/ember-cli-build.js
2422
/testem.js
2523
/tests/
@@ -30,5 +28,7 @@
3028

3129
# ember-try
3230
/.node_modules.ember-try/
33-
/bower.json.ember-try
31+
/npm-shrinkwrap.json.ember-try
3432
/package.json.ember-try
33+
/package-lock.json.ember-try
34+
/yarn.lock.ember-try

.prettierrc.js

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

.stylelintignore

Lines changed: 8 additions & 0 deletions
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

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)