From ab7ffa0d942b0f48413e50010d3be55a3ec12959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= Date: Sun, 31 Jan 2021 00:29:37 +0000 Subject: [PATCH] Replace grunt-replace with EJS --- Gruntfile.js | 20 -------------------- front/src/main.html | 4 ++-- lib/server/controllers/frontController.js | 5 ++++- package.json | 1 - 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d66c14c..a5e0b5b 100644 --- a/Gruntfile.js +++ b/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', diff --git a/front/src/main.html b/front/src/main.html index 1f689d7..49a1530 100644 --- a/front/src/main.html +++ b/front/src/main.html @@ -28,7 +28,7 @@
@@ -59,7 +59,7 @@ \ No newline at end of file diff --git a/lib/server/controllers/frontController.js b/lib/server/controllers/frontController.js index 1a652fb..89dc906 100644 --- a/lib/server/controllers/frontController.js +++ b/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 || {} }); }); diff --git a/package.json b/package.json index e15dea9..ed35943 100644 --- a/package.json +++ b/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",