Prevent generation of .js.js or .hbs.hbs files with ember-cli (#17972)

Prevent generation of .js.js or .hbs.hbs files with ember-cli
emberjs · May 3, 2019 · 9975397 · 9975397
2 parents 847877e + 69452fa
commit 9975397
Show file tree

Hide file tree

Showing 16 changed files with 1,527 additions and 6 deletions.
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
@@ -72,7 +72,9 @@ module.exports = useEditionDetector({
   },
 
   normalizeEntityName: function(entityName) {
-    return normalizeEntityName(entityName);
+    return normalizeEntityName(
+      entityName.replace(/\.js$/, '') //Prevent generation of ".js.js" files
+    );
   },
 
   locals: function(options) {

diff --git a/blueprints/controller/index.js b/blueprints/controller/index.js
@@ -27,4 +27,7 @@ module.exports = useEditionDetector({
       };
     }
   },
+  normalizeEntityName: function(entityName) {
+    return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
+  },
 });
diff --git a/blueprints/helper/index.js b/blueprints/helper/index.js
@@ -49,6 +49,8 @@ module.exports = {
   },
 
   normalizeEntityName: function(entityName) {
-    return normalizeEntityName(entityName);
+    return normalizeEntityName(
+      entityName.replace(/\.js$/, '') //Prevent generation of ".js.js" files
+    );
   },
 };
diff --git a/blueprints/mixin/index.js b/blueprints/mixin/index.js
@@ -23,4 +23,7 @@ module.exports = {
       };
     }
   },
+  normalizeEntityName: function(entityName) {
+    return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
+  },
 };
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
@@ -140,6 +140,9 @@ module.exports = useEditionDetector({
   afterUninstall: function(options) {
     updateRouter.call(this, 'remove', options);
   },
+  normalizeEntityName: function(entityName) {
+    return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
+  },
 });
 
 function updateRouter(action, options) {

diff --git a/blueprints/service/index.js b/blueprints/service/index.js
@@ -24,4 +24,7 @@ module.exports = useEditionDetector({
       };
     }
   },
+  normalizeEntityName: function(entityName) {
+    return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
+  },
 });
diff --git a/blueprints/template/index.js b/blueprints/template/index.js
@@ -28,4 +28,7 @@ module.exports = {
       };
     }
   },
+  normalizeEntityName: function(entityName) {
+    return entityName.replace(/\.hbs$/, ''); //Prevent generation of ".hbs.hbs" files
+  },
 };
diff --git a/blueprints/util/index.js b/blueprints/util/index.js
@@ -26,4 +26,7 @@ module.exports = {
       };
     }
   },
+  normalizeEntityName: function(entityName) {
+    return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
+  },
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,7 @@ module.exports = useEditionDetector({ @@
           };
         }
       },
+      normalizeEntityName: function(entityName) {
+        return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
+      },
     });