Merge pull request #19860 from mixonic/mixonic/update-blueprints

blueprints/route/files/__root__/__path__/__name__.js

@@ -1,4 +1,11 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
+export default Route.extend({<% 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.
+     */
+    return params;
+  },<%}%>
 });

blueprints/route/index.js

@@ -75,6 +75,7 @@ module.exports = useEditionDetector({
     let moduleName = options.entity.name;
     let rawRouteName = moduleName.split('/').pop();
     let emberPageTitleExists = 'ember-page-title' in options.project.dependencies();
+    let hasDynamicSegment = options.path && options.path.includes(':');
 
     if (options.resetNamespace) {
       moduleName = rawRouteName;
@@ -84,6 +85,7 @@ module.exports = useEditionDetector({
       moduleName: stringUtil.dasherize(moduleName),
       routeName: stringUtil.classify(rawRouteName),
       addTitle: emberPageTitleExists,
+      hasDynamicSegment,
     };
   },
 

blueprints/route/native-files/__root__/__path__/__name__.js

@@ -1,4 +1,11 @@
 import Route from '@ember/routing/route';
 
-export default class <%= classifiedModuleName %>Route extends 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.
+     */
+    return params;
+  }<%}%>
 }

node-tests/blueprints/route-test.js

@@ -81,7 +81,7 @@ describe('Blueprint: route', function () {
 
     it('route foo --path=:foo_id/show', function () {
       return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
+        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route-with-dynamic-segment.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
 
@@ -560,7 +560,9 @@ describe('Blueprint: route', function () {
 
     it('route foo --path=:foo_id/show', function () {
       return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('app/routes/foo.js')).to.equal(
+          fixture('route/native-route-with-dynamic-segment.js')
+        );
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
 

node-tests/fixtures/route/native-route-with-dynamic-segment.js

@@ -0,0 +1,11 @@
+import Route from '@ember/routing/route';
+
+export default class FooRoute extends Route {
+  model(params) {
+    /**
+     * This route was generated with a dynamic segment. Implement data loading
+     * based on that dynamic segment here in the model hook.
+     */
+    return params;
+  }
+}

node-tests/fixtures/route/route-with-dynamic-segment.js

@@ -0,0 +1,11 @@
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+  model(params) {
+    /**
+     * This route was generated with a dynamic segment. Implement data loading
+     * based on that dynamic segment here in the model hook.
+     */
+    return params;
+  },
+});