From 984ecae200f94a0db20048decf46b443f4d6df23 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Fri, 12 Jan 2018 12:34:04 +0000 Subject: [PATCH] Rename directory to es to align with coffee dir --- services/web/public/{frontend => es}/rich-text.js | 0 services/web/webpack.config.dev.js | 2 +- services/web/webpack.config.js | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) rename services/web/public/{frontend => es}/rich-text.js (100%) diff --git a/services/web/public/frontend/rich-text.js b/services/web/public/es/rich-text.js similarity index 100% rename from services/web/public/frontend/rich-text.js rename to services/web/public/es/rich-text.js diff --git a/services/web/webpack.config.dev.js b/services/web/webpack.config.dev.js index e9da2b3767..50e1ca0a07 100644 --- a/services/web/webpack.config.dev.js +++ b/services/web/webpack.config.dev.js @@ -7,7 +7,7 @@ module.exports = merge(base, { devtool: 'cheap-module-eval-source-map', output: { - publicPath: '/public/js/frontend/' + publicPath: '/public/js/es/' }, devServer: { diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js index 46602c702d..78e21f4982 100644 --- a/services/web/webpack.config.js +++ b/services/web/webpack.config.js @@ -1,17 +1,17 @@ const path = require('path') module.exports = { - // Defines the "entry point" for the application - i.e. the file which + // Defines the "entry point(s)" for the application - i.e. the file which // bootstraps the application entry: { - 'rich-text': './public/frontend/rich-text.js' + 'rich-text': './public/es/rich-text.js' }, // Define where and how the bundle will be output to disk // Note: webpack-dev-server does not write the bundle to disk, instead it is // kept in memory for speed output: { - path: path.join(__dirname, '/public/js/frontend'), + path: path.join(__dirname, '/public/js/es'), filename: '[name].js', @@ -24,8 +24,8 @@ module.exports = { // TODO?? // Defines the external modules which will be stripped out when bundling for - // the rails app. These modules are already loaded in the rails app - // environment, so we strip them out to prevent conflicts. + // the main app. These modules are already loaded in the main app environment, + // so we strip them out to prevent conflicts. // externals: {}, // Define how file types are handled by webpack