ember-source 4.4.0-alpha.3 → 4.4.0-alpha.6

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.3.0-beta.2 (March 1, 2022)
+
+- [#19971](https://github.com/emberjs/ember.js/pull/19971) [BUGFIX] Don't serialize default Query Params on RouterService
+
 ### v4.3.0-beta.1 (February 7, 2022)
 
 No public API changes or bugfixes. 
@@ -3144,7 +3148,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * CollectionView context is now its content
 * Various enhancements to bound helpers: adds multiple property support to bound helpers, adds bind-able options hash properties, adds {{unbound}} helper support to render unbound form of helpers.
 * Add App.inject
-* Add Ember.EnumberableUtils.intersection
+* Add Ember.EnumerableUtils.intersection
 * Deprecate Controller#controllerFor in favor of Controller#needs
 * Adds `bubbles` property to Ember.TextField
 * Allow overriding of Ember.Router#handleURL

package/blueprints/-addon-import.js

@@ -4,9 +4,18 @@ const stringUtil = require('ember-cli-string-utils');
 const path = require('path');
 const inflector = require('inflection');
 
+const maybePolyfillTypeScriptBlueprints = require('./-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates an import wrapper.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __name__: function (options) {

package/blueprints/-maybe-polyfill-typescript-blueprints.js

@@ -0,0 +1,17 @@
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const EMBER_TYPESCRIPT_BLUEPRINTS = false;
+
+function canEmitTypeScript() {
+  return 'EMBER_TYPESCRIPT_BLUEPRINTS' in process.env
+    ? process.env.EMBER_TYPESCRIPT_BLUEPRINTS
+    : EMBER_TYPESCRIPT_BLUEPRINTS;
+}
+
+module.exports = function (context) {
+  if (canEmitTypeScript()) {
+    typescriptBlueprintPolyfill(context);
+  } else {
+    // Use the plain old JS templates from before
+    context.path = context.path.replace('blueprints', 'blueprints-js');
+  }
+};

package/blueprints/acceptance-test/index.js

@@ -5,11 +5,19 @@ const path = require('path');
 const pathUtil = require('ember-cli-path-utils');
 const stringUtils = require('ember-cli-string-utils');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an acceptance test for a feature.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   locals: function (options) {
     let testFolderRoot = stringUtils.dasherize(options.project.name());
 

package/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/{__name__-test.js → __name__-test.ts}

@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from 'ember-mocha';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {

package/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/{__name__-test.js → __name__-test.ts}

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from 'ember-qunit';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);

package/blueprints/component/index.js

@@ -10,6 +10,8 @@ const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const { EOL } = require('os');
 const { has } = require('@ember/edition-utils');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 const OCTANE = has('octane');
 
 // TODO: this should be reading from the @ember/canary-features module
@@ -21,6 +23,8 @@ const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = true;
 module.exports = {
   description: 'Generates a component.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'path',
@@ -51,6 +55,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {
@@ -203,7 +208,7 @@ module.exports = {
 
     if (this.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE && this.options.componentClass === '') {
       files = files.filter((file) => {
-        if (file.endsWith('.js')) {
+        if (file.endsWith('.js') || file.endsWith('.ts')) {
           this.skippedJsFiles.add(file);
           return false;
         } else {

package/blueprints/component-addon/index.js

@@ -5,9 +5,18 @@ const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates a component.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __path__: function (options) {

package/blueprints/component-class/index.js

@@ -9,6 +9,8 @@ const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const { EOL } = require('os');
 const { has } = require('@ember/edition-utils');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 const OCTANE = has('octane');
 
 // TODO: this should be reading from the @ember/canary-features module
@@ -20,6 +22,8 @@ const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = true;
 module.exports = {
   description: 'Generates a component class.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'path',
@@ -47,6 +51,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {

package/blueprints/component-class-addon/index.js

@@ -5,9 +5,18 @@ const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates a component class.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __path__: function (options) {

package/blueprints/component-test/index.js

@@ -6,6 +6,7 @@ const isPackageMissing = require('ember-cli-is-package-missing');
 const getPathOption = require('ember-cli-get-component-path-option');
 const semver = require('semver');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 function invocationFor(options) {
@@ -16,6 +17,13 @@ function invocationFor(options) {
 module.exports = useTestFrameworkDetector({
   description: 'Generates a component integration or unit test.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   availableOptions: [
     {
       name: 'test-type',

package/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__test__.js → __test__.ts}

@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__test__.js → __test__.ts}

@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
@@ -33,4 +33,4 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
     assert.ok(component);
   });
-});<% } %>
+}); <% } %>

package/blueprints/controller/index.js

@@ -1,7 +1,17 @@
 'use strict';
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates a controller.',
+
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },

package/blueprints/controller-test/index.js

@@ -5,8 +5,18 @@ const stringUtil = require('ember-cli-string-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 const path = require('path');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
+
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   locals: function (options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let controllerPathName = dasherizedModuleName;

package/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__test__.js → __test__.ts}

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();

package/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__test__.js → __test__.ts}

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

package/blueprints/helper/index.js

@@ -2,11 +2,20 @@
 
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 const path = require('path');
 
 module.exports = {
   description: 'Generates a helper function.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   filesPath() {
     let rootPath = 'files';
     return path.join(this.path, rootPath);

package/blueprints/helper-test/index.js

@@ -4,11 +4,20 @@ const stringUtils = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const semver = require('semver');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a helper integration test.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __root__() {

package/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/{__name__-test.js → __name__-test.ts}

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/{__name__-test.js → __name__-test.ts}

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 

package/blueprints/initializer/files/__root__/initializers/__name__.ts

@@ -0,0 +1,6 @@
+export function initialize(application) {
+}
+
+export default {
+  initialize
+};

package/blueprints/initializer/index.js

@@ -1,5 +1,14 @@
 'use strict';
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates an initializer.',
+
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
 };

package/blueprints/initializer-test/index.js

@@ -4,11 +4,19 @@ const fs = require('fs');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an initializer unit test.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __root__() {

package/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__name__-test.js → __name__-test.ts}

@@ -12,7 +12,9 @@ describe('<%= friendlyTestName %>', function () {
       initialize,
     });
 
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({
+      autoboot: false
+    });
   });
 
   afterEach(function () {

package/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts

@@ -0,0 +1,37 @@
+import Application from '@ember/application';
+
+import config from '<%= modulePrefix %>/config/environment';
+import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app'; <% } else { %>import { run } from '@ember/runloop'; <% } %>
+
+  module('<%= friendlyTestName %>', function (hooks) {
+    hooks.beforeEach(function () {
+      this.TestApplication = class TestApplication extends Application {
+        modulePrefix = config.modulePrefix;
+        podModulePrefix = config.podModulePrefix;
+        Resolver = Resolver;
+      };
+
+      this.TestApplication.initializer({
+        name: 'initializer under test',
+        initialize,
+      });
+
+      this.application = this.TestApplication.create({
+        autoboot: false
+      });
+    });
+
+    hooks.afterEach(function () {
+      <% if (destroyAppExists) { %> destroyApp(this.application); <% } else { %> run(this.application, 'destroy'); <% } %>
+  });
+
+    // TODO: Replace this with your real tests.
+    test('it works', async function (assert) {
+      await this.application.boot();
+
+      assert.ok(true);
+    });
+  });

package/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts

@@ -0,0 +1,6 @@
+export function initialize(owner) {
+}
+
+export default {
+  initialize
+};

package/blueprints/instance-initializer/index.js

@@ -1,5 +1,14 @@
 'use strict';
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
+  shouldTransformTypeScript: true,
+
   description: 'Generates an instance initializer.',
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
 };

package/blueprints/instance-initializer-test/index.js

@@ -4,11 +4,19 @@ const fs = require('fs');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an instance initializer unit test.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __root__() {

package/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__name__-test.js → __name__-test.ts}

@@ -11,7 +11,11 @@ describe('<%= friendlyTestName %>', function () {
       name: 'initializer under test',
       initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+
+    this.application = this.TestApplication.create({
+      autoboot: false
+    });
+    
     this.instance = this.application.buildInstance();
   });
   afterEach(function () {

package/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__name__-test.js → __name__-test.ts}

@@ -13,11 +13,16 @@ module('<%= friendlyTestName %>', function (hooks) {
       podModulePrefix = config.podModulePrefix;
       Resolver = Resolver;
     };
+
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
       initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+
+    this.application = this.TestApplication.create({
+      autoboot: false
+    });
+
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function () {

package/blueprints/route/files/__root__/__path__/{__name__.js → __name__.ts}

@@ -2,10 +2,8 @@ import Route from '@ember/routing/route';
 
 export default class <%= classifiedModuleName %>Route extends Route {<% if (hasDynamicSegment) {%>
   model(params) {
-    /**
-     * This route was generated with a dynamic segment. Implement data loading
-     * based on that dynamic segment here in the model hook.
-     */
+    // This route was generated with a dynamic segment. Implement data loading
+    // based on that dynamic segment here in the model hook.
     return params;
   }
 <%}%>}

package/blueprints/route/index.js

@@ -6,9 +6,13 @@ const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates a route and a template, and registers the route with the router.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'path',
@@ -26,6 +30,11 @@ module.exports = {
     },
   ],
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __name__(options) {

package/blueprints/route-addon/index.js

@@ -4,9 +4,18 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const inflector = require('inflection');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates import wrappers for a route and its template.',
 
+  shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    maybePolyfillTypeScriptBlueprints(this);
+  },
+
   fileMapTokens: function () {
     return {
       __templatepath__: function (options) {