|
@@ -11,7 +11,6 @@ module.exports = {
|
|
|
'admin/index': './js/admin/index.js',
|
|
|
},
|
|
|
watch: {
|
|
|
-<<<<<<< HEAD
|
|
|
'user/index': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
|
|
|
'webpack/hot/only-dev-server',
|
|
|
'./js/user/index.js'
|
|
@@ -29,42 +28,15 @@ module.exports = {
|
|
|
'./js/user/account/index.js'
|
|
|
],
|
|
|
'user/account/evaluateInfo': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
|
|
|
-=======
|
|
|
- 'user/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
|
|
|
- 'webpack/hot/only-dev-server',
|
|
|
- './js/user/index.js'
|
|
|
- ],
|
|
|
- 'user/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
|
|
|
- 'webpack/hot/only-dev-server',
|
|
|
- './js/user/login.js'
|
|
|
- ],
|
|
|
- 'user/signIn': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
|
|
|
- 'webpack/hot/only-dev-server',
|
|
|
- './js/user/signIn.js'
|
|
|
- ],
|
|
|
- 'user/account/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
|
|
|
- 'webpack/hot/only-dev-server',
|
|
|
- './js/user/account/index.js'
|
|
|
- ],
|
|
|
- 'user/account/evaluateInfo': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
|
|
|
->>>>>>> 0c83e01ff346f69888c4d3ffbf455bb80e6edf65
|
|
|
'webpack/hot/only-dev-server',
|
|
|
'./js/user/account/assessment.js'
|
|
|
],
|
|
|
//admin
|
|
|
-<<<<<<< HEAD
|
|
|
'admin/login': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
|
|
|
'webpack/hot/only-dev-server',
|
|
|
'./js/user/adminLogin.js'
|
|
|
],
|
|
|
'admin/index': ['webpack-dev-server/client?http://192.168.0.190:8088', // WebpackDevServer host and port
|
|
|
-=======
|
|
|
- 'admin/login': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
|
|
|
- 'webpack/hot/only-dev-server',
|
|
|
- './js/user/adminLogin.js'
|
|
|
- ],
|
|
|
- 'admin/index': ['webpack-dev-server/client?http://192.168.0.188:8088', // WebpackDevServer host and port
|
|
|
->>>>>>> 0c83e01ff346f69888c4d3ffbf455bb80e6edf65
|
|
|
'webpack/hot/only-dev-server',
|
|
|
'./js/admin/index.js'
|
|
|
]
|