Bump luma.gl version and add source map support in example (visgl#684)

* Enable source maps in examples
aravindiiitb · Jun 5, 2017 · 7b2045a · 7b2045a
1 parent 01196c7
commit 7b2045a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/examples/layer-browser/package.json b/examples/layer-browser/package.json
@@ -5,14 +5,14 @@
     "build": "webpack app bundle.js --env.local --display-error-details"
   },
   "dependencies": {
-    "deck.gl": "^4.0.0",
+    "deck.gl": ">=4.1.0-alpha.10",
     "extrude-polyline": "^1.0.6",
     "immutable": "^3.8.1",
-    "luma.gl": "^3.0.0",
+    "luma.gl": ">=4.0.0-alpha.9",
     "react": "^15.4.1",
     "react-autobind": "^1.0.6",
     "react-dom": "^15.4.1",
-    "react-map-gl": "^3.0.0-alpha.5",
+    "react-map-gl": ">=3.0.0-alpha.12",
     "react-stats": "^0.0.5",
     "s2-geometry": "^1.2.9"
   },

diff --git a/examples/webpack.config.local.js b/examples/webpack.config.local.js
@@ -21,6 +21,8 @@ const LOCAL_DEV_CONFIG = {
     }
   },
 
+  devtool: 'source-map',
+
   resolve: {
     alias: {
       // Imports the deck.gl library from the src directory in this repo
@@ -33,10 +35,10 @@ const LOCAL_DEV_CONFIG = {
   module: {
     rules: [
       {
-        // Inline shaders
-        test: /\.glsl$/,
-        loader: 'raw-loader',
-        exclude: [/node_modules/]
+        // Unfortunately, webpack doesn't import library sourcemaps on its own...
+        test: /\.js$/,
+        use: ['source-map-loader'],
+        enforce: 'pre'
       }
     ]
   },
@@ -47,6 +49,7 @@ const LOCAL_DEV_CONFIG = {
 };
 
 function addLocalDevSettings(config) {
+  config = Object.assign({}, LOCAL_DEV_CONFIG, config);
   config.resolve = config.resolve || {};
   config.resolve.alias = config.resolve.alias || {};
   Object.assign(config.resolve.alias, LOCAL_DEV_CONFIG.resolve.alias);
@@ -58,10 +61,10 @@ function addLocalDevSettings(config) {
   return config;
 }
 
-module.exports = baseConfig => env => {
-  const config = baseConfig;
+module.exports = config => env => {
   if (env && env.local) {
-    addLocalDevSettings(config);
+    config = addLocalDevSettings(config);
+    // console.warn(JSON.stringify(config, null, 2));
   }
 
   return config;

diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "build": "npm run build-clean && npm run build-es6 && npm run build-es5 && webpack -d --display-modules",
     "cover": "NODE_ENV=test nyc --reporter html --reporter cobertura --reporter=lcov npm run test-cover",
     "lint": "eslint src test examples && npm run lint-yarn",
-    "lint-yarn": "! grep -q unpm.u yarn.lock",
+    "lint-yarn": "!(grep -q unpm.u yarn.lock) || echo 'Please rebuild yarn file using public npmrc'",
     "publish-prod": "npm run build && npm run test && npm run test-dist && npm publish",
     "publish-beta": "npm run build && npm run test && npm run test-dist && npm publish --tag beta",
     "test": "npm run lint && npm run build && npm run test-node",