Merge cac5311 into e39e35f

visgl · Jun 5, 2019 · b842867 · b842867
2 parents e39e35f + cac5311
commit b842867
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/modules/core/package.json b/modules/core/package.json
@@ -24,6 +24,11 @@
     "src",
     "dist.min.js"
   ],
+  "sideEffects": [
+    "dist/es5/lib/init.js",
+    "dist/esm/lib/init.js",
+    "dist/es6/lib/init.js"
+  ],
   "scripts": {
     "build-bundle": "webpack --config ../../scripts/bundle.config.js",
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"

diff --git a/modules/core/src/lib/init.js b/modules/core/src/lib/init.js
@@ -20,6 +20,7 @@
 
 import {global} from '../utils/globals';
 import log from '../utils/log';
+import {initializeShaderModules} from '../shaderlib';
 
 // Version detection using babel plugin
 // Fallback for tests and SSR since global variable is defined by Webpack.
@@ -43,6 +44,8 @@ if (!global.deck) {
     version,
     log
   };
+
+  initializeShaderModules();
 }
 
 // TODO - Hack, remove when luma.gl 4.1.0-alpha.5 is published

diff --git a/modules/core/src/shaderlib/index.js b/modules/core/src/shaderlib/index.js
@@ -39,6 +39,4 @@ export function initializeShaderModules() {
   setDefaultShaderModules([project]);
 }
 
-initializeShaderModules();
-
 export {fp32, fp64, picking, project, project64, gouraudlighting, phonglighting};
diff --git a/modules/main/package.json b/modules/main/package.json
@@ -21,6 +21,7 @@
     "src",
     "dist.min.js"
   ],
+  "sideEffects": false,
   "scripts": {
     "build-bundle": "webpack --config ../../scripts/bundle.config.js",
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"