Grab latest version of Webpack (and others) (cesium-ml#160)

* Also update npm packages

* Specify v2 of webpack

* Avoid pip warning; list packages in columns

* Try again with webpack

* Snapshot most js package versions

* Add commands to npm for building bundle and testing

* Add commands to npm for building bundle and testing

* Update all package versions

* Update all npm packages to specified versions

* Use newer npm on Travis

* Reluctantly add back jQuery, since Bootstrap depends on it

* Use npm update instead of home brew tool

* Pin jquery

Author: stefanv

.eslintrc

@@ -1,4 +1,6 @@
 {
+    "comment": "off = 0, warn = 1, error = 2",
+
     "parser": "babel-eslint",
     "env": {
         "browser": true
@@ -25,7 +27,7 @@
         "no-class-assign": 0,
         "jsx-a11y/label-has-for": 0,
         "jsx-a11y/href-no-hash": 1,
-        "camelcase": 1,
+        "camelcase": 0,
         "no-fallthrough": 0,
         "no-restricted-syntax": 1,
         "guard-for-in": 1,

.travis/travis_install.sh

@@ -13,11 +13,12 @@ section_end "install.base.requirements"
 section "install.cesium.requirements"
 pip install -e git://github.com/cesium-ml/cesium.git#egg=cesium
 pip install --retries 3 -r requirements.txt
-pip list
+pip list --format=columns
 section_end "install.cesium.requirements"
 
 
 section "install.cesium_web.requirements"
+npm -g install npm@latest
 npm --version
 node --version
 make dependencies

Makefile

@@ -12,7 +12,7 @@ dev_dependencies:
 
 dependencies:
 	@./tools/install_deps.py requirements.txt
-	@./tools/install_npm_deps.py package.json
+	npm update
 
 db_init:
 	./tools/db_create.sh
@@ -23,7 +23,7 @@ db_drop:
 db_test_data:
 	PYTHONPATH=. python ./cesium_app/models.py
 
-$(bundle): webpack.config.js
+$(bundle): webpack.config.js package.json
 	$(webpack)
 
 bundle: $(bundle)
@@ -66,3 +66,6 @@ docker-images:
 	docker build -t cesium/web . && docker push cesium/web
 	cd docker/postgres && docker build -t cesium/postgres . && docker push cesium/postgres
 
+npm-update:
+	npm install -g npm-check-updates
+	ncu

package.json

@@ -2,52 +2,48 @@
   "name": "Cesium",
   "license": "BSD-3-Clause",
   "scripts": {
-    "build": "webpack"
+    "build": "make bundle",
+    "test": "eslint -c .eslintrc --ext .jsx,.js public/scripts/ && make test"
   },
   "dependencies": {
+    "bootstrap": "^3.3.7",
+    "bootstrap-css": "^3.0.0",
+    "jquery": "^3.1.1",
+    "plotly.js": "^1.23.1",
     "react": "^15.1.0",
-    "react-addons": "latest",
     "react-dom": "^15.1.0",
-    "react-modal": "latest",
-    "react-tabs": "latest",
-    "react-addons-css-transition-group": "latest",
-    "jquery": "latest",
-    "jquery-form": "latest",
-    "bootstrap": "latest",
-    "bootstrap-css": "latest",
-    "filter-values": "latest",
-    "redux": "latest",
-    "react-redux": "latest",
-    "redux-thunk": "latest",
-    "redux-logger": "latest",
-    "whatwg-fetch": "latest",
+    "react-redux": "^5.0.3",
+    "react-tabs": "^0.8.2",
+    "react-tooltip": "^3.2.7",
+    "redux": "^3.6.0",
     "redux-form": "^5.3.3",
-    "plotly.js": "latest",
-    "webpack": "latest",
-    "react-tooltip": "latest"
+    "redux-logger": "^2.8.1",
+    "redux-thunk": "^2.2.0",
+    "webpack": "^2.2.1",
+    "webpack-dev-server": "^2.4.1",
+    "whatwg-fetch": "^2.0.2"
   },
   "devDependencies": {
-    "babel": "latest",
-    "babel-core": "latest",
-    "babel-eslint": "^6.1.2",
-    "babel-loader": "latest",
-    "babel-preset-es2015": "latest",
-    "babel-preset-react": "latest",
-    "babel-preset-stage-2": "latest",
-    "css-loader": "latest",
-    "cwise": "latest",
-    "eslint": "latest",
-    "eslint-config-airbnb": "latest",
-    "eslint-loader": "latest",
-    "eslint-plugin-import": "latest",
-    "eslint-plugin-jsx-a11y": "latest",
-    "eslint-plugin-react": "latest",
-    "exports-loader": "latest",
-    "glslify": "latest",
-    "ify-loader": "latest",
-    "imports-loader": "latest",
-    "style-loader": "latest",
-    "webpack-dev-server": "latest"
+    "babel": "^6.23.0",
+    "babel-core": "^6.23.1",
+    "babel-eslint": "^7.1.1",
+    "babel-loader": "^6.3.2",
+    "babel-preset-es2015": "^6.22.0",
+    "babel-preset-react": "^6.23.0",
+    "babel-preset-stage-2": "^6.22.0",
+    "css-loader": "^0.26.1",
+    "cwise": "^1.0.9",
+    "eslint": "^3.16.1",
+    "eslint-config-airbnb": "^14.1.0",
+    "eslint-loader": "^1.6.3",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-jsx-a11y": "^4.0.0",
+    "eslint-plugin-react": "^6.10.0",
+    "exports-loader": "^0.6.3",
+    "glslify": "^6.0.1",
+    "ify-loader": "^1.0.3",
+    "imports-loader": "^0.7.0",
+    "style-loader": "^0.13.1"
   },
   "browserify": {
     "transform": [

tools/install_npm_deps.py

@@ -8,11 +8,11 @@ const config = {
     filename: 'bundle.js'
   },
   module: {
-    loaders: [
+    rules: [
       { test: /\.js?$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query:
+        options:
         {
           presets: ['es2015', 'react', 'stage-2'],
           compact: false
@@ -21,27 +21,35 @@ const config = {
       { test: /\.jsx?$/,
         exclude: /node_modules/,
         loader: 'babel-loader',
-        query:
+        options:
         {
           presets: ['es2015', 'react', 'stage-2'],
           compact: false
         }
       },
-      { test: /\.css$/, loader: 'style-loader!css-loader' },
+      { test: /\.css$/,
+        use: [
+          'style-loader',
+          'css-loader'
+        ]
+      },
       { test: /node_modules/, loader: 'ify-loader' }
     ],
   },
   plugins: [
     new webpack.ProvidePlugin({
       fetch: 'imports-loader?this=>global!exports-loader?global.fetch!whatwg-fetch'
     }),
+
+    // We do not use JQuery for anything in this project; but Bootstrap
+    // depends on it
     new webpack.ProvidePlugin({
       $: "jquery",
       jQuery: "jquery",
-    }),
+    })
   ],
   resolve: {
-    extensions: ['', '.js', '.jsx']
+    extensions: ['.js', '.jsx']
   }
 };