Issue #1834 - Fix path to templates.js. Use jsDIstPath in grunt config

webcompat · Apr 16, 2018 · 2e32352 · 2e32352
1 parent b8f4507
commit 2e32352
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -7,6 +7,7 @@ module.exports = function(grunt) {
     pkg: grunt.file.readJSON("package.json"),
     tmplPath: "webcompat/templates/",
     jsPath: "webcompat/static/js",
+    jsDistPath: "<%= jsPath %>/dist",
     cssPath: "webcompat/static/css",
     imgPath: "webcompat/static/img",
     banner: "/*! <%= pkg.title %>\n" +

diff --git a/grunt-tasks/concat.js b/grunt-tasks/concat.js
@@ -23,17 +23,17 @@ module.exports = function(grunt) {
         "<%= jsPath %>/lib/flash-message.js",
         "<%= jsPath %>/lib/homepage.js",
         "<%= jsPath %>/lib/bugform.js",
-        "<%= jsPath %>/templates.js"
+        "<%= jsDistPath %>/templates.js"
       ],
-      dest: "<%= jsPath %>/dist/<%= pkg.name %>.js"
+      dest: "<%= jsDistPath %>/<%= pkg.name %>.js"
     },
     diagnose: {
       src: [
         "<%= jsPath %>/lib/models/label-list.js",
         "<%= jsPath %>/lib/models/issue.js",
         "<%= jsPath %>/lib/diagnose.js"
       ],
-      dest: "<%= jsPath %>/dist/diagnose.js"
+      dest: "<%= jsDistPath %>/diagnose.js"
     },
     issues: {
       src: [
@@ -47,7 +47,7 @@ module.exports = function(grunt) {
         "<%= jsPath %>/lib/comments.js",
         "<%= jsPath %>/lib/issues.js"
       ],
-      dest: "<%= jsPath %>/dist/issues.js"
+      dest: "<%= jsDistPath %>/issues.js"
     },
     issueList: {
       src: [
@@ -56,7 +56,7 @@ module.exports = function(grunt) {
         "<%= jsPath %>/lib/mixins/pagination.js",
         "<%= jsPath %>/lib/issue-list.js"
       ],
-      dest: "<%= jsPath %>/dist/issue-list.js"
+      dest: "<%= jsDistPath %>/issue-list.js"
     },
     userActivity: {
       src: [
@@ -65,7 +65,7 @@ module.exports = function(grunt) {
         "<%= jsPath %>/lib/mixins/pagination.js",
         "<%= jsPath %>/lib/user-activity.js"
       ],
-      dest: "<%= jsPath %>/dist/user-activity.js"
+      dest: "<%= jsDistPath %>/user-activity.js"
     }
   });
 };
diff --git a/grunt-tasks/jst.js b/grunt-tasks/jst.js
@@ -23,7 +23,7 @@ module.exports = function(grunt) {
         }
       },
       files: {
-        "<%= jsPath %>/dist/templates.js": ["<%= tmplPath %>/**/*.jst"]
+        "<%= jsDistPath %>/templates.js": ["<%= tmplPath %>/**/*.jst"]
       }
     }
   });

diff --git a/grunt-tasks/uglify.js b/grunt-tasks/uglify.js
@@ -10,31 +10,31 @@ module.exports = function(grunt) {
     },
     dist: {
       src: "<%= concat.dist.dest %>",
-      dest: "<%= jsPath %>/dist/<%= pkg.name %>.min.js"
+      dest: "<%= jsDistPath %>/<%= pkg.name %>.min.js"
     },
     ga: {
       src: "<%= jsPath %>/lib/ga.js",
       dest: "<%= jsPath %>/build/ga.js"
     },
     issues: {
       src: "<%= concat.issues.dest %>",
-      dest: "<%= jsPath %>/dist/issues.min.js"
+      dest: "<%= jsDistPath %>/issues.min.js"
     },
     issueList: {
       src: "<%= concat.issueList.dest %>",
-      dest: "<%= jsPath %>/dist/issue-list.min.js"
+      dest: "<%= jsDistPath %>/issue-list.min.js"
     },
     userActivity: {
       src: "<%= concat.userActivity.dest %>",
-      dest: "<%= jsPath %>/dist/user-activity.min.js"
+      dest: "<%= jsDistPath %>/user-activity.min.js"
     },
     diagnose: {
       src: "<%= concat.diagnose.dest %>",
-      dest: "<%= jsPath %>/dist/diagnose.min.js"
+      dest: "<%= jsDistPath %>/diagnose.min.js"
     },
     contributors: {
       src: "<%= jsPath %>/lib/contributors.js",
-      dest: "<%= jsPath %>/dist/contributors.min.js"
+      dest: "<%= jsDistPath %>/contributors.min.js"
     }
   });
 };