Merge pull request #188 from davidmtech/master

Upgrade to latest webpack

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Melown Technologies SE
+Copyright (c) 2020 Melown Technologies SE
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

package.json

@@ -1,11 +1,11 @@
 {
   "name": "vts-browser-js",
-  "version": "2.23.2",
+  "version": "2.23.3",
   "description": "JavaScript WebGL 3D maps rendering engine",
   "main": "src/browser/index.js",
   "scripts": {
     "test": "echo 'There are no tests implemented yet'",
-    "install": "npm-git install",
+    "install": "",
     "clean": "node_modules/.bin/rimraf build",
     "dev": "WEBPACK_ENV=dev node_modules/.bin/webpack --progress --colors --watch --hide-modules",
     "dist": "NODE_ENV=production node_modules/.bin/webpack --progress --colors --hide-modules",
@@ -29,37 +29,35 @@
   },
   "homepage": "https://github.com/melown/vts-browser-js#readme",
   "devDependencies": {
-    "babel-core": "^6.24.0",
-    "babel-eslint": "^7.2.3",
-    "babel-loader": "^6.4.1",
-    "babel-preset-es2015": "^6.24.0",
-    "chai": "^3.5.0",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.27.3",
-    "eslint": "^3.19.0",
-    "eslint-config-airbnb": "^14.1.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-react": "^6.10.3",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "html-webpack-plugin": "^2.28.0",
-    "install": "^0.8.7",
-    "license-webpack-plugin": "^0.4.3",
-    "mocha": "^3.2.0",
-    "rimraf": "^2.6.1",
-    "serve": "^5.0.4",
-    "style-loader": "^0.16.1",
-    "webpack": "^2.3.1",
-    "webpack-dev-server": "^2.4.2",
-    "worker-loader": "^0.8.0"
+    "@babel/preset-env": "^7.10.2",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.1.0",
+    "chai": "^4.2.0",
+    "copy-webpack-plugin": "^6.0.2",
+    "css-loader": "^3.5.3",
+    "eslint": "^7.2.0",
+    "eslint-config-airbnb": "^18.1.0",
+    "eslint-loader": "^4.0.2",
+    "eslint-plugin-import": "^2.21.1",
+    "eslint-plugin-jsx-a11y": "^6.2.3",
+    "eslint-plugin-react": "^7.20.0",
+    "html-webpack-plugin": "^4.3.0",
+    "install": "^0.13.0",
+    "license-webpack-plugin": "^2.2.0",
+    "mini-css-extract-plugin": "^0.9.0",
+    "mocha": "^7.2.0",
+    "rimraf": "^3.0.2",
+    "serve": "^11.3.0",
+    "style-loader": "^1.2.1",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.11.0",
+    "worker-loader": "^2.0.0"
   },
   "dependencies": {
-    "earcut":  "^2.1.0",
-    "geographiclib": "^1.47.0",
-    "npm-git-install": "^0.3.0"
-  },
-  "gitDependencies": {
-    "proj4": "https://github.com/melown/proj4js.git#master"
+    "earcut": "^2.2.2",
+    "geographiclib": "^1.50.0",
+    "melowntech-proj4": "^2.4.5"
   }
 }

src/browser/index.js

@@ -1,5 +1,5 @@
 
-import Proj4 from 'proj4';
+import Proj4 from 'melowntech-proj4';
 import earcut from 'earcut';
 import {getCoreVersion as getCoreVersion_, checkSupport as checkSupport_} from '../core/core';
 import {vec2 as vec2_, vec3 as vec3_, vec4 as vec4_, mat3 as mat3_, mat4 as mat4_} from '../core/utils/matrix';

src/browser/interface.js

@@ -1,9 +1,9 @@
 
 //css stuff
-import 'browser/browser.css';
-import 'browser/presenter/css/main.css';
-import 'browser/presenter/css/panel.css';
-import 'browser/presenter/css/subtitles.css';
+import './browser.css';
+import './presenter/css/main.css';
+import './presenter/css/panel.css';
+import './presenter/css/subtitles.css';
 
 import Browser_ from './browser';
 

src/core/core.js

@@ -1,4 +1,4 @@
-import Proj4 from 'proj4';
+import Proj4 from 'melowntech-proj4';
 import Map_ from './map/map';
 import Inspector_ from './inspector/inspector';
 import Renderer_ from './renderer/renderer';
@@ -585,7 +585,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.23.2';
+    return (full ? 'Core: ' : '') + '2.23.3';
 }
 
 

src/core/index.js

@@ -1,4 +1,4 @@
-import Proj4 from 'proj4';
+import Proj4 from 'melowntech-proj4';
 import earcut from 'earcut';
 import {getCoreVersion as getCoreVersion_, checkSupport as checkSupport_} from './core';
 import {CoreInterface as CoreInterface_} from './interface';

