Skip to content

Commit 6a89917

Browse files
committed
update to v4.12 with ember-cli-update
# Conflicts: # .github/workflows/ci.yml # .gitignore # .stylelintrc.js # README.md # ember-cli-build.js # tests/dummy/app/index.html # tests/dummy/app/styles/app.css # tests/dummy/config/ember-try.js # tests/dummy/config/environment.js # tests/dummy/config/fastboot.js # tests/dummy/config/index.js
1 parent 7646f1c commit 6a89917

25 files changed

+1357
-2107
lines changed

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

.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

.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',
@@ -41,11 +45,10 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
4649
},
4750
{
48-
// Test files:
51+
// test files
4952
files: ['tests/**/*-test.{js,ts}'],
5053
extends: ['plugin:qunit/recommended'],
5154
},

.github/workflows/ci.yml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,29 @@ 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:
15+
lint:
16+
name: "Lint"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 5
19+
20+
steps:
21+
- uses: actions/checkout@v4
22+
- uses: pnpm/action-setup@v4
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: 18.x
26+
cache: pnpm
27+
- run: pnpm install
28+
- run: pnpm run lint
29+
1530
percy:
1631
name: "Percy Tests"
1732
runs-on: ubuntu-latest
33+
timeout-minutes: 10
1834
env:
1935
PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
2036
steps:
@@ -30,6 +46,7 @@ jobs:
3046
test:
3147
name: "Tests"
3248
runs-on: ubuntu-latest
49+
timeout-minutes: 10
3350

3451
steps:
3552
- uses: actions/checkout@v4
@@ -39,12 +56,12 @@ jobs:
3956
node-version: 18.x
4057
cache: pnpm
4158
- run: pnpm install
42-
- run: pnpm run lint
43-
- run: pnpm percy exec -- pnpm run test
59+
- run: pnpm run test:ember
4460

4561
floating:
4662
name: "Floating Dependencies"
4763
runs-on: ubuntu-latest
64+
timeout-minutes: 10
4865

4966
steps:
5067
- uses: actions/checkout@v4
@@ -59,17 +76,18 @@ jobs:
5976
try-scenarios:
6077
name: ${{ matrix.try-scenario }}
6178
runs-on: ubuntu-latest
62-
needs: 'test'
79+
needs: "test"
80+
timeout-minutes: 10
6381

6482
strategy:
6583
fail-fast: false
6684
matrix:
6785
try-scenario:
6886
- ember-lts-3.28
87+
- ember-lts-4.4
88+
- ember-lts-4.8
6989
- ember-release
7090
- ember-beta
71-
- ember-classic
72-
- ember-default-with-jquery
7391
- embroider-safe
7492
- embroider-optimized
7593
- no-deprecations
@@ -89,6 +107,7 @@ jobs:
89107
name: ${{ matrix.try-scenario }} - Allowed to fail
90108
runs-on: ubuntu-latest
91109
needs: 'test'
110+
timeout-minutes: 10
92111
permissions:
93112
pull-requests: write
94113

.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
# ember-try
2525
/.node_modules.ember-try/
2626
/bower.json.ember-try
27+
/npm-shrinkwrap.json.ember-try
2728
/package.json.ember-try
29+
/package-lock.json.ember-try
30+
/yarn.lock.ember-try
2831

29-
.vscode
30-
.idea
31-
.changelog
32+
# broccoli-debug
33+
/DEBUG/

.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
@@ -33,4 +35,7 @@
3335
# ember-try
3436
/.node_modules.ember-try/
3537
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
3639
/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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* eslint-disable no-undef, prettier/prettier */
1+
'use strict';
2+
23
module.exports = {
3-
extends: 'stylelint-config-standard',
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
45
plugins: [
56
'stylelint-declaration-strict-value',
67
'stylelint-order'

0 commit comments

Comments
 (0)