ember-source 4.11.0-alpha.6 → 4.11.0

package/CHANGELOG.md

@@ -1,12 +1,24 @@
 # Ember Changelog
 
-## v4.10.0-beta.5 (December 28, 2022)
+## v4.11.0 (February 20, 2023)
 
-- [#20327](https://github.com/emberjs/ember.js/pull/20327) [BUGFIX] Fix the types for the mutation-methods of `NativeArray`
+- [#20288](https://github.com/emberjs/ember.js/pull/20288) [FEATURE] Stable types for `@ember/owner`
+- [#20323](https://github.com/emberjs/ember.js/pull/20323) [FEATURE] Introduce stable types for `@ember/error`
+- [#20361](https://github.com/emberjs/ember.js/pull/20361) [BUGFIX] Support a `router.ts` file when generating routes
+- [#20373](https://github.com/emberjs/ember.js/pull/20373) / [#20374](https://github.com/emberjs/ember.js/pull/20374) [BUGFIX] Make the type for `SafeString` public
+- [#20345](https://github.com/emberjs/ember.js/pull/20345) [CLEANUP] Remove flags for released features
+- [#20285](https://github.com/emberjs/ember.js/pull/20285) Update to TS v4.9
 
-## v4.10.0-beta.4 (December 13, 2022)
+## v4.10.0 (January 11, 2023)
 
-- [#20321](https://github.com/emberjs/ember.js/pull/20321) [BUGFIX] types: `ContainerDebugAdapter` extends `EmberObject`, not `Object`
+- [#20270](https://github.com/emberjs/ember.js/pull/20270) / [#20271](https://github.com/emberjs/ember.js/pull/20271) [FEATURE] Add new imports for `getOwner` and `setOwner` from `@ember/owner` and introduce new `@ember/routing` sub-modules as part of [RFC #821](https://rfcs.emberjs.com/id/0821-public-types).
+- [#20341](https://github.com/emberjs/ember.js/pull/20341) [DEPRECATION] Deprecations for importing `htmlSafe` and `isHTMLSafe` from `@ember/string`. They have moved to `@ember/template`. From [RFC #236](https://rfcs.emberjs.com/id/0236-deprecation-ember-string).
+- [#20344](https://github.com/emberjs/ember.js/pull/20344) [DEPRECATION] Deprecate @ember/string when used from ember-source; point users to add the `@ember/string` addon per [RFC #236](https://rfcs.emberjs.com/id/0236-deprecation-ember-string).
+- [#20342](https://github.com/emberjs/ember.js/pull/20342) [DEPRECATION] Deprecate @ember/error per [RFC #889](https://rfcs.emberjs.com/id/0889-deprecate-ember-error).
+- [#20327](https://github.com/emberjs/ember.js/pull/20327) [BUGFIX] Fix the types for the mutation-methods of `NativeArray`
+- [#20283](https://github.com/emberjs/ember.js/pull/20283) [BUGFIX] revert TS `compilerOptions.target` to ES2017
+- [#20253](https://github.com/emberjs/ember.js/pull/20253) Types: Add the `Resolver` type to preview types
+- [#20319](https://github.com/emberjs/ember.js/pull/20319) Types: resolve services with `Owner.lookup`
 
 ## v4.9.3 (December 13, 2022)
 
@@ -21,11 +33,6 @@
 - [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
 - [#20318](https://github.com/emberjs/ember.js/pull/20318) Backport `Resolver` to preview types
 
-## v4.10.0-beta.3 (December 12, 2022)
-
-- [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
-- [#20319](https://github.com/emberjs/ember.js/pull/20319) Types: resolve services with `Owner.lookup`
-
 ## v4.8.3 (December 12, 2022)
 
 - [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
@@ -35,20 +42,10 @@
 
 - [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions
 
-## v4.10.0-beta.2 (November 30, 2022)
-
-- [#20283](https://github.com/emberjs/ember.js/pull/20283) [BUGFIX] revert TS `compilerOptions.target` to ES2017
-- [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions
-
 ## v3.28.11 (November 30, 2022)
 
 - [#20286](https://github.com/emberjs/ember.js/pull/20286) [BUGFIX] Allow class-based helpers in strict-mode
 
-## v4.10.0-beta.1 (November 28, 2022)
-
-- [#20253](https://github.com/emberjs/ember.js/pull/20253) [FEATURE] Add the `Resolver` type to preview types
-- [#20270](https://github.com/emberjs/ember.js/pull/20270) / [#20271](https://github.com/emberjs/ember.js/pull/20271) [FEATURE] Add new imports for `getOwner` and `setOwner` from `@ember/owner` and introduce new `@ember/routing` sub-modules as part of [RFC #821](https://rfcs.emberjs.com/id/0821-public-types).
-
 ## v4.9.0 (November 28, 2022)
 
 - [#20274](https://github.com/emberjs/ember.js/pull/20274) [BUGFIX] Add some missing types to preview types

package/blueprints/route/index.js

@@ -5,6 +5,7 @@ const path = require('path');
 const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
+const SilentError = require('silent-error');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
@@ -148,21 +149,42 @@ function updateRouter(action, options) {
   }
 }
 
-function findRouter(options) {
+function findRouterPath(options) {
   let routerPathParts = [options.project.root];
-  let root = 'app';
 
   if (options.dummy && options.project.isEmberCLIAddon()) {
-    routerPathParts = routerPathParts.concat(['tests', 'dummy', root, 'router.js']);
+    routerPathParts.push('tests', 'dummy', 'app');
   } else {
-    routerPathParts = routerPathParts.concat([root, 'router.js']);
+    routerPathParts.push('app');
   }
 
-  return routerPathParts;
+  let jsRouterPath = path.join(...routerPathParts, 'router.js');
+  let tsRouterPath = path.join(...routerPathParts, 'router.ts');
+
+  let jsRouterPathExists = fs.existsSync(jsRouterPath);
+  let tsRouterPathExists = fs.existsSync(tsRouterPath);
+
+  if (jsRouterPathExists && tsRouterPathExists) {
+    throw new SilentError(
+      'Found both a `router.js` and `router.ts` file. Please make sure your project only has one or the other.'
+    );
+  }
+
+  if (jsRouterPathExists) {
+    return jsRouterPath;
+  }
+
+  if (tsRouterPathExists) {
+    return tsRouterPath;
+  }
+
+  throw new SilentError(
+    'Could not find a router file. Please make sure your project has a `router.js` or `router.ts` file.'
+  );
 }
 
 function writeRoute(action, name, options) {
-  let routerPath = path.join.apply(null, findRouter(options));
+  let routerPath = findRouterPath(options);
   let source = fs.readFileSync(routerPath, 'utf-8');
 
   let routes = new EmberRouterGenerator(source);

package/build-metadata.json

@@ -1,6 +1,6 @@
 {
-  "version": "4.11.0-alpha.6",
+  "version": "4.11.0",
   "buildType": "tag",
-  "SHA": "47045c2e79abc7dc0d0b4103284a94dd767bdd4e",
-  "assetPath": "/tag/shas/47045c2e79abc7dc0d0b4103284a94dd767bdd4e.tgz"
+  "SHA": "2b1011f1ef06befc12da863a75fe8cc5e7042769",
+  "assetPath": "/tag/shas/2b1011f1ef06befc12da863a75fe8cc5e7042769.tgz"
 }

package/dist/ember-template-compiler.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   4.11.0-alpha.6
+ * @version   4.11.0
  */
 
 /* eslint-disable no-var */
@@ -1021,12 +1021,13 @@ define("@ember/canary-features/index", ["exports", "@ember/-internals/environmen
       return false;
     }
   }
-  function featureValue(value) {
-    if (_environment.ENV.ENABLE_OPTIONAL_FEATURES && value === null) {
-      return true;
-    }
-    return value;
-  }
+  // Uncomment the below when features are present:
+  // function featureValue(value: null | boolean) {
+  //   if (ENV.ENABLE_OPTIONAL_FEATURES && value === null) {
+  //     return true;
+  //   }
+  //   return value;
+  // }
   // export const FLAG_NAME = featureValue(FEATURES.FLAG_NAME);
 });
 define("@ember/debug/container-debug-adapter", ["exports", "@ember/-internals/string", "@ember/object", "@ember/utils", "@ember/-internals/owner", "@ember/application/namespace"], function (_exports, _string, _object, _utils, _owner, _namespace) {
@@ -16464,7 +16465,7 @@ define("ember/version", ["exports"], function (_exports) {
     value: true
   });
   _exports.default = void 0;
-  var _default = "4.11.0-alpha.6";
+  var _default = "4.11.0";
   _exports.default = _default;
 });
 define("simple-html-tokenizer", ["exports"], function (_exports) {