diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2017-03-14 00:18:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2017-03-14 00:18:43 +0000 |
| commit | 8fe425479e47482502913d4bc83b4168cb538138 (patch) | |
| tree | b8f3e3d0a7d33b1af477d557f6f86ce4077f9063 /alarm-analysis/src/main/webapp/config | |
| parent | 81ee34965c79955cbe26d251603820bcd0937f23 (diff) | |
| parent | baa263fde716cb009df080dcd0c6a5dc4070e266 (diff) | |
Merge "Modify rule manager common component"
Diffstat (limited to 'alarm-analysis/src/main/webapp/config')
| -rw-r--r-- | alarm-analysis/src/main/webapp/config/webpack.common.js | 31 | ||||
| -rw-r--r-- | alarm-analysis/src/main/webapp/config/webpack.dev.js | 2 |
2 files changed, 14 insertions, 19 deletions
diff --git a/alarm-analysis/src/main/webapp/config/webpack.common.js b/alarm-analysis/src/main/webapp/config/webpack.common.js index bedcb7cc..34ce92df 100644 --- a/alarm-analysis/src/main/webapp/config/webpack.common.js +++ b/alarm-analysis/src/main/webapp/config/webpack.common.js @@ -20,15 +20,14 @@ var helpers = require('./helpers'); module.exports = {
entry: {
- 'polyfills': './src/polyfills.ts',
- 'vendor': './src/vendor.ts',
- 'app': './src/main.ts'
+ 'polyfills': './alarm/polyfills.ts',
+ 'vendor': './alarm/vendor.ts',
+ 'app': './alarm/main.ts'
},
resolve: {
- extensions: ['', '.js', '.ts']
+ extensions: ['', '.js', '.ts']
},
- require:"../public/common/js/popModal.js",
module: {
loaders: [
@@ -38,37 +37,32 @@ module.exports = { },
- {
+ {
test: /\.html$/,
loader: 'html'
},
{
test: /\.(png|jpe?g|gif|ico|svg)$/,
- include: [helpers.root('public', 'images'),helpers.root('public', 'component/thirdparty/uniform/images'),
- helpers.root('public', 'framework/img'),
- helpers.root('public', 'component/thirdparty/zTree/css/zTreeStyle/img'),
- helpers.root('public', 'component/thirdparty/icheck/skins/line'),
- helpers.root('public', 'component/thirdparty/icheck/skins/square'),
- helpers.root('public', 'component/'),
+ include: [helpers.root('public', 'thirdparty'),helpers.root('public', 'framework'),
+ helpers.root('public', 'thirdparty/images'),helpers.root('public', 'framework/browser/thirdparty/images')
],
loader: 'file?name=public/images/[name].[hash].[ext]'
},
{
test: /\.(svg|woff|woff2|ttf|eot)$/,
- include: [helpers.root('public', 'fonts'),helpers.root('public', 'component/css/ZteIctIcons/fonts'),
- helpers.root('public', 'component/thirdparty/bootstrap/fonts')
+ include: [helpers.root('public', 'thirdparty')
],
loader: 'file?name=public/fonts/[name].[hash].[ext]'
},
- {
+ {
test: /\.css$/,
- exclude: [helpers.root('src', 'app'),helpers.root('public', 'component/thirdparty/icheck/skins/line')
+ exclude: [helpers.root('alarm', 'app'),helpers.root('public', 'component/thirdparty/icheck/skins/line')
],
loader: ExtractTextPlugin.extract('style', 'css?sourceMap')
},
{
test: /\.css$/,
- include: helpers.root('src', 'app'),
+ include: helpers.root('alarm', 'app'),
loader: 'raw'
}
]
@@ -80,7 +74,8 @@ module.exports = { }),
new HtmlWebpackPlugin({
- template: 'src/index.html',
+ template: 'alarm/index.html'
})
+
]
};
diff --git a/alarm-analysis/src/main/webapp/config/webpack.dev.js b/alarm-analysis/src/main/webapp/config/webpack.dev.js index ec32a22d..235a3acd 100644 --- a/alarm-analysis/src/main/webapp/config/webpack.dev.js +++ b/alarm-analysis/src/main/webapp/config/webpack.dev.js @@ -32,7 +32,7 @@ module.exports = webpackMerge(commonConfig, { devServer: {
port: 9527,
- host: '10.74.24.33',
+ host: '10.74.24.30',
historyApiFallback: true,
watchOptions: {
aggregateTimeout: 300,
|