Skip to content

Commit 33ab15c

Browse files
Bump ember-cli from 3.22.0 to 3.24.0 (#530)
* Bump ember-cli from 3.22.0 to 3.24.0 Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 3.22.0 to 3.24.0. - [Release notes](https://github.com/ember-cli/ember-cli/releases) - [Changelog](https://github.com/ember-cli/ember-cli/blob/master/CHANGELOG.md) - [Commits](ember-cli/ember-cli@v3.22.0...v3.24.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Updates for ember-cli@3.24.0 Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: kpfefferle <kevin@pfefferle.me>
1 parent 56ada52 commit 33ab15c

25 files changed

+562
-327
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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,48 @@ module.exports = {
55
ecmaVersion: 2018,
66
sourceType: 'module',
77
ecmaFeatures: {
8-
legacyDecorators: true
9-
}
8+
legacyDecorators: true,
9+
},
1010
},
11-
plugins: [
12-
'ember'
13-
],
11+
plugins: ['ember'],
1412
extends: [
1513
'eslint:recommended',
16-
'plugin:ember/recommended'
14+
'plugin:ember/recommended',
15+
'plugin:prettier/recommended',
1716
],
1817
env: {
19-
browser: true
18+
browser: true,
2019
},
2120
rules: {},
2221
overrides: [
2322
// node files
2423
{
2524
files: [
2625
'.eslintrc.js',
26+
'.prettierrc.js',
2727
'.template-lintrc.js',
2828
'ember-cli-build.js',
2929
'index.js',
3030
'testem.js',
3131
'blueprints/*/index.js',
3232
'config/**/*.js',
33-
'tests/dummy/config/**/*.js'
33+
'tests/dummy/config/**/*.js',
3434
],
3535
excludedFiles: [
3636
'addon/**',
3737
'addon-test-support/**',
3838
'app/**',
39-
'tests/dummy/app/**'
39+
'tests/dummy/app/**',
4040
],
4141
parserOptions: {
42-
sourceType: 'script'
42+
sourceType: 'script',
4343
},
4444
env: {
4545
browser: false,
46-
node: true
46+
node: true,
4747
},
4848
plugins: ['node'],
49-
extends: ['plugin:node/recommended']
50-
}
51-
]
49+
extends: ['plugin:node/recommended'],
50+
},
51+
],
5252
};

.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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/.editorconfig
1212
/.ember-cli
1313
/.env*
14+
/.eslintcache
1415
/.eslintignore
1516
/.eslintrc.js
1617
/.git/

.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 & 0 deletions
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

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

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2019
3+
Copyright (c) 2021
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

blueprints/ember-octicons/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ module.exports = {
33

44
afterInstall() {
55
return this.addPackageToProject('octicons', '^8.0.0');
6-
}
7-
}
6+
},
7+
};

config/deprecation-workflow.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable no-undef */
22
window.deprecationWorkflow = window.deprecationWorkflow || {};
33
window.deprecationWorkflow.config = {
4-
workflow: [
5-
]
4+
workflow: [],
65
};

