Merge pull request #23 from mydea/dependabot/npm_and_yarn/ember-cli-4…

….1.0 chore(deps-dev): bump ember-cli from 3.28.4 to 4.1.0
mydea · Jan 4, 2022 · 9eca425 · 9eca425
2 parents 5960f72 + ea3f063
commit 9eca425
Show file tree

Hide file tree

Showing 9 changed files with 848 additions and 65 deletions.
diff --git a/packages/ember-build-prerender/.npmignore b/packages/ember-build-prerender/.npmignore
@@ -17,6 +17,7 @@ jsconfig.json
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
@@ -35,4 +36,7 @@ jsconfig.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
diff --git a/packages/ember-build-prerender/README.md b/packages/ember-build-prerender/README.md
@@ -4,8 +4,8 @@ An addon to prerender your Ember app with [Puppeteer](https://pptr.dev/) into st
 
 ## Compatibility
 
-- Ember.js v3.20 or above
-- Ember CLI v3.20 or above
+- Ember.js v3.24 or above
+- Ember CLI v3.24 or above
 - Node.js v12 or above
 
 ## Installation

diff --git a/packages/ember-build-prerender/package.json b/packages/ember-build-prerender/package.json
@@ -15,7 +15,7 @@
   "scripts": {},
   "dependencies": {
     "chalk": "^4.1.2",
-    "ember-cli-babel": "^7.26.6",
+    "ember-cli-babel": "^7.26.11",
     "fs-extra": "^10.0.0",
     "http-server": "^14.0.0",
     "puppeteer": "^13.0.1"
@@ -28,7 +28,7 @@
     "@embroider/core": "~0.49.0",
     "@embroider/webpack": "~0.48.1",
     "ember-auto-import": "~2.2.4",
-    "ember-cli": "~3.28.4",
+    "ember-cli": "~4.1.0",
     "ember-cli-dependency-checker": "~3.2.0",
     "ember-cli-htmlbars": "~6.0.1",
     "ember-cli-terser": "~4.0.2",

diff --git a/packages/ember-build-prerender/tests/dummy/config/ember-cli-update.json b/packages/ember-build-prerender/tests/dummy/config/ember-cli-update.json
@@ -0,0 +1,20 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "4.1.0",
+      "blueprints": [
+        {
+          "name": "addon",
+          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/packages/ember-cli-deploy-prerender/package.json b/packages/ember-cli-deploy-prerender/package.json
@@ -24,7 +24,7 @@
     "glob": "^7.2.0"
   },
   "devDependencies": {
-    "ember-cli": "~3.28.4"
+    "ember-cli": "~4.1.0"
   },
   "engines": {
     "node": "14.* || >= 16"

diff --git a/packages/test-app/config/ember-cli-update.json b/packages/test-app/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.28.4",
+      "version": "4.1.0",
       "blueprints": [
         {
           "name": "app",

diff --git a/packages/test-app/config/targets.js b/packages/test-app/config/targets.js
@@ -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,
 };
diff --git a/packages/test-app/package.json b/packages/test-app/package.json
@@ -29,8 +29,8 @@
     "chai": "~4.3.4",
     "ember-auto-import": "~2.2.4",
     "ember-build-prerender": "0.2.4",
-    "ember-cli": "~3.28.4",
-    "ember-cli-babel": "~7.26.6",
+    "ember-cli": "~4.1.0",
+    "ember-cli-babel": "~7.26.11",
     "ember-cli-dependency-checker": "~3.2.0",
     "ember-cli-htmlbars": "~6.0.1",
     "ember-cli-inject-live-reload": "~2.1.0",