Forráskód Böngészése

Replace grunt-replace with EJS

Gaël Métais 4 éve
szülő
commit
ab7ffa0d94
4 módosított fájl, 6 hozzáadás és 24 törlés
  1. 0 20
      Gruntfile.js
  2. 2 2
      front/src/main.html
  3. 4 1
      lib/server/controllers/frontController.js
  4. 0 1
      package.json

+ 0 - 20
Gruntfile.js

@@ -24,25 +24,6 @@ module.exports = function(grunt) {
                 ]
             }
         },
-        replace: {
-            dist: {
-                options: {
-                    patterns: [
-                        {
-                            match: 'googleAnalyticsId',
-                            replacement: '<%= settings.googleAnalyticsId %>'
-                        },
-                        {
-                            match: 'version',
-                            replacement: 'v<%= pkg.version %>'
-                        }
-                    ]
-                },
-                files: [
-                    {expand: true, flatten: true, src: ['front/src/main.html'], dest: 'front/build/'}
-                ]
-            }
-        },
         jshint: {
             all: [
                 '*.js',
@@ -219,7 +200,6 @@ module.exports = function(grunt) {
         'concat',
         'uglify',
         'cssmin',
-        'replace',
         'htmlmin:views',
         'inline_angular_templates',
         'filerev',

+ 2 - 2
front/src/main.html

@@ -28,7 +28,7 @@
     <div id="header"><h1>Yellow Lab <svg width="32" height="32" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" fill="#ffa319"><path d="M478 402L320 139V32h16c9 0 16-7 16-16s-7-16-16-16H176c-9 0-16 7-16 16s7 16 16 16h16v107L34 402c-36 61-8 110 62 110h320c70 0 98-49 62-110zm-357-82l103-172V32h64v116l103 172H121z"/></svg> Tools</h1></div>
     <div id="body" ng-view autoscroll="true"></div>
     <div class="footer">
-        <span class="version">@@version</span>
+        <span class="version"><%= version %></span>
         <br><a href="<%= baseUrl %>about">More about Yellow Lab Tools</a><br>
         <div class="github"><iframe id="ghbtn" frameborder="0" scrolling="0" width="160px" height="30px"></iframe></div>
     </div>
@@ -59,7 +59,7 @@
     <!-- endbuild -->
 
     <script>
-        if('@@googleAnalyticsId'.indexOf('UA-')===0){(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');ga('create','@@googleAnalyticsId','auto');}
+        if('<%= googleAnalyticsId %>'.indexOf('UA-')===0){(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');ga('create','<%= googleAnalyticsId %>','auto');}
     </script>
 </body>
 </html>

+ 4 - 1
lib/server/controllers/frontController.js

@@ -1,7 +1,8 @@
 var path        = require('path');
 var express     = require('express');
 
-var serverSettings = (process.env.IS_TEST) ? require('../../../test/fixtures/settings.json') : require('../../../server_config/settings.json');
+var serverSettings  = (process.env.IS_TEST) ? require('../../../test/fixtures/settings.json') : require('../../../server_config/settings.json');
+var packageJson     = require('../../../package.json');
 
 var FrontController = function(app) {
     'use strict';
@@ -16,7 +17,9 @@ var FrontController = function(app) {
         app.get(route, function(req, res) {
             res.setHeader('Cache-Control', 'public, max-age=20');
             res.render(path.join(__dirname, assetsPath, 'main.html'), {
+                version: 'v' + packageJson.version,
                 baseUrl: app.locals.baseUrl || '/',
+                googleAnalyticsId: serverSettings.googleAnalyticsId,
                 sponsoring: serverSettings.sponsoring || {}
             });
         });

+ 0 - 1
package.json

@@ -89,7 +89,6 @@
     "grunt-inline-angular-templates": "~0.1.5",
     "grunt-mocha-test": "~0.13.3",
     "grunt-parallel": "~0.5.1",
-    "grunt-replace": "~1.0.1",
     "grunt-usemin": "~3.1.1",
     "matchdep": "~2.0.0",
     "mocha": "~5.2.0",