Merge branch 'main' into ember-data-v5-deprecations

jaredgalanis · web-flow · commit 5faee08fa9f9 · 2023-09-21T15:36:28.000-04:00
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
@@ -69,6 +69,12 @@
             @models={{array 'ember-cli' 'v4.x'}}
           >v4.x</LinkTo>
         </li>
+        <li class='list-unstyled' data-test-ember-cli-5-link>
+          <LinkTo
+            @route='show'
+            @models={{array 'ember-cli' 'v5.x'}}
+          >v5.x</LinkTo>
+        </li>
       </ul>
     </li>
     <li class='item list-unstyled'>
diff --git a/content/ember-cli/v5/ember-cli-output-paths-build-option.md b/content/ember-cli/v5/ember-cli-output-paths-build-option.md
@@ -0,0 +1,53 @@
+---
+title: outputPaths build option
+until: 6.0.0
+since: 5.3.0
+displayId: ember-cli.outputPaths-build-option
+---
+
+
+Using the `outputPaths` build option is deprecated, as output paths will no longer be predetermined under Embroider.
+
+To resolve the deprecation, please remove the `outputPaths` build option from your `ember-cli-build.js` file:
+
+```diff
+module.exports = function (defaults) {
+  const app = new EmberApp(defaults, {
+-   outputPaths: {
+-     app: {
+-       js: `/assets/foo.js`,
+-     },
+-   },
+  };
+};
+```
+
+And update your `app/index.html` file accordingly:
+
+```diff
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>MyAppName</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{content-for "head"}}
+
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/my-app-name.css">
+
+    {{content-for "head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
+
+    <script src="{{rootURL}}assets/vendor.js"></script>
+-   <script src="{{rootURL}}assets/foo.js"></script>
++   <script src="{{rootURL}}assets/my-app-name.js"></script>
+
+    {{content-for "body-footer"}}
+  </body>
+</html>
+```
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -36,6 +36,7 @@ module.exports = function (defaults) {
         '/ember-data/v5.x',
         '/ember-cli/v2.x',
         '/ember-cli/v4.x',
+        '/ember-cli/v5.x',
         ...getDeprecationFilenames(),
       ],
     },
diff --git a/lib/content-docs-generator/index.js b/lib/content-docs-generator/index.js
@@ -17,6 +17,7 @@ const contentFolders = [
   'ember-data/v5',
   'ember-cli/v2',
   'ember-cli/v4',
+  'ember-cli/v5',
 ];
 
 const jsonTrees = contentFolders.map(
diff --git a/tests/acceptance/visual-regression-test.js b/tests/acceptance/visual-regression-test.js
@@ -90,6 +90,16 @@ module('Acceptance | visual regression', function (hooks) {
 
     await percySnapshot('ember-cli-4.x');
 
+    // v5.x Ember CLI
+    await click('[data-test-main-deprecations-link]');
+    await click('[data-test-ember-cli-5-link] > a');
+
+    assert
+      .dom('[data-test-deprecations-added-in]')
+      .hasText('Deprecations Added in Ember CLI 5.x');
+
+    await percySnapshot('ember-cli-5.x');
+
     // v5.x Ember
     await click('[data-test-main-deprecations-link]');
     await click('[data-test-ember-5-link] > a');
