ember-source 4.11.0-beta.1 → 4.11.0

package/CHANGELOG.md

@@ -1,9 +1,11 @@
 # Ember Changelog
 
-## v4.11.0-beta.1 (January 12, 2023)
+## v4.11.0 (February 20, 2023)
 
 - [#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
 

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-beta.1",
+  "version": "4.11.0",
   "buildType": "tag",
-  "SHA": "6daf65cc3291902f22dbe1e66f579eb36c4a6b8e",
-  "assetPath": "/tag/shas/6daf65cc3291902f22dbe1e66f579eb36c4a6b8e.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-beta.1
+ * @version   4.11.0
  */
 
 /* eslint-disable no-var */
@@ -16465,7 +16465,7 @@ define("ember/version", ["exports"], function (_exports) {
     value: true
   });
   _exports.default = void 0;
-  var _default = "4.11.0-beta.1";
+  var _default = "4.11.0";
   _exports.default = _default;
 });
 define("simple-html-tokenizer", ["exports"], function (_exports) {