Merge d861cdf into dbc469a

ember-cli · Oct 13, 2019 · bcd80e8 · bcd80e8
2 parents dbc469a + d861cdf
commit bcd80e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/blueprints/app/files/app/index.html b/blueprints/app/files/app/index.html
@@ -10,15 +10,15 @@
     {{content-for "head"}}
 
     <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/<%= name %>.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/{{asset-name}}.css">
 
     {{content-for "head-footer"}}
   </head>
   <body>
     {{content-for "body"}}
 
     <script src="{{rootURL}}assets/vendor.js"></script>
-    <script src="{{rootURL}}assets/<%= name %>.js"></script>
+    <script src="{{rootURL}}assets/{{asset-name}}.js"></script>
 
     {{content-for "body-footer"}}
   </body>

diff --git a/lib/utilities/ember-app-utils.js b/lib/utilities/ember-app-utils.js
@@ -190,6 +190,12 @@ function configReplacePatterns(options) {
         return config.modulePrefix;
       },
     },
+    {
+      match: /{{\s?asset-name\s?}}/g,
+      replacement(config) {
+        return config.APP.name;
+      },
+    },
   ];
 }