Merge pull request #6 from VCityTeam/dev

folder and port can be pass as arguments + travis test
VCityTeam · Mar 22, 2021 · 048eb8a · 048eb8a
2 parents 7c43308 + bc0070b
commit 048eb8a
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,25 @@
+# @format
+
+os: linux
+dist: focal
+language: node_js
+node_js:
+  - 14
+
+jobs:
+  include:
+    - stage: DemoFull
+      script:
+        - cd DemoFull && npm install && npm build
+    - stage: Imuv
+      script:
+        - cd Imuv && npm install && npm build
+    - stage: ImuvEditor
+      script:
+        - cd ImuvEditor && npm install && npm build
+    - stage: ImuvServer
+      script:
+        - cd ImuvServer && npm install && npm build
+    - stage: SimpleServer
+      script:
+        - cd SimpleServer && npm install && npm build
diff --git a/DemoFull/package.json b/DemoFull/package.json
@@ -11,11 +11,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "three": "^0.125.2",
     "@egjs/hammerjs": "^2.0.17",
     "jquery": "^1.0.0",
     "keycharm": "^0.4.0",
     "proj4": "^2.7.0",
-    "three": "0.125.2",
     "timsort": "^0.3.0",
     "ud-viz": "^2.31.0",
     "uuid": "^8.3.2",

diff --git a/DemoFull/webpack.config.js b/DemoFull/webpack.config.js
@@ -5,12 +5,9 @@ const debugBuild = mode === 'development';
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 let outputPath;
-let devTool;
 if (debugBuild) {
-  devTool = 'source-map';
   outputPath = path.resolve(__dirname, 'dist/debug');
 } else {
-  devTool = 'none';
   outputPath = path.resolve(__dirname, 'dist/release');
 }
 
@@ -37,10 +34,18 @@ module.exports = (env) => {
     },
   ];
 
-  return {
+  const plugins = [];
+  if (debugBuild)
+    plugins.push(
+      new HtmlWebpackPlugin({
+        title: 'Demo debug',
+        filename: 'index.html',
+      })
+    );
+
+  const config = {
     mode,
     entry: [path.resolve(__dirname, './src/bootstrap.js')],
-    devtool: devTool,
     output: {
       path: outputPath,
       filename: 'app_name.js',
@@ -55,11 +60,10 @@ module.exports = (env) => {
       port: 8000,
       hot: true,
     },
-    plugins: [
-      new HtmlWebpackPlugin({
-        title: 'Demo debug',
-        filename: 'index.html',
-      }),
-    ],
+    plugins: plugins,
   };
+
+  if (debugBuild) config.devtool = 'source-map';
+
+  return config;
 };
diff --git a/ImuvEditor/webpack.config.js b/ImuvEditor/webpack.config.js
@@ -37,6 +37,15 @@ module.exports = (env) => {
     },
   ];
 
+  const plugins = [];
+  if (debugBuild)
+    plugins.push(
+      new HtmlWebpackPlugin({
+        title: 'Demo debug',
+        filename: 'index.html',
+      })
+    );
+
   return {
     mode,
     entry: [path.resolve(__dirname, './src/bootstrap.js')],
@@ -55,11 +64,6 @@ module.exports = (env) => {
       port: 8000,
       hot: true,
     },
-    plugins: [
-      new HtmlWebpackPlugin({
-        title: 'Demo debug',
-        filename: 'index.html',
-      }),
-    ],
+    plugins: plugins,
   };
 };
diff --git a/SimpleServer/assets/config/config.json b/SimpleServer/assets/config/config.json
diff --git a/SimpleServer/bin/debug.js b/SimpleServer/bin/debug.js
@@ -13,7 +13,7 @@ exec('npm run build-debug')
   .then(printExec)
   .then(function () {
     console.log('Launch bundle\n');
-    var child = spawn('node', ['./index.js']);
+    var child = spawn('node', ['./index.js', '../DemoFull', '8000']);
     child.stdout.on('data', (data) => {
       console.log(`child stdout:\n${data}`);
     });

diff --git a/SimpleServer/index.js b/SimpleServer/index.js
@@ -2,14 +2,16 @@
 
 try {
   const bundle = require('./dist/server.js');
-  const config = require('./assets/config/config.json');
 
   //instanciate server
   const server = new bundle.SimpleServer();
 
   //start server
-  server.start(config);
-
+  //node command should be like 'node index.js ../DemoFull 8000'
+  const folder = process.argv[2];
+  const port = process.argv[3];
+  server.start({ folder: folder, port: port });
+
 } catch (e) {
   console.error(e);
 }
diff --git a/SimpleServer/src/server.js b/SimpleServer/src/server.js
@@ -10,10 +10,9 @@ export class SimpleServer {
     app.use(express.static(config.folder)); //what folder is served
 
     //http server
-    const port = config.port;
-    app.listen(port, function (err) {
+    app.listen(config.port, function (err) {
       if (err) console.log('Error in server setup');
-      console.log('Server listening on Port', port, ' folder ' + config.folder);
+      console.log('Server listening on Port', config.port, ' folder ' + config.folder);
     });
   }
 }