src/core/interface.js

@@ -1,5 +1,5 @@
 
-import Proj4 from 'proj4';
+import Proj4 from 'melowntech-proj4';
 import earcut from 'earcut';
 import {Core as Core_} from './core';
 //import {CoreInterface as CoreInterface_} from './interface';

webpack.config.js

@@ -1,41 +1,31 @@
-var path = require('path');
-var webpack = require('webpack');
-var CopyWebpackPlugin = require('copy-webpack-plugin');
-var CommonChunks = require('copy-webpack-plugin');
-var UglifyJsPlugin = webpack.optimize.UglifyJsPlugin;
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var LicenseWebpackPlugin = require('license-webpack-plugin');
-var fs = require("fs");
-
 
 var PROD = (process.env.NODE_ENV === 'production')
 var TARGET_DIR = PROD ? __dirname + "/dist/" : __dirname + "/build/";
 
+var fs = require("fs");
+var webpack = require('webpack');
+var LicenseWebpackPlugin = require('license-webpack-plugin').LicenseWebpackPlugin;
+var MiniCssExtractPlugin = require('mini-css-extract-plugin');
+var CopyPlugin = require('copy-webpack-plugin');
 
-var plugins = [
-    new webpack.BannerPlugin(fs.readFileSync('./LICENSE', 'utf8')),
-    new LicenseWebpackPlugin({pattern: /^(MIT|ISC|BSD.*)$/})
-];
+var path = require('path');
 
-if (PROD) {
-    plugins.push(new UglifyJsPlugin({
-      //comments: true,
-      compress: true,
-      mangle: true,
-      extractComments: {
+var plugins = [
+    new LicenseWebpackPlugin({ outputFilename: '3rdpartylicenses.txt' }),
+    new MiniCssExtractPlugin({ filename: '[name]' + (PROD ? '.min' : '') + '.css' }),
+    new webpack.BannerPlugin({
         "banner": function(filename) {
-          return "Copyright (c) 2017 Melown Technologies SE\n" +
-                 " *  For terms of use, see accompanying " + filename +" file.\n" +
+          return "Copyright (c) 2020 Melown Technologies SE\n" +
+                 " *  For terms of use, see accompanying [name] file.\n" +
                  " *  For 3rd party libraries licenses, see 3rdpartylicenses.txt.\n"
         }
-      },
-    }));
-}
-
-plugins.push(
-    new ExtractTextPlugin({
-      filename: 'vts-browser' + (PROD ? '.min' : '') + '.css'
     }),
+    new CopyPlugin({
+      patterns: [
+        { from: './LICENSE', to: 'vts-browser.js' + (PROD ? '.min' : '') + '.LICENSE' },
+        { from: './LICENSE', to: 'vts-core.js' + (PROD ? '.min' : '') + '.LICENSE' }
+      ],
+    }),    
     new webpack.DefinePlugin({
       'VTS_MATERIAL_DEPTH':           1,
       'VTS_MATERIAL_FLAT':            2,
@@ -124,42 +114,46 @@ plugins.push(
       'VTS_IMPORATANCE_INV_LOG' :     1355.6127860321758038669705901537 // 1/log(LOG_BASE)
 
     })
-);
-
+];
 
-var config = {
+module.exports = {
   entry: {
     'vts-core': __dirname + '/src/core/index.js',
     'vts-browser': __dirname + '/src/browser/index.js'
   },
-  devtool: PROD ? undefined : 'source-map',
+
+  module: {
+    rules: [
+      {
+        test: /\.css$/i,
+        use: [
+          {
+            loader: MiniCssExtractPlugin.loader,
+            options: {
+              esModule: true,
+            },
+          },
+
+        'css-loader']
+      },
+    ],
+  },
+
   output: {
     path: TARGET_DIR,
     filename: '[name]' + (PROD ? '.min' : '') + '.js',
     libraryTarget: "var",
     library: "vts"
   },
-  module: {
-    loaders: [
-    {
-        include: [path.resolve(__dirname, "src/")]
-    },
-    {
-      test: /\.css$/, loader: ExtractTextPlugin.extract({fallback: "style-loader", use: "css-loader"})
-    },
-    ]
-  },
-  resolve: {
-    modules : ['./node_modules/', './src/'],
-    alias: {
-      core: path.resolve(__dirname, 'src/core/'),
-      browser: path.resolve(__dirname, 'src/browser/')
-    }
-  },
+
+  devtool: 'source-map',
+
   devServer: {
     inline: true
   },
-  plugins: plugins
+
+  mode: (PROD) ? 'production' : 'development',
+
+  plugins: plugins  
 };
 
-module.exports = config;