config/ember-try.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,78 +2,78 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = async function() {
5+
module.exports = async function () {
66
return {
77
useYarn: true,
88
scenarios: [
99
{
1010
name: 'ember-lts-3.16',
1111
npm: {
1212
devDependencies: {
13-
'ember-source': '~3.16.0'
14-
}
15-
}
13+
'ember-source': '~3.16.0',
14+
},
15+
},
1616
},
1717
{
1818
name: 'ember-lts-3.20',
1919
npm: {
2020
devDependencies: {
21-
'ember-source': '~3.20.0'
22-
}
23-
}
21+
'ember-source': '~3.20.0',
22+
},
23+
},
2424
},
2525
{
2626
name: 'ember-release',
2727
npm: {
2828
devDependencies: {
29-
'ember-source': await getChannelURL('release')
30-
}
31-
}
29+
'ember-source': await getChannelURL('release'),
30+
},
31+
},
3232
},
3333
{
3434
name: 'ember-beta',
3535
npm: {
3636
devDependencies: {
37-
'ember-source': await getChannelURL('beta')
38-
}
39-
}
37+
'ember-source': await getChannelURL('beta'),
38+
},
39+
},
4040
},
4141
{
4242
name: 'ember-canary',
4343
npm: {
4444
devDependencies: {
45-
'ember-source': await getChannelURL('canary')
46-
}
47-
}
45+
'ember-source': await getChannelURL('canary'),
46+
},
47+
},
4848
},
4949
{
5050
name: 'ember-default-with-jquery',
5151
env: {
5252
EMBER_OPTIONAL_FEATURES: JSON.stringify({
53-
'jquery-integration': true
54-
})
53+
'jquery-integration': true,
54+
}),
5555
},
5656
npm: {
5757
devDependencies: {
58-
'@ember/jquery': '^0.5.1'
59-
}
60-
}
58+
'@ember/jquery': '^0.5.1',
59+
},
60+
},
6161
},
6262
{
6363
name: 'ember-classic',
6464
env: {
6565
EMBER_OPTIONAL_FEATURES: JSON.stringify({
6666
'application-template-wrapper': true,
6767
'default-async-observers': false,
68-
'template-only-glimmer-components': false
69-
})
68+
'template-only-glimmer-components': false,
69+
}),
7070
},
7171
npm: {
7272
ember: {
73-
edition: 'classic'
74-
}
75-
}
76-
}
77-
]
73+
edition: 'classic',
74+
},
75+
},
76+
},
77+
],
7878
};
7979
};

config/environment.js

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

3-
module.exports = function(/* environment, appConfig */) {
4-
return { };
3+
module.exports = function (/* environment, appConfig */) {
4+
return {};
55
};

ember-cli-build.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22

33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

5-
module.exports = function(defaults) {
5+
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
// Add options here
88
octicons: {
9-
icons: ['mark-github']
9+
icons: ['mark-github'],
1010
},
1111
svgJar: {
12-
sourceDirs: [
13-
'node_modules/octicons/build/svg'
14-
]
15-
}
12+
sourceDirs: ['node_modules/octicons/build/svg'],
13+
},
1614
});
1715

1816
/*

index.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ module.exports = {
1818
// Import SVG icons
1919
if (this.octiconsConfig.icons !== null) {
2020
let destDir = this.octiconsConfig.destDir || 'images/svg/octicons';
21-
this.octiconsConfig.icons.forEach(icon => {
21+
this.octiconsConfig.icons.forEach((icon) => {
2222
let iconPath = `node_modules/octicons/build/svg/${icon}.svg`;
2323
if (fs.existsSync(iconPath)) {
24-
app.import(`node_modules/octicons/build/svg/${icon}.svg`, { destDir });
24+
app.import(`node_modules/octicons/build/svg/${icon}.svg`, {
25+
destDir,
26+
});
2527
} else {
2628
this.writeWarning(`Unknown icon: '${icon}' will not be imported`);
2729
}
@@ -43,23 +45,26 @@ module.exports = {
4345
return 'octicons.css';
4446
}
4547
return relativePath;
46-
}
48+
},
4749
});
4850
},
4951

5052
buildConfig() {
5153
let config = (this.app && this.app.options) || {};
5254
let octiconsConfig = config['octicons'] || {
5355
destDir: null,
54-
icons: []
56+
icons: [],
5557
};
5658

57-
if(octiconsConfig.icons !== null && octiconsConfig.icons.length === 0) {
58-
this.writeWarning('No octicons were specified in ember-cli-build; defaulting to all icons');
59+
if (octiconsConfig.icons !== null && octiconsConfig.icons.length === 0) {
60+
this.writeWarning(
61+
'No octicons were specified in ember-cli-build; defaulting to all icons'
62+
);
5963

60-
glob.sync('node_modules/octicons/build/svg/*.svg')
61-
.map(i => i.split('/').pop())
62-
.map(i => i.replace(/\.svg$/i, ''))
64+
glob
65+
.sync('node_modules/octicons/build/svg/*.svg')
66+
.map((i) => i.split('/').pop())
67+
.map((i) => i.replace(/\.svg$/i, ''))
6368
.reduce((a, v) => {
6469
a.icons.push(v);
6570
return a;
@@ -71,5 +76,5 @@ module.exports = {
7176

7277
writeWarning(message) {
7378
this.ui.writeWarnLine(`[ember-octicons] ${message}`);
74-
}
79+
},
7580
};

0 commit comments

Comments
 (0)