Merge pull request #133 from monaca/fix_monaca_preview_to_write_files…

…_to_www monaca preview to write files to www
monaca · Jul 6, 2018 · a1d404e · a1d404e
2 parents cc85c47 + 99cce46
commit a1d404e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 CHANGELOG
 ====
 
+v2.7.7
+----
+* Appended `webpack-dev-server/client` to webpack configuration only if `inline` and `hot` are set to true
+* Appended `webpack-dev-server/client` to `entry.watch` if supplied
+* Modified `monaca preview` to write files to `www` directory in `monaca-lib@2.7.7` so that the `monaca debugger` will see the changes immediately without running `monaca transpile`
+
 v2.7.6
 ----
 * Added `skipTranspile` option to `monaca upload` to skip transpiling if supplied

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaca",
-  "version": "2.7.6",
+  "version": "2.7.7",
   "description": "Monaca Command Line Tool",
   "bin": {
     "monaca": "bin/monaca"
@@ -29,17 +29,17 @@
   "homepage": "https://monaca.io",
   "preferGlobal": true,
   "dependencies": {
-    "hoek": "^5.0.3",
     "browser-sync": "^2.23.6",
     "colors": "^0.6.2",
     "compare-versions": "3.0.1",
     "cordova": "7.1.0",
     "extend": "^2.0.0",
     "global-npm": "^0.3.0",
+    "hoek": "^5.0.3",
     "ip": "^1.1.5",
     "live-server": "1.2.0",
     "monaca-inquirer": "^1.0.4",
-    "monaca-lib": "2.7.6",
+    "monaca-lib": "^2.7.7",
     "open": "0.0.5",
     "optimist": "^0.6.1",
     "portfinder": "^1.0.7",

diff --git a/src/serve.js b/src/serve.js
@@ -141,27 +141,38 @@
                 };
               };
 
-              // Webpack Dev Server
-              var webpack = require(path.join(monaca.userCordova, 'node_modules', 'webpack'));
-              var webpackConfig = require(monaca.getWebpackConfigFile(projectDir, 'dev'));
+              try {
+                // Webpack Dev Server
+                var webpack = require(path.join(monaca.userCordova, 'node_modules', 'webpack'));
+                var webpackConfig = require(monaca.getWebpackConfigFile(projectDir, 'dev'));
 
-              if (webpackConfig.devServer.inline) {
-                var packUrl = taskName === 'demo' ? "http://localhost:" + nextPort + "/": "http://localhost:" + port + "/";
+                if (webpackConfig.devServer.inline) {
+                  var packUrl = taskName === 'demo' ? "http://localhost:" + nextPort + "/": "http://localhost:" + port + "/";
 
-                if (terminal.isOnMonaca) {
-                  packUrl = "https://0.0.0.0/";
-                  webpackConfig.devServer.disableHostCheck = true;
-                }
+                  if (terminal.isOnMonaca) {
+                    packUrl = "https://0.0.0.0/";
+                    webpackConfig.devServer.disableHostCheck = true;
+                  }
+
+                  // add webpack-dev-server client socket if inline and hot are set to true
+                  if (webpackConfig.devServer.inline && webpackConfig.devServer.hot) {
+                    if (webpackConfig.entry.watch && webpackConfig.entry.watch instanceof Array) {
+                      webpackConfig.entry.watch.unshift("webpack-dev-server/client?" + packUrl);
+                    } else if (webpackConfig.entry.app && webpackConfig.entry.app instanceof Array) {
+                      webpackConfig.entry.app.unshift("webpack-dev-server/client?" + packUrl);
+                    } else if (webpackConfig.entry && webpackConfig.entry instanceof Array) {
+                      webpackConfig.entry.unshift("webpack-dev-server/client?" + packUrl);
+                    }                  
+                  }
 
-                if (webpackConfig.entry.app && webpackConfig.entry.app instanceof Array) {
-                  webpackConfig.entry.app.unshift("webpack-dev-server/client?" + packUrl);
-                } else if (webpackConfig.entry && webpackConfig.entry instanceof Array) {
-                  webpackConfig.entry.unshift("webpack-dev-server/client?" + packUrl);
                 }
-              }
 
-              var WebpackDevServer = require(path.join(monaca.userCordova, 'node_modules', 'webpack-dev-server'));
-              var server = new WebpackDevServer(webpack(webpackConfig), webpackConfig.devServer);
+                var WebpackDevServer = require(path.join(monaca.userCordova, 'node_modules', 'webpack-dev-server'));
+                var server = new WebpackDevServer(webpack(webpackConfig), webpackConfig.devServer);
+
+              } catch (e) {
+                console.log('webpack error', e);
+              }
 
               // Different port number
               if (taskName === 'demo') {