⬆️ Upgrading To Ember-Cli 3.12 (#61)

* ♻️ Codemods * ⬆️ v3.10.1...v3.12.1
cybertoothca · Apr 18, 2022 · 726f147 · 726f147
1 parent b7a7ad1
commit 726f147
Show file tree

Hide file tree

Showing 12 changed files with 786 additions and 1,690 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -26,7 +26,6 @@ module.exports = {
       excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
       parserOptions: {
         sourceType: 'script',
-        ecmaVersion: 2015,
       },
       env: {
         browser: false,

diff --git a/.travis.yml b/.travis.yml
@@ -49,8 +49,8 @@ jobs:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
     - stage: 'Additional Tests'
-      env: EMBER_TRY_SCENARIO=ember-lts-2.18
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
+      env: EMBER_TRY_SCENARIO=ember-lts-3.4
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.8
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ A textbox that will guess the date you want and assign it to your model or query
 
 ## Compatibility
 
-- Ember.js v2.18 or above
+- Ember.js v3.4 or above
 - Ember CLI v2.13 or above
 - Node.js v8 or above
 

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -2,80 +2,73 @@
 
 const getChannelURL = require('ember-source-channel-url');
 
-module.exports = function () {
-  return Promise.all([getChannelURL('release'), getChannelURL('beta'), getChannelURL('canary')]).then(urls => {
-    return {
-      scenarios: [
-        {
-          name: 'ember-lts-2.18',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({
-              'jquery-integration': true,
-            }),
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.18.0',
-            },
+module.exports = async function () {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: 'ember-lts-3.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.4.0',
           },
         },
-        {
-          name: 'ember-lts-3.4',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.4.0',
-            },
+      },
+      {
+        name: 'ember-lts-3.8',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.8.0',
           },
         },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0],
-            },
+      },
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release'),
           },
         },
-        {
-          name: 'ember-beta',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[1],
-            },
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta'),
           },
         },
-        {
-          name: 'ember-canary',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[2],
-            },
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary'),
           },
         },
-        // The default `.travis.yml` runs this scenario via `yarn test`,
-        // not via `ember try`. It's still included here so that running
-        // `ember try:each` manually or from a customized CI config will run it
-        // along with all the other scenarios.
-        {
-          name: 'ember-default',
-          npm: {
-            devDependencies: {},
-          },
+      },
+      // The default `.travis.yml` runs this scenario via `yarn test`,
+      // not via `ember try`. It's still included here so that running
+      // `ember try:each` manually or from a customized CI config will run it
+      // along with all the other scenarios.
+      {
+        name: 'ember-default',
+        npm: {
+          devDependencies: {},
         },
-        {
-          name: 'ember-default-with-jquery',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({
-              'jquery-integration': true,
-            }),
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-            },
+      },
+      {
+        name: 'ember-default-with-jquery',
+        env: {
+          EMBER_OPTIONAL_FEATURES: JSON.stringify({
+            'jquery-integration': true,
+          }),
+        },
+        npm: {
+          devDependencies: {
+            '@ember/jquery': '^0.5.1',
           },
         },
-      ],
-    };
-  });
+      },
+    ],
+  };
 };
diff --git a/package.json b/package.json
@@ -52,8 +52,11 @@
     "update-browserslist": "npx browserslist@latest --update-db"
   },
   "dependencies": {
+    "ember-auto-import": "^2.4.1",
     "ember-cli-babel": "^7.7.3",
-    "ember-cli-node-assets": "^0.2.2"
+    "ember-cli-node-assets": "^0.2.2",
+    "ember-moment": "^7.8.0",
+    "sugar-date": "^2.0.4"
   },
   "devDependencies": {
     "@ember/jquery": "^2.0.0",
@@ -62,32 +65,29 @@
     "bootstrap-sass": "~3.4.3",
     "bootswatch": "~3.4.1",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "~1.11",
-    "ember-cli": "~3.10.1",
+    "ember-cli": "~3.12.1",
     "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^2.0.0",
     "ember-cli-deploy-gzip": "^2.0.1",
     "ember-cli-deploy-s3": "^3.1.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-htmlbars": "^6.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^3.0.2",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-moment-shim": "^3.7.1",
     "ember-cli-sass": "^10.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-text-support-mixins": "~3.9.0",
+    "ember-cli-text-support-mixins": "~3.12.0",
     "ember-cli-uglify": "^3.0.0",
     "ember-cli-update": "^1.0.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-moment": "^7.8.0",
     "ember-qunit": "^4.4.1",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~3.10.0",
+    "ember-source": "~3.12.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-try": "^2.0.0",
     "eslint-plugin-ember": "^6.2.0",
@@ -99,7 +99,7 @@
     "prettier": "^2.6.2",
     "qunit-dom": "^2.0.0",
     "sass": "^1.50.0",
-    "sugar-date": "^2.0.4"
+    "webpack": "^5.72.0"
   },
   "engines": {
     "node": "8.* || >= 10.*"

diff --git a/testem.js b/testem.js
@@ -10,7 +10,6 @@ module.exports = {
         // --no-sandbox is needed when running Chrome inside a container
         process.env.CI ? '--no-sandbox' : null,
         '--headless',
-        '--disable-gpu',
         '--disable-dev-shm-usage',
         '--disable-software-rasterizer',
         '--mute-audio',

diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
@@ -13,9 +13,9 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      {{#link-to "index" classNames="navbar-brand"}}
+      <LinkTo @route="index" @classNames="navbar-brand">
         ember-cli-date-textbox
-      {{/link-to}}
+      </LinkTo>
     </div>
 
     {{! Collect the nav links, forms, and other content for toggling }}