Skip to content

Commit 5aa0aee

Browse files
nadnoslennadnoslen
committed
⬆️ v3.4.4...v3.5.1
1 parent 9c4b49f commit 5aa0aee

7 files changed

Lines changed: 423 additions & 529 deletions

File tree

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/
15+
!.*
1416

1517
# ember-try
1618
/.node_modules.ember-try/

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module.exports = {
1414
// node files
1515
{
1616
files: [
17+
'.eslintrc.js',
1718
'.template-lintrc.js',
1819
'ember-cli-build.js',
1920
'index.js',
@@ -23,7 +24,6 @@ module.exports = {
2324
'tests/dummy/config/**/*.js',
2425
],
2526
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
26-
excludedFiles: ['app/**', 'addon/**', 'tests/dummy/app/**'],
2727
parserOptions: {
2828
sourceType: 'script',
2929
ecmaVersion: 2015,

‎.npmignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
/.eslintignore
1313
/.eslintrc.js
1414
/.gitignore
15-
/.watchmanconfig
15+
/.template-lintrc.js
1616
/.travis.yml
17+
/.watchmanconfig
1718
/bower.json
1819
/config/ember-try.js
1920
/ember-cli-build.js

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"bootswatch": "^3.3.7",
5252
"broccoli-asset-rev": "^2.7.0",
5353
"ember-ajax": "^5.1.1",
54-
"ember-cli": "~3.4.4",
54+
"ember-cli": "~3.5.1",
5555
"ember-cli-dependency-checker": "^3.0.0",
5656
"ember-cli-deploy": "^1.0.1",
5757
"ember-cli-deploy-build": "^1.1.0",
@@ -60,20 +60,20 @@
6060
"ember-cli-eslint": "^4.2.3",
6161
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
6262
"ember-cli-inject-live-reload": "^2.1.0",
63-
"ember-cli-qunit": "^4.3.2",
6463
"ember-cli-sass": "^8.0.1",
6564
"ember-cli-sri": "^2.1.1",
6665
"ember-cli-template-lint": "^1.0.0-beta.1",
6766
"ember-cli-uglify": "^3.0.0",
6867
"ember-cli-update": "^0.56",
69-
"ember-data": "2.14",
68+
"ember-data": "~3.5",
7069
"ember-disable-prototype-extensions": "^1.1.3",
7170
"ember-export-application-global": "^2.0.0",
7271
"ember-load-initializers": "^1.1.0",
7372
"ember-maybe-import-regenerator": "^0.1.6",
73+
"ember-qunit": "^3.4.1",
7474
"ember-resolver": "^5.0.1",
7575
"ember-route-action-helper": "^2.0.6",
76-
"ember-source": "~3.4.0",
76+
"ember-source": "~3.5.1",
7777
"ember-source-channel-url": "^3.0.0",
7878
"ember-try": "^1.0.0",
7979
"eslint-plugin-ember": "^5.2.0",

‎tests/dummy/config/ember-cli-update.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.4.4",
6+
"version": "3.5.1",
77
"blueprints": [
88
{
99
"name": "addon",
1010
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
1111
"codemodsSource": "ember-addon-codemods-manifest@1",
1212
"isBaseBlueprint": true,
13-
"options": [
14-
"--yarn",
15-
"--no-welcome"
16-
]
13+
"options": ["--yarn", "--no-welcome"]
1714
}
1815
]
1916
}

‎tests/index.html‎

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,45 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>Dummy Tests</title>
7-
<meta name="description" content="">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
10-
{{content-for "head"}}
11-
{{content-for "test-head"}}
12-
13-
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
14-
<link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
15-
<link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
16-
17-
{{content-for "head-footer"}}
18-
{{content-for "test-head-footer"}}
19-
</head>
20-
<body>
21-
{{content-for "body"}}
22-
{{content-for "test-body"}}
23-
24-
<script src="/testem.js" integrity=""></script>
25-
<script src="{{rootURL}}assets/vendor.js"></script>
26-
<script src="{{rootURL}}assets/test-support.js"></script>
27-
<script src="{{rootURL}}assets/dummy.js"></script>
28-
<script src="{{rootURL}}assets/tests.js"></script>
29-
30-
{{content-for "body-footer"}}
31-
{{content-for "test-body-footer"}}
32-
</body>
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<title>Dummy Tests</title>
7+
<meta name="description" content="" />
8+
<meta name="viewport" content="width=device-width, initial-scale=1" />
9+
10+
{{content-for "head"}}
11+
12+
<!-- prettier space between -->
13+
14+
{{content-for "test-head"}}
15+
16+
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css" />
17+
<link rel="stylesheet" href="{{rootURL}}assets/dummy.css" />
18+
<link rel="stylesheet" href="{{rootURL}}assets/test-support.css" />
19+
20+
{{content-for "head-footer"}}
21+
22+
<!-- prettier space between -->
23+
24+
{{content-for "test-head-footer"}}
25+
</head>
26+
<body>
27+
{{content-for "body"}}
28+
29+
<!-- prettier space between -->
30+
31+
{{content-for "test-body"}}
32+
33+
<script src="/testem.js" integrity=""></script>
34+
<script src="{{rootURL}}assets/vendor.js"></script>
35+
<script src="{{rootURL}}assets/test-support.js"></script>
36+
<script src="{{rootURL}}assets/dummy.js"></script>
37+
<script src="{{rootURL}}assets/tests.js"></script>
38+
39+
{{content-for "body-footer"}}
40+
41+
<!-- prettier space between -->
42+
43+
{{content-for "test-body-footer"}}
44+
</body>
3345
</html>

0 commit comments

Comments
 (0)