Skip to content

Commit

Permalink
⬆️ v3.12.1...v3.13.2
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Apr 15, 2022
1 parent 3e5660e commit 005e23d
Show file tree
Hide file tree
Showing 5 changed files with 345 additions and 221 deletions.
63 changes: 33 additions & 30 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,53 @@
module.exports = {
root: true,
parser: "babel-eslint",
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module'
sourceType: "module",
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
plugins: ["ember"],
extends: ["eslint:recommended", "plugin:ember/recommended"],
env: {
browser: true
browser: true,
},
rules: {
"ember/no-jquery": "error",
"ember/no-new-mixins": "warn",
},
rules: {},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
".eslintrc.js",
".template-lintrc.js",
"ember-cli-build.js",
"index.js",
"testem.js",
"blueprints/*/index.js",
"config/**/*.js",
"tests/dummy/config/**/*.js",
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
"addon/**",
"addon-test-support/**",
"app/**",
"tests/dummy/app/**",
],
parserOptions: {
sourceType: 'script'
sourceType: "script",
},
env: {
browser: false,
node: true
node: true,
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
// add your custom rules and overrides for node files here
})
}
]
plugins: ["node"],
rules: Object.assign(
{},
require("eslint-plugin-node").configs.recommended.rules,
{
// add your custom rules and overrides for node files here
}
),
},
],
};
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/.env*
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.template-lintrc.js
/.travis.yml
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@
"devDependencies": {
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"babel-eslint": "^10.0.3",
"bootstrap": "^3.4.1",
"bootstrap-sass": "^3.4.1",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.12.1",
"ember-cli": "~3.13.2",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -50,14 +51,14 @@
"ember-cli-update": "1.0.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-load-initializers": "^2.1.0",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^4.4.1",
"ember-qunit": "^4.5.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.12.0",
"ember-source": "~3.13.0",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^2.0.0",
"eslint-plugin-ember": "^6.2.0",
"eslint-plugin-ember": "^7.1.0",
"eslint-plugin-node": "^11.1.0",
"loader.js": "^4.7.0",
"qunit-dom": "^2.0.0",
Expand All @@ -78,7 +79,7 @@
"url": "https://github.com/cybertoothca/ember-cli-bootstrap3-grid.git"
},
"dependencies": {
"ember-cli-babel": "^7.7.3",
"ember-cli-babel": "^7.11.1",
"ember-cli-htmlbars": "^6.0.1"
},
"ember-addon": {
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.12.1",
"version": "3.13.2",
"blueprints": [
{
"name": "addon",
Expand Down
Loading

0 comments on commit 005e23d

Please sign in to comment.