Skip to content

Commit

Permalink
chore(deps): update dummy app to ember v4
Browse files Browse the repository at this point in the history
  • Loading branch information
anehx committed Feb 22, 2022
1 parent 08adcac commit 4649096
Show file tree
Hide file tree
Showing 10 changed files with 234 additions and 217 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# snippets
/tests/dummy/app/snippets/*.js
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
10 changes: 7 additions & 3 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
Expand All @@ -31,7 +32,10 @@
.gitkeep

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
/config/addon-docs.js
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
16 changes: 3 additions & 13 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,6 @@ module.exports = async function () {
},
},
},
{
name: "ember-default-with-jquery",
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
"jquery-integration": true,
}),
},
npm: {
devDependencies: {
"@ember/jquery": "^1.1.0",
},
},
},
{
name: "ember-classic",
env: {
Expand All @@ -70,6 +57,9 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
ember: {
edition: "classic",
},
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"ember-auto-import": "^2.4.0",
"ember-cli-babel": "^7.26.6",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1",
"ember-truth-helpers": "^3.0.0"
},
Expand All @@ -52,7 +52,7 @@
"broccoli-asset-rev": "3.0.0",
"ember-changeset": "4.0.0-beta.5",
"ember-changeset-validations": "4.0.0-beta.3",
"ember-cli": "3.28.1",
"ember-cli": "4.1.1",
"ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#667701d60650cf7af51611dbff9abf1879776421",
"ember-cli-dependency-checker": "3.2.0",
"ember-cli-deploy": "1.0.2",
Expand All @@ -64,14 +64,13 @@
"ember-cli-terser": "4.0.2",
"ember-cli-test-loader": "3.0.0",
"ember-concurrency": "2.2.1",
"ember-data": "3.28.3",
"ember-data": "4.1.0",
"ember-disable-prototype-extensions": "1.1.3",
"ember-load-initializers": "2.1.2",
"ember-maybe-import-regenerator": "1.0.0",
"ember-power-select": "5.0.4",
"ember-qunit": "5.1.5",
"ember-resolver": "8.0.3",
"ember-source": "3.28.1",
"ember-source": "4.2.0",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "4.1.0",
"ember-template-lint-plugin-prettier": "4.0.0",
Expand Down
7 changes: 2 additions & 5 deletions tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@
"packages": [
{
"name": "ember-cli",
"version": "3.28.1",
"version": "4.1.1",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--yarn",
"--no-welcome"
]
"options": ["--yarn", "--no-welcome"]
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function (environment) {
modulePrefix: "dummy",
environment,
rootURL: "/",
locationType: "auto",
locationType: "history",
historySupportMiddleware: true,
"ember-validated-form": {
theme: "bootstrap",
Expand Down
15 changes: 0 additions & 15 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,6 @@ const browsers = [
"last 1 Safari versions",
];

// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
};
Loading

0 comments on commit 4649096

Please sign in to comment.