ember-cli 5.4.0 → 5.5.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ember-cli Changelog
 
+## v5.5.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.4.0...v5.5.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.4.0...v5.5.0-beta.0)
+
+#### Changelog
+
+- [#10332](https://github.com/ember-cli/ember-cli/pull/10332) [ENHANCEMENT] Support converting gts files in blueprint [@IgnaceMaes](https://github.com/IgnaceMaes)
+- [#10350](https://github.com/ember-cli/ember-cli/pull/10350) [ENHANCEMENT] Deprecate Travis CI support [@bertdeblock](https://github.com/bertdeblock)
+- [#10370](https://github.com/ember-cli/ember-cli/pull/10370) When generating a new app with --embroider use all optimisation flags [@mansona](https://github.com/mansona)
+- [#10393](https://github.com/ember-cli/ember-cli/pull/10393) [ENHANCEMENT] feat: add skip-install alias to skip-npm [@IgnaceMaes](https://github.com/IgnaceMaes)
+- [#9514](https://github.com/ember-cli/ember-cli/pull/9514) [ENHANCEMENT] Use packager commands in `CONTRIBUTING.md` and `README.md` files in `app` and `addon` blueprints [@elwayman02](https://github.com/elwayman02)
+
+Thank you to all who took the time to contribute!
+
 ## v5.4.0
 
 #### Blueprint Changes

package/blueprints/addon/files/.travis.yml

@@ -1,3 +1,14 @@
+# DEPRECATION:
+#
+# Support for generating a Travis CI config file is deprecated.
+# You can keep using Travis CI, or you could also consider switching to GitHub Actions instead.
+#
+# Feel free to remove this comment block if you want to continue using Travis CI.
+#
+# ID     travis-ci-support
+# UNTIL  6.0.0
+# URL    https://deprecations.emberjs.com/id/travis-ci-support
+
 ---
 language: node_js
 node_js:

package/blueprints/addon/files/CONTRIBUTING.md

@@ -8,18 +8,18 @@
 
 ## Linting
 
-* `<% if (pnpm) { %>pnpm lint<% } else if (yarn) { %>yarn lint<% } else { %>npm run lint<% } %>`
-* `<% if (pnpm) { %>pnpm lint:fix<% } else if (yarn) { %>yarn lint:fix<% } else { %>npm run lint:fix<% } %>`
+* `<%= invokeScriptPrefix %> lint`
+* `<%= invokeScriptPrefix %> lint:fix`
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+* `<%= invokeScriptPrefix %> test` – Runs the test suite on the current Ember version
+* `<%= invokeScriptPrefix %> test:ember <% if (npm) { %>-- <% } %>--server` – Runs the test suite in "watch mode"
+* `<%= invokeScriptPrefix %> test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
+* `<%= invokeScriptPrefix %> start`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

package/blueprints/addon/index.js

@@ -171,6 +171,16 @@ module.exports = {
         outdent;
     }
 
+    let invokeScriptPrefix = 'npm run';
+
+    if (options.packageManager === 'yarn') {
+      invokeScriptPrefix = 'yarn';
+    }
+
+    if (options.packageManager === 'pnpm') {
+      invokeScriptPrefix = 'pnpm';
+    }
+
     return {
       addonDirectory: directoryForPackageName(addonName),
       name,
@@ -182,6 +192,8 @@ module.exports = {
       year: date.getFullYear(),
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',
+      npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
+      invokeScriptPrefix,
       welcome: options.welcome,
       blueprint: 'addon',
       blueprintOptions,

package/blueprints/app/files/.travis.yml

@@ -1,3 +1,14 @@
+# DEPRECATION:
+#
+# Support for generating a Travis CI config file is deprecated.
+# You can keep using Travis CI, or you could also consider switching to GitHub Actions instead.
+#
+# Feel free to remove this comment block if you want to continue using Travis CI.
+#
+# ID     travis-ci-support
+# UNTIL  6.0.0
+# URL    https://deprecations.emberjs.com/id/travis-ci-support
+
 ---
 language: node_js
 node_js:

package/blueprints/app/files/README.md

@@ -22,7 +22,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `<%= invokeScriptPrefix %> start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -32,18 +32,18 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `<%= invokeScriptPrefix %> test`
+* `<%= invokeScriptPrefix %> test:ember <% if (npm) { %>-- <% } %>--server`
 
 ### Linting
 
-* `<% if (pnpm) { %>pnpm lint<% } else if (yarn) { %>yarn lint<% } else { %>npm run lint<% } %>`
-* `<% if (pnpm) { %>pnpm lint:fix<% } else if (yarn) { %>yarn lint:fix<% } else { %>npm run lint:fix<% } %>`
+* `<%= invokeScriptPrefix %> lint`
+* `<%= invokeScriptPrefix %> lint:fix`
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `<%= execBinPrefix %> ember build` (development)
+* `<%= invokeScriptPrefix %> build` (production)
 
 ### Deploying
 

package/blueprints/app/files/ember-cli-build.js

@@ -11,6 +11,12 @@ module.exports = function (defaults) {
 
   <% if (embroider) { %>const { Webpack } = require('@embroider/webpack');
   return require('@embroider/compat').compatBuild(app, Webpack, {
+    staticAddonTestSupportTrees: true,
+    staticAddonTrees: true,
+    staticHelpers: true,
+    staticModifiers: true,
+    staticComponents: true,
+    staticEmberSource: true,
     skipBabel: [
       {
         package: 'qunit',

package/blueprints/app/files/package.json

@@ -82,14 +82,14 @@
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %>",
-    "ember-data": "~5.3.0",
+    "ember-data": "~5.4.0-beta.1",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^8.0.0",
     "ember-qunit": "^8.0.1",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.4.0",
+    "ember-source": "~5.5.0-beta.1",
     "ember-template-lint": "^5.11.2<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
     "eslint": "^8.52.0",

package/blueprints/app/index.js

@@ -47,6 +47,19 @@ module.exports = {
         outdent;
     }
 
+    let invokeScriptPrefix = 'npm run';
+    let execBinPrefix = 'npm exec';
+
+    if (options.packageManager === 'yarn') {
+      invokeScriptPrefix = 'yarn';
+      execBinPrefix = 'yarn';
+    }
+
+    if (options.packageManager === 'pnpm') {
+      invokeScriptPrefix = 'pnpm';
+      execBinPrefix = 'pnpm';
+    }
+
     return {
       appDirectory: directoryForPackageName(name),
       name,
@@ -55,6 +68,9 @@ module.exports = {
       emberCLIVersion: require('../../package').version,
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',
+      npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
+      invokeScriptPrefix,
+      execBinPrefix,
       welcome: options.welcome,
       blueprint: 'app',
       blueprintOptions,

package/docs/build/data.json

@@ -3,7 +3,7 @@
         "logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
         "name": "ember-cli",
         "description": "Command line tool for developing ambitious ember.js apps",
-        "version": "5.4.0-release-47738937b0"
+        "version": "5.5.0-beta.0-beta-1012f7af20"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -3911,7 +3911,33 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 543,
+            "line": 539,
+            "access": "private",
+            "tagname": "",
+            "itemtype": "method",
+            "name": "removeTypes",
+            "params": [
+                {
+                    "name": "extension",
+                    "description": "",
+                    "type": "String"
+                },
+                {
+                    "name": "code",
+                    "description": "",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise"
+            },
+            "class": "Blueprint",
+            "module": "ember-cli"
+        },
+        {
+            "file": "lib/models/blueprint.js",
+            "line": 582,
             "itemtype": "method",
             "name": "install",
             "params": [
@@ -3930,7 +3956,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 570,
+            "line": 609,
             "itemtype": "method",
             "name": "uninstall",
             "params": [
@@ -3949,7 +3975,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 592,
+            "line": 631,
             "description": "Hook for running operations before install.",
             "itemtype": "method",
             "name": "beforeInstall",
@@ -3962,7 +3988,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 599,
+            "line": 638,
             "description": "Hook for running operations after install.",
             "itemtype": "method",
             "name": "afterInstall",
@@ -3975,7 +4001,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 606,
+            "line": 645,
             "description": "Hook for running operations before uninstall.",
             "itemtype": "method",
             "name": "beforeUninstall",
@@ -3988,7 +4014,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 613,
+            "line": 652,
             "description": "Hook for running operations after uninstall.",
             "itemtype": "method",
             "name": "afterUninstall",
@@ -4001,7 +4027,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 622,
+            "line": 661,
             "description": "Hook for adding custom template variables.\n\nWhen the following is called on the command line:\n\n```sh\nember generate controller foo --type=array --dry-run isAdmin:true\n```\n\nThe object passed to `locals` looks like this:\n\n```js\n{\n  entity: {\n    name: 'foo',\n    options: {\n      isAdmin: true\n    }\n  },\n  dryRun: true\n  type: \"array\"\n  // more keys\n}\n```\n\nThis hook must return an object or a Promise which resolves to an object.\nThe resolved object will be merged with the aforementioned default locals.",
             "access": "public",
             "tagname": "",
@@ -4023,7 +4049,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 657,
+            "line": 696,
             "description": "Hook to add additional or override existing fileMap tokens.\n\nUse `fileMapTokens` to add custom fileMap tokens for use\nin the `mapFile` method. The hook must return an object in the\nfollowing pattern:\n\n```js\n{\n  __token__(options){\n    // logic to determine value goes here\n    return 'value';\n  }\n}\n```\n\nIt will be merged with the default `fileMapTokens`, and can be used\nto override any of the default tokens.\n\nTokens are used in the files folder (see `files`), and get replaced with\nvalues when the `mapFile` method is called.",
             "access": "public",
             "tagname": "",
@@ -4038,7 +4064,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 685,
+            "line": 724,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4059,7 +4085,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 741,
+            "line": 780,
             "description": "Used to generate fileMap tokens for mapFile.",
             "itemtype": "method",
             "name": "generateFileMap",
@@ -4079,7 +4105,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 756,
+            "line": 795,
             "itemtype": "method",
             "name": "buildFileInfo",
             "params": [
@@ -4108,7 +4134,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 777,
+            "line": 816,
             "itemtype": "method",
             "name": "isUpdate",
             "return": {
@@ -4120,7 +4146,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 787,
+            "line": 826,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4151,7 +4177,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 799,
+            "line": 838,
             "description": "Add update files to ignored files or reset them",
             "access": "private",
             "tagname": "",
@@ -4162,7 +4188,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 812,
+            "line": 851,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4183,7 +4209,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 825,
+            "line": 864,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4205,7 +4231,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 839,
+            "line": 878,
             "itemtype": "method",
             "name": "processFiles",
             "params": [
@@ -4229,7 +4255,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 872,
+            "line": 911,
             "itemtype": "method",
             "name": "processFilesForUninstall",
             "params": [
@@ -4249,7 +4275,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 923,
+            "line": 962,
             "itemtype": "method",
             "name": "mapFile",
             "params": [
@@ -4272,7 +4298,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 940,
+            "line": 979,
             "description": "Looks for a __root__ token in the files folder. Must be present for\nthe blueprint to support addon tokens. The `server`, `blueprints`, and `test`",
             "access": "private",
             "tagname": "",
@@ -4287,7 +4313,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 952,
+            "line": 991,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4317,7 +4343,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 982,
+            "line": 1021,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4338,7 +4364,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1015,
+            "line": 1054,
             "description": "Used to add a package to the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.",
             "itemtype": "method",
             "name": "addPackageToProject",
@@ -4363,7 +4389,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1037,
+            "line": 1076,
             "description": "Used to add multiple packages to the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.\n\nExpects each array item to be an object with a `name`.  Each object\nmay optionally have a `target` to specify a specific version.",
             "itemtype": "method",
             "name": "addPackagesToProject",
@@ -4386,7 +4412,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1086,
+            "line": 1125,
             "description": "Used to remove a package from the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that any package conflicts can be resolved before the\naddon is used.",
             "itemtype": "method",
             "name": "removePackageFromProject",
@@ -4406,7 +4432,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1103,
+            "line": 1142,
             "description": "Used to remove multiple packages from the project's `package.json`.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that any package conflicts can be resolved before the\naddon is used.\n\nExpects each array item to be an object with a `name` property.",
             "itemtype": "method",
             "name": "removePackagesFromProject",
@@ -4426,7 +4452,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1144,
+            "line": 1183,
             "description": "Used to add an addon to the project's `package.json` and run it's\n`defaultBlueprint` if it provides one.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.",
             "itemtype": "method",
             "name": "addAddonToProject",
@@ -4446,7 +4472,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1164,
+            "line": 1203,
             "description": "Used to add multiple addons to the project's `package.json` and run their\n`defaultBlueprint` if they provide one.\n\nGenerally, this would be done from the `afterInstall` hook, to\nensure that a package that is required by a given blueprint is\navailable.",
             "itemtype": "method",
             "name": "addAddonsToProject",
@@ -4466,7 +4492,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1241,
+            "line": 1280,
             "description": "Used to retrieve a task with the given name. Passes the new task\nthe standard information available (like `ui`, `project`, etc).",
             "itemtype": "method",
             "name": "taskFor",
@@ -4483,7 +4509,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1258,
+            "line": 1297,
             "description": "Inserts the given content into a file. If the `contentsToInsert` string is already\npresent in the current contents, the file will not be changed unless `force` option\nis passed.\n\nIf `options.before` is specified, `contentsToInsert` will be inserted before\nthe first instance of that string.  If `options.after` is specified, the\ncontents will be inserted after the first instance of that string.\nIf the string specified by options.before or options.after is not in the file,\nno change will be made.\n\nIf neither `options.before` nor `options.after` are present, `contentsToInsert`\nwill be inserted at the end of the file.\n\nExample:\n```\n// app/router.js\nRouter.map(function () {\n});\n```\n\n```\ninsertIntoFile('app/router.js', '  this.route(\"admin\");', {\n  after: 'Router.map(function () {' + EOL\n}).then(function() {\n  // file has been inserted into!\n});\n\n\n```\n\n```\n// app/router.js\nRouter.map(function () {\n  this.route(\"admin\");\n});\n```",
             "itemtype": "method",
             "name": "insertIntoFile",
@@ -4513,7 +4539,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1362,
+            "line": 1401,
             "description": "Used to retrieve a blueprint with the given name.",
             "itemtype": "method",
             "name": "lookupBlueprint",
@@ -4535,7 +4561,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1379,
+            "line": 1418,
             "static": 1,
             "itemtype": "method",
             "name": "lookup",
@@ -4582,7 +4608,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1420,
+            "line": 1459,
             "description": "Loads a blueprint from given path.",
             "static": 1,
             "itemtype": "method",
@@ -4610,7 +4636,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1448,
+            "line": 1487,
             "static": 1,
             "itemtype": "method",
             "name": "list",
@@ -4640,7 +4666,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1497,
+            "line": 1536,
             "description": "Files that are renamed when installed into the target directory.\nThis allows including files in the blueprint that would have an effect\non another process, such as a file named `.gitignore`.\n\nThe keys are the filenames used in the files folder.\nThe values are the filenames used in the target directory.",
             "static": 1,
             "itemtype": "property",
@@ -4651,7 +4677,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1512,
+            "line": 1551,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredFiles",
@@ -4661,7 +4687,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1518,
+            "line": 1557,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredUpdateFiles",
@@ -4671,7 +4697,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1524,
+            "line": 1563,
             "static": 1,
             "itemtype": "property",
             "name": "defaultLookupPaths",
@@ -4681,7 +4707,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1532,
+            "line": 1571,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4703,7 +4729,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1545,
+            "line": 1584,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4721,7 +4747,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1556,
+            "line": 1595,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4739,7 +4765,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1565,
+            "line": 1604,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4766,7 +4792,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1579,
+            "line": 1618,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4788,7 +4814,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1591,
+            "line": 1630,
             "description": "Combines provided lookup paths with defaults and removes\nduplicates.",
             "access": "private",
             "tagname": "",
@@ -4811,7 +4837,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1606,
+            "line": 1645,
             "description": "Looks for a __path__ token in the files folder. Must be present for\nthe blueprint to support pod tokens.",
             "access": "private",
             "tagname": "",
@@ -4834,7 +4860,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1645,
+            "line": 1684,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4856,7 +4882,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1659,
+            "line": 1698,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4878,7 +4904,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1669,
+            "line": 1708,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4893,7 +4919,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1682,
+            "line": 1721,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5112,7 +5138,7 @@
             "name": "availableOptions",
             "type": "Array",
             "example": [
-                "\n```js\navailableOptions: [\n  { name: 'dry-run',    type: Boolean, default: false, aliases: ['d'] },\n  { name: 'verbose',    type: Boolean, default: false, aliases: ['v'] },\n  { name: 'blueprint',  type: String,  default: 'app', aliases: ['b'] },\n  { name: 'skip-npm',   type: Boolean, default: false, aliases: ['sn'] },\n  { name: 'skip-git',   type: Boolean, default: false, aliases: ['sg'] },\n  { name: 'directory',  type: String ,                 aliases: ['dir'] }\n],\n```"
+                "\n```js\navailableOptions: [\n  { name: 'dry-run',    type: Boolean, default: false, aliases: ['d'] },\n  { name: 'verbose',    type: Boolean, default: false, aliases: ['v'] },\n  { name: 'blueprint',  type: String,  default: 'app', aliases: ['b'] },\n  { name: 'skip-npm',   type: Boolean, default: false, aliases: ['sn', 'skip-install', 'si'] },\n  { name: 'skip-git',   type: Boolean, default: false, aliases: ['sg'] },\n  { name: 'directory',  type: String ,                 aliases: ['dir'] }\n],\n```"
             ],
             "class": "Command",
             "module": "ember-cli"

package/lib/commands/addon.js

@@ -11,7 +11,7 @@ module.exports = NewCommand.extend({
     { name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'blueprint', type: String, default: 'addon', aliases: ['b'] },
-    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
+    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn', 'skip-install', 'si'] },
     { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] },
     {
       name: 'package-manager',

package/lib/commands/init.js

@@ -9,6 +9,7 @@ const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
 const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
 const getLangArg = require('../../lib/utilities/get-lang-arg');
+const { deprecate } = require('../debug');
 
 module.exports = Command.extend({
   name: 'init',
@@ -19,7 +20,7 @@ module.exports = Command.extend({
     { name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'blueprint', type: String, aliases: ['b'] },
-    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
+    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn', 'skip-install', 'si'] },
     { name: 'lint-fix', type: Boolean, default: true },
     {
       name: 'welcome',
@@ -119,6 +120,25 @@ module.exports = Command.extend({
     const projectName = this.project.name();
     const prependEmoji = require('../../lib/utilities/prepend-emoji');
 
+    if (ciProvider === 'travis') {
+      this.ui.writeLine('');
+
+      deprecate(
+        'Support for generating a Travis CI config file is deprecated.\nYou can keep using Travis CI, or you could also consider switching to GitHub Actions instead.',
+        false,
+        {
+          for: 'ember-cli',
+          id: 'travis-ci-support',
+          since: {
+            available: '5.5.0',
+            enabled: '5.5.0',
+          },
+          until: '6.0.0',
+          url: 'https://deprecations.emberjs.com/id/travis-ci-support',
+        }
+      );
+    }
+
     this.ui.writeLine('');
     this.ui.writeLine(prependEmoji('🎉', `Successfully created project ${chalk.yellow(projectName)}.`));
     this.ui.writeLine(prependEmoji('👉', 'Get started by typing:'));

package/lib/commands/new.js

@@ -17,7 +17,7 @@ module.exports = Command.extend({
     { name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'blueprint', type: String, default: 'app', aliases: ['b'] },
-    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
+    { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn', 'skip-install', 'si'] },
     { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] },
     {
       name: 'welcome',

package/lib/debug/deprecate.js

@@ -74,6 +74,7 @@ function deprecate(description, condition, options) {
   let message = formatMessage(description, options);
 
   warn(message);
+  warn('');
   warn(getStackTrace());
 
   // Return the message for testing purposes.
@@ -86,13 +87,21 @@ function isSemVer(version) {
 }
 
 function formatMessage(description, options) {
-  let message = [`DEPRECATION: ${description}`, `[ID: ${options.id}]`];
+  let message = [
+    chalk.inverse(' DEPRECATION '),
+    '\n\n',
+    description,
+    '\n\n',
+    `ID     ${options.id}`,
+    '\n',
+    `UNTIL  ${options.until}`,
+  ];
 
   if (options.url) {
-    message.push(`See ${options.url} for more details.`);
+    message.push('\n', `URL    ${options.url}`);
   }
 
-  return message.join(' ');
+  return message.join('');
 }
 
 function getStackTrace() {

package/lib/models/blueprint.js

@@ -529,15 +529,54 @@ let Blueprint = CoreObject.extend({
   async convertToJS(fileInfo) {
     let rendered = await fileInfo.render();
 
+    fileInfo.rendered = await this.removeTypes(path.extname(fileInfo.displayPath), rendered);
+    fileInfo.displayPath = replaceTypeScriptExtension(fileInfo.displayPath);
+    fileInfo.outputPath = replaceTypeScriptExtension(fileInfo.outputPath);
+
+    return fileInfo;
+  },
+
+  /**
+    @private
+    @method removeTypes
+    @param {string} extension
+    @param {string} code
+    @return {Promise}
+  */
+  async removeTypes(extension, code) {
     const { removeTypes } = require('remove-types');
-    const transformed = await removeTypes(rendered);
 
-    fileInfo.rendered = transformed;
+    if (extension === '.gts') {
+      const { parseTemplates } = require('ember-template-tag');
+      // Strip template tags
+      const templateTagIdentifier = (index) => `template = __TEMPLATE_TAG_${index}__;`;
+      const templateTagIdentifierBraces = (index) => `(template = __TEMPLATE_TAG_${index}__);`;
+      const templateTagMatches = parseTemplates(code).filter((match) => match.type === 'template-tag');
+      let strippedCode = code;
+      for (let i = 0; i < templateTagMatches.length; i++) {
+        const match = templateTagMatches[i];
+        const [matchStart, matchEnd] = match.range;
+        const templateTag = code.substring(matchStart, matchEnd);
+        strippedCode = strippedCode.replace(templateTag, templateTagIdentifier(i));
+      }
 
-    fileInfo.displayPath = replaceExtension(fileInfo.displayPath, '.js');
-    fileInfo.outputPath = replaceExtension(fileInfo.outputPath, '.js');
+      // Remove types
+      const transformed = await removeTypes(strippedCode);
+
+      // Readd stripped template tags
+      let transformedWithTemplateTag = transformed;
+      for (let i = 0; i < templateTagMatches.length; i++) {
+        const match = templateTagMatches[i];
+        const [matchStart, matchEnd] = match.range;
+        const templateTag = code.substring(matchStart, matchEnd);
+        transformedWithTemplateTag = transformedWithTemplateTag.replace(templateTagIdentifier(i), templateTag);
+        transformedWithTemplateTag = transformedWithTemplateTag.replace(templateTagIdentifierBraces(i), templateTag);
+      }
 
-    return fileInfo;
+      return transformedWithTemplateTag;
+    }
+
+    return await removeTypes(code);
   },
 
   /**
@@ -893,8 +932,8 @@ let Blueprint = CoreObject.extend({
 
         const jsInfo = new FileInfo({
           ...info,
-          outputPath: replaceExtension(info.outputPath, '.js'),
-          displayPath: replaceExtension(info.displayPath, '.js'),
+          outputPath: replaceTypeScriptExtension(info.outputPath),
+          displayPath: replaceTypeScriptExtension(info.displayPath),
         });
 
         if (this.options.typescript === false) {
@@ -1714,12 +1753,23 @@ function replaceExtension(filePath, newExt) {
   });
 }
 
+function replaceTypeScriptExtension(filePath) {
+  const extensionMap = {
+    '.ts': '.js',
+    '.gts': '.gjs',
+  };
+  const ext = path.extname(filePath);
+  const newExt = extensionMap[ext];
+
+  return replaceExtension(filePath, newExt);
+}
+
 function isTypeScriptFile(filePath) {
-  return path.extname(filePath) === '.ts';
+  return path.extname(filePath) === '.ts' || path.extname(filePath) === '.gts';
 }
 
 function isJavaScriptFile(filePath) {
-  return path.extname(filePath) === '.js';
+  return path.extname(filePath) === '.js' || path.extname(filePath) === '.gjs';
 }
 
 module.exports = Blueprint;

package/lib/models/command.js

@@ -126,7 +126,7 @@ let Command = CoreObject.extend({
      *   { name: 'dry-run',    type: Boolean, default: false, aliases: ['d'] },
      *   { name: 'verbose',    type: Boolean, default: false, aliases: ['v'] },
      *   { name: 'blueprint',  type: String,  default: 'app', aliases: ['b'] },
-     *   { name: 'skip-npm',   type: Boolean, default: false, aliases: ['sn'] },
+     *   { name: 'skip-npm',   type: Boolean, default: false, aliases: ['sn', 'skip-install', 'si'] },
      *   { name: 'skip-git',   type: Boolean, default: false, aliases: ['sg'] },
      *   { name: 'directory',  type: String ,                 aliases: ['dir'] }
      * ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "5.4.0",
+  "version": "5.5.0-beta.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -67,6 +67,7 @@
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-preprocess-registry": "^5.0.1",
     "ember-cli-string-utils": "^1.1.0",
+    "ember-template-tag": "^2.3.8",
     "ensure-posix-path": "^1.1.1",
     "execa": "^5.1.1",
     "exit": "^0.1.2",