Skip to content

Commit 8f65879

Browse files
authored
Merge pull request #107 from ember-fastboot/update-ember
update to v4.12 with ember-cli-update
2 parents f2c7e0b + 1ee0b14 commit 8f65879

29 files changed

+1018
-2732
lines changed

.ember-cli

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,10 @@
66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
88
"disableAnalytics": false,
9-
"useYarn": true
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
1015
}

.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
# misc
1515
/coverage/
1616
!.*
17+
.*/
1718
.eslintcache
1819

1920
# ember-try
2021
/.node_modules.ember-try/
2122
/bower.json.ember-try
23+
/npm-shrinkwrap.json.ember-try
2224
/package.json.ember-try
25+
/package-lock.json.ember-try
26+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 23 additions & 21 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'],
@@ -24,21 +27,16 @@ module.exports = {
2427
// node files
2528
{
2629
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'index.js',
32-
'testem.js',
33-
'blueprints/*/index.js',
34-
'config/**/*.js',
35-
'tests/dummy/config/**/*.js',
36-
],
37-
excludedFiles: [
38-
'addon/**',
39-
'addon-test-support/**',
40-
'app/**',
41-
'tests/dummy/app/**',
30+
'./.eslintrc.js',
31+
'./.prettierrc.js',
32+
'./.stylelintrc.js',
33+
'./.template-lintrc.js',
34+
'./ember-cli-build.js',
35+
'./index.js',
36+
'./testem.js',
37+
'./blueprints/*/index.js',
38+
'./config/**/*.js',
39+
'./tests/dummy/config/**/*.js',
4240
],
4341
parserOptions: {
4442
sourceType: 'script',
@@ -47,8 +45,12 @@ module.exports = {
4745
browser: false,
4846
node: true,
4947
},
50-
plugins: ['node'],
51-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
49+
},
50+
{
51+
// test files
52+
files: ['tests/**/*-test.{js,ts}'],
53+
extends: ['plugin:qunit/recommended'],
5254
},
5355
],
5456
};

.github/workflows/ci.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ on:
88
pull_request: {}
99

1010
concurrency:
11-
group: ci-${{ github.head_ref || github.ref }}
12-
cancel-in-progress: true
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1313

1414
jobs:
1515
test:
1616
name: "Tests"
1717
runs-on: ubuntu-latest
18+
timeout-minutes: 10
1819

1920
steps:
2021
- uses: actions/checkout@v4
@@ -36,6 +37,7 @@ jobs:
3637
floating:
3738
name: "Floating Dependencies"
3839
runs-on: ubuntu-latest
40+
timeout-minutes: 10
3941

4042
steps:
4143
- uses: actions/checkout@v4
@@ -54,20 +56,27 @@ jobs:
5456
try-scenarios:
5557
name: ${{ matrix.try-scenario }}
5658
runs-on: ubuntu-latest
57-
needs: 'test'
59+
needs: "test"
60+
timeout-minutes: 10
5861

5962
strategy:
6063
fail-fast: false
6164
matrix:
6265
try-scenario:
6366
- ember-lts-3.16
6467
- ember-lts-3.20
68+
- ember-lts-3.24
69+
- ember-lts-3.28
70+
- ember-lts-4.4
71+
- ember-lts-4.8
6572
- ember-release
6673
- ember-beta
6774
- ember-canary
68-
- ember-default-with-jquery
75+
- ember-classic
6976
- embroider-safe
7077
- embroider-optimized
78+
- no-deprecations
79+
- ember-release-no-deprecations
7180

7281
steps:
7382
- uses: actions/checkout@v4

.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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,28 @@
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
2830
/tests/
31+
/yarn-error.log
2932
/yarn.lock
3033
.gitkeep
3134

3235
# ember-try
3336
/.node_modules.ember-try/
3437
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
3539
/package.json.ember-try
40+
/package-lock.json.ember-try
41+
/yarn.lock.ember-try

.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

.prettierrc.js

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
};

.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+
};

0 commit comments

Comments
 (0)