Skip to content

Commit f390284

Browse files
authored
⬆️ Upgrade To Ember-Cli 3.4 (#79)
* ⬆️ Manually Upgrading Dependencies * ⬆️ v3.1.4...v3.4.4 * 👷 Update Dependabot
1 parent 850f7c2 commit f390284

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2493
-1528
lines changed

.codeclimate.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ engines:
44
enabled: true
55
config:
66
languages:
7-
- ruby
8-
- javascript
9-
- python
10-
- php
7+
- ruby
8+
- javascript
9+
- python
10+
- php
1111
eslint:
1212
enabled: true
1313
fixme:
1414
enabled: true
1515
ratings:
1616
paths:
17-
- "**.inc"
18-
- "**.js"
19-
- "**.jsx"
20-
- "**.module"
21-
- "**.php"
22-
- "**.py"
23-
- "**.rb"
17+
- '**.inc'
18+
- '**.js'
19+
- '**.jsx'
20+
- '**.module'
21+
- '**.php'
22+
- '**.py'
23+
- '**.rb'
2424
exclude_paths:
25-
- config/
26-
- tests/
27-
- vendor/
25+
- config/
26+
- tests/
27+
- vendor/

.eslintignore

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,18 @@
1-
/blueprints/*/files/**/*.js
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
12+
# misc
13+
/coverage/
14+
15+
# ember-try
16+
/.node_modules.ember-try/
17+
/bower.json.ember-try
18+
/package.json.ember-try

.eslintrc

Lines changed: 0 additions & 213 deletions
This file was deleted.

.eslintrc.js

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ module.exports = {
22
root: true,
33
parserOptions: {
44
ecmaVersion: 2017,
5-
sourceType: "module",
5+
sourceType: 'module',
66
},
7-
plugins: ["ember"],
8-
extends: ["eslint:recommended", "plugin:ember/recommended"],
7+
plugins: ['ember'],
8+
extends: ['eslint:recommended', 'plugin:ember/recommended'],
99
env: {
1010
browser: true,
1111
},
@@ -14,36 +14,28 @@ module.exports = {
1414
// node files
1515
{
1616
files: [
17-
"ember-cli-build.js",
18-
"index.js",
19-
"testem.js",
20-
"blueprints/*/index.js",
21-
"config/**/*.js",
22-
"tests/dummy/config/**/*.js",
17+
'.template-lintrc.js',
18+
'ember-cli-build.js',
19+
'index.js',
20+
'testem.js',
21+
'blueprints/*/index.js',
22+
'config/**/*.js',
23+
'tests/dummy/config/**/*.js',
2324
],
24-
excludedFiles: [
25-
"addon/**",
26-
"addon-test-support/**",
27-
"app/**",
28-
"tests/dummy/app/**",
29-
],
30-
excludedFiles: ["app/**", "addon/**", "tests/dummy/app/**"],
25+
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
26+
excludedFiles: ['app/**', 'addon/**', 'tests/dummy/app/**'],
3127
parserOptions: {
32-
sourceType: "script",
28+
sourceType: 'script',
3329
ecmaVersion: 2015,
3430
},
3531
env: {
3632
browser: false,
3733
node: true,
3834
},
39-
plugins: ["node"],
40-
rules: Object.assign(
41-
{},
42-
require("eslint-plugin-node").configs.recommended.rules,
43-
{
44-
// add your custom rules and overrides for node files here
45-
}
46-
),
35+
plugins: ['node'],
36+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
37+
// add your custom rules and overrides for node files here
38+
}),
4739
},
4840
],
4941
};

.github/dependabot.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
updates:
33
- package-ecosystem: npm
4-
directory: "/"
4+
directory: '/'
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 15
@@ -10,3 +10,10 @@ updates:
1010
- nadnoslen
1111
labels:
1212
- dependencies
13+
ignore:
14+
- dependency-name: ember-cli
15+
update-types: ['version-update:semver-major', 'version-update:semver-minor']
16+
- dependency-name: ember-data
17+
update-types: ['version-update:semver-major', 'version-update:semver-minor']
18+
- dependency-name: ember-source
19+
update-types: ['version-update:semver-major', 'version-update:semver-minor']

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: "Build, Test, Publish Coverage"
1+
name: 'Build, Test, Publish Coverage'
22
on: push
33

44
jobs:
55
test:
66
name: Test
77
runs-on: ubuntu-latest
88
env:
9-
CI: "true"
9+
CI: 'true'
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v1
@@ -40,7 +40,7 @@ jobs:
4040
- name: Run test
4141
run: ./node_modules/.bin/ember t
4242
env:
43-
COVERAGE: "true"
43+
COVERAGE: 'true'
4444
# Ideally, we would split up the test task into separate build and run
4545
# steps to get better CI log output (folding and timing information).
4646
# However, this is not currently possible with ember-cli-code-coverage.

0 commit comments

Comments
 (0)