Skip to content

Commit

Permalink
Merge pull request #939 from ember-cli/kg-update
Browse files Browse the repository at this point in the history
  • Loading branch information
kategengler authored Jul 25, 2023
2 parents fe81c36 + a3d7acb commit 117aaae
Show file tree
Hide file tree
Showing 26 changed files with 2,022 additions and 1,691 deletions.
68 changes: 37 additions & 31 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,52 +1,58 @@
'use strict';

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true
}
requireConfigFile: false,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
},
plugins: [
'ember'
],
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true
},
rules: {
'ember/no-jquery': 'error'
browser: true,
},
rules: {},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'addon/index.js',
'addon/blueprints/*/index.js',
'addon/config/**/*.js',
'test-app/config/**/*.js',
'test-app/server/**/*.js',
'test-app/testem.js',
],
excludedFiles: [
'addon/addon/**',
'addon/addon-test-support/**',
'addon/app/**',
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./addon/index.js',
'./addon/config/**/*.js',
'./test-app/testem.js',
'./test-app/tests/dummy/config/**/*.js',
'./test-app/server/**/*.js',
'./test-app/testem.js',
'./test-app/config/**/*.js',
'./test-app/ember-cli-build.js',
],
parserOptions: {
sourceType: 'script'
sourceType: 'script',
},
env: {
browser: false,
node: true
node: true,
},
}
]
extends: ['plugin:n/recommended'],
},
{
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
25 changes: 25 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/

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

module.exports = {
overrides: [
{
files: '*.{js,ts}',
options: {
singleQuote: true,
},
},
],
};
2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
extends: 'recommended',
};
9 changes: 5 additions & 4 deletions addon/addon/container-debug-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ export default ContainerDebugAdapter.extend({
@return {boolean} whether a list is available for this type.
*/
canCatalogEntriesByType(type) {
if (type === 'model') { return true; }
if (type === 'model') {
return true;
}
return this._super(...arguments);
},

Expand All @@ -76,7 +78,7 @@ export default ContainerDebugAdapter.extend({
for (let i = 0, l = moduleNames.length; i < l; i++) {
let key = moduleNames[i];

if(key.indexOf(type) !== -1) {
if (key.indexOf(type) !== -1) {
// Check if it's a pod module
let name = getPod(type, key, this.namespace.podModulePrefix || prefix);
if (!name) {
Expand All @@ -97,6 +99,5 @@ export default ContainerDebugAdapter.extend({
}
}
return types;
}
},
});

Loading

0 comments on commit 117aaae

Please sign in to comment.