fix brfs regressions (visgl#437)

aravindiiitb · Mar 17, 2017 · be1fafd · be1fafd
1 parent 0aa1bdb
commit be1fafd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/demo/package.json b/demo/package.json
@@ -47,6 +47,7 @@
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-2": "^6.3.13",
+    "brfs-babel": "^1.0.0",
     "css-loader": "^0.26.1",
     "eslint": "^3.0.0",
     "eslint-config-uber-es2015": "^3.0.0",

diff --git a/demo/webpack/config.js b/demo/webpack/config.js
@@ -26,6 +26,9 @@ module.exports = {
       loader: 'raw-loader',
       include: demoSources,
       enforce: 'post'
+    }, {
+      test: /\.js$/,
+      loader: 'transform-loader?brfs-babel'
     }]
   },
 

diff --git a/examples/layer-browser/webpack.config.js b/examples/layer-browser/webpack.config.js
@@ -41,10 +41,20 @@ module.exports = {
         test: /\.json$/,
         loader: 'json-loader',
         exclude: [/node_modules/]
+      },
+      {
+        // Needed to inline deck.gl GLSL shaders
+        include: [resolve(__dirname, '../sample-layers')],
+        loader: 'transform-loader',
+        options: 'brfs-babel'
       }
     ]
   },
 
+  node: {
+    fs: 'empty'
+  },
+
   // Optional: Enables reading mapbox token from environment variable
   plugins: [
     new webpack.EnvironmentPlugin(['MAPBOX_ACCESS_TOKEN', 'MapboxAccessToken'])

diff --git a/examples/webpack.config.local.js b/examples/webpack.config.local.js
@@ -47,7 +47,8 @@ const LOCAL_DEV_CONFIG = {
 
 function addLocalDevSettings(config) {
   config.resolve = config.resolve || {};
-  Object.assign(config.resolve, {alias: LOCAL_DEV_CONFIG.resolve.alias});
+  config.resolve.alias = config.resolve.alias || {};
+  Object.assign(config.resolve.alias, LOCAL_DEV_CONFIG.resolve.alias);
 
   config.module = config.module || {};
   Object.assign(config.module, {