ember-mocks · scalvert · Jun 17, 2022 · Jun 17, 2022 · Jun 17, 2022
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -45,13 +45,10 @@ jobs:
       fail-fast: true
       matrix:
         ember-try-scenario:
-          - ember-lts-3.16
-          - ember-lts-3.20
+          - ember-lts-3.28
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-default-with-jquery
-          - ember-classic
 
     steps:
       - uses: actions/checkout@v2

diff --git a/addon/package.json b/addon/package.json
@@ -38,7 +38,7 @@
   "release-it": {
     "plugins": {
       "release-it-lerna-changelog": {
-        "infile": "CHANGELOG.md",
+        "infile": "../CHANGELOG.md",
         "launchEditor": true
       }
     },

diff --git a/test-app/.DS_Store b/test-app/.DS_Store
diff --git a/test-app/.ember-cli b/test-app/.ember-cli
@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "disableAnalytics": false,
+
+  /**
+  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+  */
+  "isTypeScriptProject": true
 }
diff --git a/test-app/.eslintignore b/test-app/.eslintignore
@@ -17,4 +17,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
diff --git a/test-app/.gitignore b/test-app/.gitignore
@@ -22,4 +22,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
+
+# broccoli-debug
+/DEBUG/
diff --git a/test-app/app/app.js b/test-app/app/app.js
@@ -3,11 +3,11 @@ import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'test-app/config/environment';
 
-const App = Application.extend({
-  modulePrefix: config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver
-});
+class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
 
 loadInitializers(App, config.modulePrefix);
 

diff --git a/test-app/app/index.html b/test-app/app/index.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Ember Date Service Test App</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/test-app/app/router.js b/test-app/app/router.js
@@ -1,10 +1,10 @@
 import EmberRouter from '@ember/routing/router';
 import config from 'test-app/config/environment';
 
-const Router = EmberRouter.extend({
-  location: config.locationType,
-  rootURL: config.rootURL
-});
+class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
 Router.map(function() {
 });

diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js
@@ -7,18 +7,10 @@ module.exports = async function() {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.16',
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0'
-          }
-        }
-      },
-      {
-        name: 'ember-lts-3.20',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.20.5'
+            'ember-source': '^3.28.0'
           }
         }
       },
@@ -46,34 +38,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: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'application-template-wrapper': true,
-            'default-async-observers': false,
-            'template-only-glimmer-components': false
-          })
-        },
-        npm: {
-          ember: {
-            edition: 'classic'
-          }
-        }
-      }
     ]
   };
 };
diff --git a/test-app/config/environment.js b/test-app/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function(environment) {
     modulePrefix: 'test-app',
     environment,
     rootURL: '/',
-    locationType: 'auto',
+    locationType: 'history',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build

diff --git a/test-app/config/targets.js b/test-app/config/targets.js
@@ -6,13 +6,6 @@ const browsers = [
   'last 1 Safari versions'
 ];
 
-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/test-app/package.json b/test-app/package.json
@@ -22,13 +22,13 @@
     "@babel/eslint-parser": "^7.18.2",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.8.1",
-    "@glimmer/component": "^1.0.2",
-    "@glimmer/tracking": "^1.0.2",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^2.4.1",
-    "ember-cli": "^3.28.0",
-    "ember-cli-babel": "^7.22.1",
-    "ember-cli-dependency-checker": "^3.1.0",
+    "ember-cli": "^4.4.0",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
@@ -37,26 +37,23 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^2.1.1",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.2",
-    "ember-source": "~3.22.0",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "^4.5.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.9.1",
     "ember-try": "^1.0.0",
     "eslint": "^7.11.0",
-    "eslint-config-prettier": "^7.0.0",
-    "eslint-plugin-ember": "^9.3.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-ember": "^10.6.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-prettier": "^3.2.0",
+    "eslint-plugin-prettier": "^4.0.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.2.1",
+    "prettier": "^2.6.2",
     "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
-    "release-it": "^14.0.3",
-    "release-it-lerna-changelog": "^3.1.0",
-    "webpack": "5"
+    "webpack": "^5.72.1"
   },
   "engines": {
     "node": ">= 14.*"

diff --git a/test-app/tests/.DS_Store b/test-app/tests/.DS_Store
diff --git a/test-app/tests/index.html b/test-app/tests/index.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Ember Date Service Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">