Skip to content

Commit eadb25e

Browse files
Ember 3.26
1 parent be7bfc2 commit eadb25e

33 files changed

+1383
-1006
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.eslintcache
1617

1718
# ember-try
1819
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ 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
20+
browser: true,
2221
},
2322
rules: {},
2423
overrides: [
@@ -33,23 +32,27 @@ module.exports = {
3332
'testem.js',
3433
'blueprints/*/index.js',
3534
'config/**/*.js',
36-
'tests/dummy/config/**/*.js'
35+
'lib/**/*.js',
36+
'tests/dummy/config/**/*.js',
3737
],
3838
excludedFiles: [
3939
'addon/**',
4040
'addon-test-support/**',
4141
'app/**',
42-
'tests/dummy/app/**'
42+
'tests/dummy/app/**',
4343
],
4444
parserOptions: {
45-
sourceType: 'script'
45+
sourceType: 'script',
4646
},
4747
env: {
4848
browser: false,
49-
node: true
49+
node: true,
5050
},
5151
plugins: ['node'],
52-
extends: ['plugin:node/recommended']
53-
}
54-
]
52+
extends: ['plugin:node/recommended'],
53+
rules: {
54+
'node/no-unpublished-require': 'off',
55+
},
56+
},
57+
],
5558
};

.gitignore

Lines changed: 1 addition & 0 deletions
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

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig

.prettierignore

Lines changed: 21 additions & 0 deletions
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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
module.exports = {
44
singleQuote: true,
5-
trailingComma: 'none',
65
overrides: [
76
{
87
files: '**/*.hbs',
98
options: {
109
parser: 'glimmer',
11-
singleQuote: false
12-
}
13-
}
14-
]
15-
};
10+
singleQuote: false,
11+
},
12+
},
13+
],
14+
};

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane'
4+
extends: 'octane',
55
};

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
- env: EMBER_TRY_SCENARIO=ember-canary
5454
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5555
- env: EMBER_TRY_SCENARIO=ember-classic
56+
- env: EMBER_TRY_SCENARIO=embroider-safe
57+
- env: EMBER_TRY_SCENARIO=embroider-optimized
5658

5759
before_install:
5860
- curl -o- -L https://yarnpkg.com/install.sh | bash

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `yarn lint:hbs`
12-
* `yarn lint:js`
13-
* `yarn lint:js --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

blueprints/ember-cli-capacitor/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
async afterInstall() {
1111
await this.addPackagesToProject([
1212
{ name: '@capacitor/core' },
13-
{ name: '@capacitor/cli' }
13+
{ name: '@capacitor/cli' },
1414
]);
1515

1616
await this._addPlatforms();
@@ -26,30 +26,30 @@ module.exports = {
2626
{
2727
checked: true,
2828
name: 'iOS',
29-
value: 'ios'
29+
value: 'ios',
3030
},
3131
{
3232
checked: true,
3333
name: 'Android',
34-
value: 'android'
34+
value: 'android',
3535
},
3636
{
3737
checked: true,
3838
name: 'Electron',
39-
value: 'electron'
40-
}
39+
value: 'electron',
40+
},
4141
];
4242

4343
// Ask which platforms to support
4444
const selected = await this.ui.prompt({
4545
type: 'checkbox',
4646
name: 'platforms',
4747
message: 'Which platforms would you like to support?',
48-
choices
48+
choices,
4949
});
5050

5151
selected.platforms.forEach((platform) => {
5252
execSync(`npx cap add ${platform}`);
5353
});
54-
}
54+
},
5555
};

0 commit comments

Comments
 (0)