From 6e60006d2e22665b491d176ca9e91b74326bfabc Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 19 Jun 2017 19:51:24 +0300 Subject: [sdc] update to the current code base and support http Change-Id: I2fb35494b40126a8395b1e309a180db4127754b7 Signed-off-by: Michael Lando --- catalog-ui/webpack.config.js | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'catalog-ui/webpack.config.js') diff --git a/catalog-ui/webpack.config.js b/catalog-ui/webpack.config.js index 4f03b7c87c..71fc3ab9f7 100644 --- a/catalog-ui/webpack.config.js +++ b/catalog-ui/webpack.config.js @@ -5,12 +5,14 @@ const merge = require('webpack-merge'); const webpack = require('webpack'); const ServerConfig = require('./webpack.server'); const webpackCommonConfig = require('./webpack.common'); -const { BaseHrefWebpackPlugin} = require('@angular/cli/plugins/webpack'); +const {BaseHrefWebpackPlugin} = require('@angular/cli/plugins/webpack'); const CopyWebpackPlugin = require('copy-webpack-plugin'); // Print server configuration //process.stdout.write('webpack.server: ' + JSON.stringify(ServerConfig) + '\n'); //process.stdout.write('webpack.common: ' + JSON.stringify(webpackCommonConfig) + '\n'); +var currentTime = new Date().getTime(); + const params = { // entryPoints: [ // '/scripts/inline', @@ -23,32 +25,37 @@ const params = { // ] }; -module.exports = function(env) { +module.exports = function (env) { const webpackDevConfig = { devtool: "source-map", devServer: ServerConfig(env), module: { rules: [ - { test: /\.(eot|svg)$/, loader: "file-loader?name=scripts/fonts/[name].[hash:20].[ext]" }, - { test: /\.(jpg|png|gif|otf|ttf|woff|woff2|cur|ani)$/, loader: "url-loader?name=scripts/images/[name].[hash:20].[ext]&limit=10000" } + {test: /\.(eot|svg)$/, loader: "file-loader?name=scripts/fonts/[name].[hash:20].[ext]"}, + { + test: /\.(jpg|png|gif|otf|ttf|woff|woff2|cur|ani)$/, + loader: "url-loader?name=scripts/images/[name].[hash:20].[ext]&limit=10000" + } ] }, output: { path: path.join(process.cwd(), "dist"), - filename: "[name].bundle.js", + filename: "[name]." + currentTime + ".bundle.js", chunkFilename: "[id].chunk.js" //publicPath: "/" }, plugins: [ + // Replace /sdc1 inside index.html with '' (because /sdc1 is used only in production). new CopyWebpackPlugin([ - { - from: './src/index.html', transform: function(content, path) { - content = (content+'').replace(/\/sdc1/g,''); - return content; - } - } + { + from: './src/index.html', transform: function (content, path) { + content = (content + '').replace(/\/sdc1/g, ''); + content = (content + '').replace(/\.bundle/g, '.' + currentTime + '.bundle'); + return content; + } + } ]), new webpack.DefinePlugin({ __DEBUG__: JSON.stringify(true), @@ -61,4 +68,4 @@ module.exports = function(env) { }; return merge(webpackDevConfig, webpackCommonConfig(params)); -} \ No newline at end of file +} -- cgit 1.2.3-korg