Skip to content

Commit f94bd3e

Browse files
committed
Apply automated update via ember-cli-update
1 parent f1ea4bb commit f94bd3e

File tree

10 files changed

+47
-70
lines changed

10 files changed

+47
-70
lines changed

frameworks/keyed/ember/.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

frameworks/keyed/ember/.eslintrc.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ module.exports = {
2424
// node files
2525
{
2626
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'testem.js',
32-
'blueprints/*/index.js',
33-
'config/**/*.js',
34-
'lib/*/index.js',
35-
'server/**/*.js',
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./testem.js',
32+
'./blueprints/*/index.js',
33+
'./config/**/*.js',
34+
'./lib/*/index.js',
35+
'./server/**/*.js',
3636
],
3737
parserOptions: {
3838
sourceType: 'script',
@@ -49,5 +49,10 @@ module.exports = {
4949
'node/no-unpublished-require': 'off',
5050
},
5151
},
52+
{
53+
// test files
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
5257
],
5358
};

frameworks/keyed/ember/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@
2323
# ember-try
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2627
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try

frameworks/keyed/ember/.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

frameworks/keyed/ember/.travis.yml

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

frameworks/keyed/ember/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.26.1",
6+
"version": "4.1.1",
77
"blueprints": [
88
{
99
"name": "app",

frameworks/keyed/ember/config/environment.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22

33
module.exports = function (environment) {
44
let ENV = {
5-
6-
'ember-resolver': {
7-
features: {
8-
// EMBER_RESOLVER_MODULE_UNIFICATION: true,
9-
// EMBER_GLIMMER_ANGLE_BRACKET_INVOCATION: true,
10-
},
11-
},
125
modulePrefix: 'ember-temp',
136
environment,
147
rootURL: '/frameworks/keyed/ember/dist/',
15-
locationType: 'auto',
8+
locationType: 'history',
169
EmberENV: {
1710
FEATURES: {
1811
// Here you can enable experimental features on an ember canary build

frameworks/keyed/ember/package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,39 +32,40 @@
3232
"devDependencies": {
3333
"@ember/optional-features": "^1.1.0",
3434
"@ember/render-modifiers": "^1.0.2",
35-
"@ember/test-helpers": "^2.2.5",
35+
"@ember/test-helpers": "^2.6.0",
3636
"@embroider/compat": "^0.41.0",
3737
"@embroider/core": "^0.41.0",
3838
"@embroider/webpack": "^0.41.0",
3939
"@glimmer/component": "^1.0.4",
4040
"babel-eslint": "^10.1.0",
41-
"webpack": "^5.0.0",
42-
"eslint": "^7.0.0",
4341
"broccoli-asset-rev": "3.0.0",
44-
"ember-cli": "~3.26.1",
45-
"ember-cli-babel": "^7.26.3",
42+
"ember-cli": "~4.1.1",
43+
"ember-cli-babel": "^7.26.11",
4644
"ember-cli-dependency-checker": "3.2.0",
47-
"ember-cli-htmlbars": "^5.7.1",
48-
"ember-cli-inject-live-reload": "2.0.2",
45+
"ember-cli-htmlbars": "^6.0.1",
46+
"ember-cli-inject-live-reload": "2.1.0",
4947
"ember-cli-sri": "2.1.1",
5048
"ember-cli-template-trimmer": "0.0.6",
5149
"ember-cli-uglify": "3.0.0",
5250
"ember-cli-update": "^1.0.0",
5351
"ember-hbs-minifier": "0.5.0",
5452
"ember-load-initializers": "^2.1.2",
55-
"ember-qunit": "^5.1.4",
56-
"ember-resolver": "^7.0.0",
57-
"ember-source": "3.27.3",
58-
"eslint-config-prettier": "^8.1.0",
59-
"eslint-plugin-ember": "^10.3.0",
60-
"eslint-plugin-prettier": "^3.3.1",
53+
"ember-qunit": "^5.1.5",
54+
"ember-resolver": "^8.0.3",
55+
"ember-source": "4.1.0",
56+
"eslint": "^7.32.0",
57+
"eslint-config-prettier": "^8.3.0",
58+
"eslint-plugin-ember": "^10.5.8",
59+
"eslint-plugin-prettier": "^4.0.0",
60+
"eslint-plugin-qunit": "^7.2.0",
6161
"loader.js": "4.7.0",
62-
"prettier": "^2.2.1",
63-
"qunit": "^2.14.1",
64-
"qunit-dom": "^1.6.0"
62+
"prettier": "^2.5.1",
63+
"qunit": "^2.17.2",
64+
"qunit-dom": "^2.0.0",
65+
"webpack": "^5.65.0"
6566
},
6667
"engines": {
67-
"node": "6.* || 8.* || >= 10.*"
68+
"node": "12.* || 14.* || >= 16"
6869
},
6970
"ember": {
7071
"edition": "octane"

frameworks/keyed/ember/tests/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929
</div>
3030

31-
<script src="/testem.js" integrity=""></script>
31+
<script src="/testem.js" integrity="" data-embroider-ignore></script>
3232
<script src="{{rootURL}}assets/vendor.js"></script>
3333
<script src="{{rootURL}}assets/test-support.js"></script>
3434
<script src="{{rootURL}}assets/ember-temp.js"></script>

0 commit comments

Comments
 (0)