Skip to content

Commit 1e6ed03

Browse files
authored
Merge pull request #934 from ember-fastboot/update
Update ember-cli-fastboot to 4.12 with ember-cli-update
2 parents 1c768fa + c32445b commit 1e6ed03

File tree

30 files changed

+1951
-1428
lines changed

30 files changed

+1951
-1428
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,10 @@ jobs:
130130
- ember-lts-3.24
131131
- ember-lts-3.28
132132
- ember-lts-4.4
133+
- ember-lts-4.8
133134
- ember-release
134135
- ember-beta
135136
- ember-canary
136-
- ember-default-with-jquery
137-
- ember-classic
138137
- embroider-safe
139138
- embroider-optimized
140139
- no-deprecations

packages/ember-cli-fastboot/.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
}

packages/ember-cli-fastboot/.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

packages/ember-cli-fastboot/.eslintrc.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
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'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./index.js',
@@ -42,11 +46,10 @@ module.exports = {
4246
browser: false,
4347
node: true,
4448
},
45-
plugins: ['node'],
46-
extends: ['plugin:node/recommended'],
49+
extends: ['plugin:n/recommended'],
4750
},
4851
{
49-
// Test files:
52+
// test files
5053
files: ['tests/**/*-test.{js,ts}'],
5154
extends: ['plugin:qunit/recommended'],
5255
},

packages/ember-cli-fastboot/.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/

packages/ember-cli-fastboot/.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
2023
/.template-lintrc.js
2124
/.travis.yml
2225
/.watchmanconfig
2326
/bower.json
24-
/config/ember-try.js
2527
/CONTRIBUTING.md
2628
/ember-cli-build.js
2729
/testem.js
@@ -34,4 +36,7 @@
3436
# ember-try
3537
/.node_modules.ember-try/
3638
/bower.json.ember-try
39+
/npm-shrinkwrap.json.ember-try
3740
/package.json.ember-try
41+
/package-lock.json.ember-try
42+
/yarn.lock.ember-try

packages/ember-cli-fastboot/.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
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
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};
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/
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+
};

0 commit comments

Comments
 (0)