Skip to content

Commit 0fc6c3a

Browse files
committed
update to v3.28.6 with ember-cli-update
1 parent 0d4f1a2 commit 0fc6c3a

16 files changed

+4910
-4891
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
# misc
1515
/coverage/
1616
!.*
17+
.*/
18+
.eslintcache
1719

1820
# ember-try
1921
/.node_modules.ember-try/

.eslintrc.js

+33-23
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,55 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error'
20+
browser: true,
2521
},
22+
rules: {},
2623
overrides: [
2724
// node files
2825
{
2926
files: [
30-
'.eslintrc.js',
31-
'.template-lintrc.js',
32-
'ember-cli-build.js',
33-
'testem.js',
34-
'blueprints/*/index.js',
35-
'config/**/*.js',
36-
'lib/*/index.js',
37-
'server/**/*.js'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./testem.js',
32+
'./blueprints/*/index.js',
33+
'./config/**/*.js',
34+
'./lib/*/index.js',
35+
'./server/**/*.js',
3836
],
3937
parserOptions: {
40-
sourceType: 'script'
38+
sourceType: 'script',
4139
},
4240
env: {
4341
browser: false,
44-
node: true
45-
}
42+
node: true,
43+
},
44+
plugins: ['node'],
45+
extends: ['plugin:node/recommended'],
46+
rules: {
47+
// this can be removed once the following is fixed
48+
// https://github.com/mysticatea/eslint-plugin-node/issues/77
49+
'node/no-unpublished-require': 'off',
50+
},
4651
},
47-
// node tests
4852
{
53+
// Test files:
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
57+
{
58+
// Node tests
4959
files: [
5060
'node-tests/**/*.js'
5161
],
@@ -62,5 +72,5 @@ module.exports = {
6272
"no-unused-expressions": 0
6373
},
6474
}
65-
]
75+
],
6676
};

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

.prettierignore

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

.template-lintrc.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
5-
rules: {
6-
'no-implicit-this': false,
7-
'no-curly-component-invocation': false
8-
}
4+
extends: 'recommended',
95
};

app/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
4-
import config from './config/environment';
4+
import config from 'ember-guides/config/environment';
55

66
export default class App extends Application {
77
modulePrefix = config.modulePrefix;

config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.16.1",
6+
"version": "3.28.6",
77
"blueprints": [
88
{
99
"name": "app",

config/environment.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
module.exports = function(environment) {
3+
module.exports = function (environment) {
44
let ENV = {
55
modulePrefix: 'ember-guides',
66
environment,
@@ -15,8 +15,8 @@ module.exports = function(environment) {
1515
},
1616
EXTEND_PROTOTYPES: {
1717
// Prevent Ember Data from overriding Date.parse.
18-
Date: false
19-
}
18+
Date: false,
19+
},
2020
},
2121

2222
APP: {

config/targets.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@
33
const browsers = [
44
'last 1 Chrome versions',
55
'last 1 Firefox versions',
6-
'last 1 Safari versions'
6+
'last 1 Safari versions',
77
];
88

9-
const isCI = !!process.env.CI;
9+
// Ember's browser support policy is changing, and IE11 support will end in
10+
// v4.0 onwards.
11+
//
12+
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
13+
//
14+
// If you need IE11 support on a version of Ember that still offers support
15+
// for it, uncomment the code block below.
16+
const isCI = Boolean(process.env.CI);
1017
const isProduction = process.env.EMBER_ENV === 'production';
1118

1219
if (isCI || isProduction) {

ember-cli-build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
44

5-
module.exports = function(defaults) {
5+
module.exports = function (defaults) {
66
let app = new EmberApp(defaults, {
77
fingerprint: {
88
extensions: ['js', 'css', 'map'],

0 commit comments

Comments
 (0)