Skip to content

Commit 32f61a5

Browse files
committed
update to v4.12.3 with ember-cli-update
# Conflicts: # .github/workflows/ci.yml # README.md # app/index.html # app/styles/app.css # config/environment.js # ember-cli-build.js
1 parent a629601 commit 32f61a5

File tree

15 files changed

+1470
-2117
lines changed

15 files changed

+1470
-2117
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
}

.eslintrc.js

Lines changed: 9 additions & 11 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'],
@@ -35,6 +38,7 @@ module.exports = {
3538
files: [
3639
'./.eslintrc.js',
3740
'./.prettierrc.js',
41+
'./.stylelintrc.js',
3842
'./.template-lintrc.js',
3943
'./ember-cli-build.js',
4044
'./testem.js',
@@ -55,13 +59,7 @@ module.exports = {
5559
browser: false,
5660
node: true,
5761
},
58-
plugins: ['node'],
59-
extends: ['plugin:node/recommended'],
60-
rules: {
61-
// this can be removed once the following is fixed
62-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
63-
'node/no-unpublished-require': 'off',
64-
},
62+
extends: ['plugin:n/recommended'],
6563
},
6664
{
6765
// test files

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ env:
1313
PERCY_PARALLEL_TOTAL: 1
1414

1515
concurrency:
16-
group: ci-${{ github.head_ref || github.ref }}
17-
cancel-in-progress: true
16+
group: ci-${{ github.head_ref || github.ref }}
17+
cancel-in-progress: true
1818

1919
jobs:
2020
lint:
2121
name: "Lint"
2222
runs-on: ubuntu-latest
23-
timeout-minutes: 5
23+
timeout-minutes: 10
2424

2525
steps:
2626
- uses: actions/checkout@v4

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,6 @@ local.log
4747
/package.json.ember-try
4848
/package-lock.json.ember-try
4949
/yarn.lock.ember-try
50+
51+
# broccoli-debug
52+
/DEBUG/

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

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.0.1",
6+
"version": "4.12.3",
77
"blueprints": [
88
{
99
"name": "app",

config/environment.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ module.exports = function (environment) {
66
let ALGOLIA_API_KEY =
77
process.env.ALGOLIA_API_KEY || 'c35425b69b31be1bb4786f0a72146306';
88

9-
let ENV = {
9+
const ENV = {
1010
modulePrefix: 'ember-api-docs',
1111
environment,
1212
rootURL: '/',
1313
routerRootURL: '/',
14-
locationType: 'auto',
14+
locationType: 'history',
1515
API_HOST: process.env.API_HOST || 'https://api-store.emberjs.com',
1616
EmberENV: {
1717
EXTEND_PROTOTYPES: false,

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const envIsProduction = process.env.EMBER_ENV === 'production';
55
const premberUrls = require('./prember-urls');
66

77
module.exports = function (defaults) {
8-
let app = new EmberApp(defaults, {
8+
const app = new EmberApp(defaults, {
99
prember: {
1010
urls: premberUrls(),
1111
},

0 commit comments

Comments
 (0)