Skip to content

Commit

Permalink
Update dependency ember-cli to v3.24.0
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate-bot authored and kellyselden committed Apr 10, 2021
1 parent e19d80a commit fc5a59d
Show file tree
Hide file tree
Showing 25 changed files with 7,903 additions and 3,535 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
Expand Down
61 changes: 32 additions & 29 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ module.exports = {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
legacyDecorators: true,
},
},
plugins: [
'ember'
],
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true
browser: true,
},
rules: {},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
Expand All @@ -36,57 +36,60 @@ module.exports = {
'config/**/*.js',
'faltest/**/*.js',
'node-tests/**/*.js',
'tests/dummy/config/**/*.js'
'tests/dummy/config/**/*.js',
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
'tests/dummy/app/**',
],
parserOptions: {
sourceType: 'script'
sourceType: 'script',
},
env: {
browser: false,
node: true
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended']
extends: ['plugin:node/recommended'],
},

// mocha files
{
files: [
'faltest/**/*-test.js',
'node-tests/**/*-test.js'
],
files: ['faltest/**/*-test.js', 'node-tests/**/*-test.js'],
env: {
mocha: true
}
mocha: true,
},
},

// vendor files
{
files: ['vendor/**/*.js'],
parserOptions: {
ecmaVersion: 5,
sourceType: 'script'
sourceType: 'script',
},
env: {
amd: true
amd: true,
},
globals: {
Ember: 'readonly'
Ember: 'readonly',
},
rules: Object.keys(Object.assign({},
// eslint-disable-next-line node/no-extraneous-require
require(path.resolve(path.dirname(require.resolve('eslint')), '../conf/eslint-recommended')).rules,
require('eslint-plugin-ember').configs.recommended.rules
)).reduce((rules, rule) => {
rules: Object.keys(
Object.assign(
{},
// eslint-disable-next-line node/no-extraneous-require
require(path.resolve(
path.dirname(require.resolve('eslint')),
'../conf/eslint-recommended'
)).rules,
require('eslint-plugin-ember').configs.recommended.rules
)
).reduce((rules, rule) => {
rules[rule] = 'off';
return rules;
}, {})
}
]
}, {}),
},
],
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/.editorconfig
/.ember-cli
/.env*
/.eslintcache
/.eslintignore
/.eslintrc.js
/.git/
Expand Down
21 changes: 21 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
5 changes: 5 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
singleQuote: true,
};
4 changes: 2 additions & 2 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
module.exports = {
extends: 'octane',
rules: {
'require-valid-alt-text': false
}
'require-valid-alt-text': false,
},
};
4 changes: 2 additions & 2 deletions blueprints/ember-aframe-shim/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ module.exports = {
async afterInstall() {
let devDependencies = await require('pkg-conf')('devDependencies', {
// Why isn't this the default?
cwd: __dirname
cwd: __dirname,
});

return await this.addPackageToProject('aframe', devDependencies['aframe']);
}
},
};
86 changes: 43 additions & 43 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,117 +2,117 @@

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

module.exports = async function() {
module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
}
}
'ember-source': '~3.16.0',
},
},
},
{
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.20.5'
}
}
'ember-source': '~3.20.5',
},
},
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release')
}
}
'ember-source': await getChannelURL('release'),
},
},
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta')
}
}
'ember-source': await getChannelURL('beta'),
},
},
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary')
}
}
'ember-source': await getChannelURL('canary'),
},
},
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
'jquery-integration': true,
}),
},
npm: {
devDependencies: {
'@ember/jquery': '^1.1.0'
}
}
'@ember/jquery': '^1.1.0',
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false
})
'template-only-glimmer-components': false,
}),
},
npm: {
ember: {
edition: 'classic'
}
}
edition: 'classic',
},
},
},
{
name: 'aframe-0.5',
npm: {
devDependencies: {
'aframe': '0.5'
}
}
aframe: '0.5',
},
},
},
{
name: 'aframe-0.6',
npm: {
devDependencies: {
'aframe': '0.6'
}
}
aframe: '0.6',
},
},
},
{
name: 'aframe-0.7',
npm: {
devDependencies: {
'aframe': '0.7'
}
}
aframe: '0.7',
},
},
},
{
name: 'aframe-0.8',
npm: {
devDependencies: {
'aframe': '0.8'
}
}
aframe: '0.8',
},
},
},
{
name: 'aframe-0.9',
npm: {
devDependencies: {
'aframe': '0.9'
}
}
}
]
aframe: '0.9',
},
},
},
],
};
};
4 changes: 2 additions & 2 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = function(/* environment, appConfig */) {
return { };
module.exports = function (/* environment, appConfig */) {
return {};
};
14 changes: 10 additions & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

module.exports = function(defaults) {
module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
// Add options here
});
Expand All @@ -14,9 +14,15 @@ module.exports = function(defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/

app.import('node_modules/aframe-event-set-component/dist/aframe-event-set-component.js');
app.import('node_modules/aframe-layout-component/dist/aframe-layout-component.js');
app.import('node_modules/aframe-proxy-event-component/dist/aframe-proxy-event-component.js');
app.import(
'node_modules/aframe-event-set-component/dist/aframe-event-set-component.js'
);
app.import(
'node_modules/aframe-layout-component/dist/aframe-layout-component.js'
);
app.import(
'node_modules/aframe-proxy-event-component/dist/aframe-proxy-event-component.js'
);

return app.toTree();
};
Loading

0 comments on commit fc5a59d

Please sign in to comment.