Skip to content

Commit 175fdd0

Browse files
authored
Merge pull request ember-learn#265 from MehulKChaudhari/mehulkc/update-to-v4
Update to v4
2 parents 4543f6f + 8c2a1eb commit 175fdd0

File tree

8 files changed

+135
-153
lines changed

8 files changed

+135
-153
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
2324

2425
# ember-cli-mirage

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ module.exports = {
5353
},
5454
},
5555
{
56-
// Test files:
56+
// test files
5757
files: ['tests/**/*-test.{js,ts}'],
5858
extends: ['plugin:qunit/recommended'],
5959
rules: {

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@
2626
# ember-try
2727
/.node_modules.ember-try/
2828
/bower.json.ember-try
29+
/npm-shrinkwrap.json.ember-try
2930
/package.json.ember-try
31+
/package-lock.json.ember-try
32+
/yarn.lock.ember-try

.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

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.28.5",
6+
"version": "4.0.1",
77
"blueprints": [
88
{
99
"name": "app",

config/targets.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,6 @@ const browsers = [
66
'last 1 Safari versions',
77
];
88

9-
// Ember's browser support policy is changing, and IE11 support will end in
10-
// v4.0 onwards.
11-
//
12-
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
13-
//
14-
// If you need IE11 support on a version of Ember that still offers support
15-
// for it, uncomment the code block below.
16-
//
17-
// const isCI = Boolean(process.env.CI);
18-
// const isProduction = process.env.EMBER_ENV === 'production';
19-
//
20-
// if (isCI || isProduction) {
21-
// browsers.push('ie 11');
22-
// }
23-
249
module.exports = {
2510
browsers,
2611
};

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"cross-env": "^7.0.3",
3737
"dayjs": "^1.10.6",
3838
"ember-auto-import": "^2.1.0",
39-
"ember-cli": "~3.28.0",
39+
"ember-cli": "~4.0.1",
4040
"ember-cli-app-version": "^6.0.0",
4141
"ember-cli-babel": "^7.26.11",
4242
"ember-cli-dependency-checker": "^3.3.1",
@@ -50,17 +50,16 @@
5050
"ember-cli-sri": "^2.1.1",
5151
"ember-cli-terser": "^4.0.2",
5252
"ember-css-modules": "^1.5.0",
53-
"ember-data": "~3.28.6",
53+
"ember-data": "~4.0.2",
5454
"ember-export-application-global": "^2.0.1",
5555
"ember-fetch": "^8.1.2",
5656
"ember-functions-as-helper-polyfill": "^2.1.1",
5757
"ember-load-initializers": "^2.1.2",
5858
"ember-math-helpers": "^3.0.0",
59-
"ember-maybe-import-regenerator": "^1.0.0",
6059
"ember-page-title": "^7.0.0",
6160
"ember-qunit": "^6.1.1",
6261
"ember-resolver": "^8.0.0",
63-
"ember-source": "~3.28.11",
62+
"ember-source": "~4.0.1",
6463
"ember-styleguide": "^7.1.0",
6564
"ember-template-lint": "^5.5.1",
6665
"ember-test-selectors": "^6.0.0",

0 commit comments

Comments
 (0)