Merge pull request #866 from SergeAstapov/fix-ci

Make edition=octane and update deps for Ember v4 compatibility

Author: mansona

packages/ember-cli-fastboot/config/ember-try.js

@@ -86,6 +86,9 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
           ember: {
             edition: 'classic',
           },

packages/ember-cli-fastboot/package.json

@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.2.5",
+    "@ember/test-helpers": "^2.6.0",
     "@embroider/test-setup": "^0.37.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
@@ -64,7 +64,7 @@
     "chai-fs": "^2.0.0",
     "chai-string": "^1.4.0",
     "ember-auto-import": "^2.2.1",
-    "ember-cli": "~3.26.1",
+    "ember-cli": "~4.1.0",
     "ember-cli-addon-tests": "^0.11.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
@@ -74,8 +74,8 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
-    "ember-page-title": "^6.2.1",
-    "ember-qunit": "^5.1.4",
+    "ember-page-title": "^7.0.0",
+    "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.2",
     "ember-sinon": "^2.2.0",
     "ember-source": "~3.26.1",
@@ -107,7 +107,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "ember": {
-    "edition": "classic"
+    "edition": "octane"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

packages/ember-cli-fastboot/test/fastboot-config-test.js

@@ -18,11 +18,12 @@ describe('FastBoot config', function () {
       .create('fastboot-config', {
         skipNpm: true,
         emberVersion: 'latest',
-        emberDataVersion: '~3.19.0',
+        emberDataVersion: 'latest',
       })
       .then(function () {
         app.editPackageJSON((pkg) => {
           delete pkg.devDependencies['ember-fetch'];
+          delete pkg.devDependencies['ember-welcome-page'];
         });
         return app.run('npm', 'install');
       })

packages/ember-cli-fastboot/test/fastboot-location-config-test.js

@@ -18,11 +18,12 @@ describe('FastBootLocation Configuration', function () {
       .create('fastboot-location-config', {
         skipNpm: true,
         emberVersion: 'latest',
-        emberDataVersion: '~3.19.0',
+        emberDataVersion: 'latest',
       })
       .then(function () {
         app.editPackageJSON((pkg) => {
           delete pkg.devDependencies['ember-fetch'];
+          delete pkg.devDependencies['ember-welcome-page'];
         });
         return app.run('npm', 'install');
       })

packages/ember-cli-fastboot/test/fastboot-location-test.js

@@ -17,11 +17,12 @@ describe('FastBootLocation', function () {
       .create('fastboot-location', {
         skipNpm: true,
         emberVersion: 'latest',
-        emberDataVersion: '~3.19.0',
+        emberDataVersion: 'latest',
       })
       .then(function () {
         app.editPackageJSON((pkg) => {
           delete pkg.devDependencies['ember-fetch'];
+          delete pkg.devDependencies['ember-welcome-page'];
         });
         return app.run('npm', 'install');
       })

packages/ember-cli-fastboot/test/fixtures/customized-outputpaths/app/templates/application.hbs

@@ -0,0 +1,3 @@
+<h2 id="title">Welcome to Ember</h2>
+
+{{outlet}}

packages/ember-cli-fastboot/test/fixtures/customized-outputpaths/config/targets.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions',
+];
+
+module.exports = {
+  browsers,
+  node: 'current',
+};

packages/ember-cli-fastboot/test/fixtures/fastboot-config/config/environment.js

@@ -1,16 +1,21 @@
 /* jshint node: true */
+'use strict';
 
-module.exports = function(environment) {
-  var ENV = {
+module.exports = function (environment) {
+  let ENV = {
     modulePrefix: 'fastboot-config',
-    environment: environment,
-    baseURL: '/',
+    environment,
+    rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
-        // e.g. 'with-controller': true
-      }
+        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false,
+      },
     },
 
     APP: {
@@ -19,8 +24,8 @@ module.exports = function(environment) {
     },
 
     fastboot: {
-      hostWhitelist: ['example.com', 'subdomain.example.com', /localhost:\d+/]
-    }
+      hostWhitelist: ['example.com', 'subdomain.example.com', /localhost:\d+/],
+    },
   };
 
   if (environment === 'development') {
@@ -33,18 +38,18 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;

packages/ember-cli-fastboot/test/fixtures/fastboot-config/config/targets.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions',
+];
+
+module.exports = {
+  browsers,
+  node: 'current',
+};

packages/ember-cli-fastboot/test/fixtures/fastboot-location-config/app/templates/application.hbs

@@ -0,0 +1,3 @@
+<h2 id="title">Welcome to Ember</h2>
+
+{{outlet}}