cordova-plugin-webpack
Advanced tools
Comparing version 0.1.1 to 0.1.2
{ | ||
"name": "cordova-plugin-webpack", | ||
"version": "0.1.1", | ||
"version": "0.1.2", | ||
"description": "Cordova Webpack Plugin", | ||
@@ -5,0 +5,0 @@ "cordova": { |
@@ -72,3 +72,3 @@ "use strict"; | ||
return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () { | ||
var platforms, argv, webpackConfigPath, customWebpackConfig, webpackConfig, platformWwwPaths, customDevServerConfig, devServerConfig, port, compiler, server, err_1; | ||
var platforms, argv, defaultHost, defaultPort, port_1, webpackConfigPath, customWebpackConfig, webpackConfig, platformWwwPaths_1, customDevServerConfig_1, devServerConfig, compiler, server, err_1; | ||
return __generator(this, function (_a) { | ||
@@ -85,2 +85,14 @@ switch (_a.label) { | ||
} | ||
_a.label = 1; | ||
case 1: | ||
_a.trys.push([1, 3, , 4]); | ||
defaultHost = '0.0.0.0'; | ||
defaultPort = 8080; | ||
return [4, WebpackDevServerUtils_1.choosePort(defaultHost, defaultPort)]; | ||
case 2: | ||
port_1 = _a.sent(); | ||
if (!port_1) { | ||
resolve(); | ||
return [2]; | ||
} | ||
platforms.forEach(function (platform) { | ||
@@ -91,3 +103,3 @@ glob | ||
var configXml = new CordovaConfigParser_1.default(configXmlPath); | ||
configXml.setContent("http://" + (platform === 'android' ? '10.0.2.2' : 'localhost') + ":8080"); | ||
configXml.setContent("http://" + (platform === 'android' ? '10.0.2.2' : 'localhost') + ":" + port_1); | ||
if (platform === 'ios') | ||
@@ -108,28 +120,18 @@ configXml.setElement('allow-navigation', { href: '*' }); | ||
]) }); | ||
platformWwwPaths = { | ||
platformWwwPaths_1 = { | ||
android: path.join(ctx.opts.projectRoot, 'platforms/android/platform_www'), | ||
ios: path.join(ctx.opts.projectRoot, 'platforms/ios/platform_www'), | ||
}; | ||
customDevServerConfig = webpackConfig.devServer || {}; | ||
devServerConfig = __assign({ contentBase: path.join(ctx.opts.projectRoot, 'www'), historyApiFallback: true, host: '0.0.0.0', port: 8080 }, customDevServerConfig, { hot: true, before: function (app, server) { | ||
if (customDevServerConfig.before) | ||
customDevServerConfig.before(app, server); | ||
Object.keys(platformWwwPaths).forEach(function (platform) { | ||
app.use("/" + platform, express.static(platformWwwPaths[platform])); | ||
customDevServerConfig_1 = webpackConfig.devServer || {}; | ||
devServerConfig = __assign({ contentBase: path.join(ctx.opts.projectRoot, 'www'), historyApiFallback: true, host: defaultHost, port: port_1 }, customDevServerConfig_1, { hot: true, before: function (app, server) { | ||
if (customDevServerConfig_1.before) | ||
customDevServerConfig_1.before(app, server); | ||
Object.keys(platformWwwPaths_1).forEach(function (platform) { | ||
app.use("/" + platform, express.static(platformWwwPaths_1[platform])); | ||
}); | ||
} }); | ||
webpack_dev_server_1.default.addDevServerEntrypoints(webpackConfig, devServerConfig); | ||
_a.label = 1; | ||
case 1: | ||
_a.trys.push([1, 3, , 4]); | ||
return [4, WebpackDevServerUtils_1.choosePort('0.0.0.0', 8080)]; | ||
case 2: | ||
port = _a.sent(); | ||
if (!port) { | ||
resolve(); | ||
return [2]; | ||
} | ||
compiler = webpack_1.default(webpackConfig); | ||
server = new webpack_dev_server_1.default(compiler, devServerConfig); | ||
server.listen(port, '0.0.0.0', function (err) { | ||
server.listen(devServerConfig.port || defaultPort, devServerConfig.host || defaultHost, function (err) { | ||
if (err && err.message) { | ||
@@ -136,0 +138,0 @@ console.log(err.message); |
Sorry, the diff of this file is not supported yet
80606
664