Fix pre-built bundle setup (#2004)

visgl · Mar 6, 2024 · b2caf5c · b2caf5c
1 parent 08d30d6
commit b2caf5c
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 21 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -9,3 +9,4 @@ picogl/
 .docusaurus
 
 test/apps/
+bundle.ts
diff --git a/modules/constants/package.json b/modules/constants/package.json
@@ -39,8 +39,8 @@
   },
   "scripts": {
     "pre-build": "npx esbuild src/index.ts --bundle --format=cjs --outfile=dist/index.cjs",
-    "build-minified-bundle": "ocular-bundle ./src/bundle.ts -output=dist/dist.min.js",
-    "build-dev-bundle": "ocular-bundle ./src/bundle.ts -output=dist/dist.dev.js -- --env=dev",
+    "build-minified-bundle": "ocular-bundle ./src/index.ts --output=dist/dist.min.js",
+    "build-dev-bundle": "ocular-bundle ./src/index.ts --output=dist/dist.dev.js --env=dev",
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "gitHead": "c636c34b8f1581eed163e94543a8eb1f4382ba8e"

diff --git a/modules/constants/src/bundle.ts b/modules/constants/src/bundle.ts
diff --git a/modules/core/bundle.ts b/modules/core/bundle.ts
@@ -0,0 +1,4 @@
+// Import from package name instead of relative path
+// This will be resolved to src or dist by esbuild depending on bundle settings
+// dist has TS transformers applied
+export * from '@luma.gl/core';
diff --git a/modules/core/package.json b/modules/core/package.json
@@ -35,8 +35,8 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build-minified-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.min.js",
-    "build-dev-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.dev.js -- --env=dev",
+    "build-minified-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.min.js",
+    "build-dev-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.dev.js --env=dev",
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "dependencies": {

diff --git a/modules/engine/bundle.ts b/modules/engine/bundle.ts
@@ -0,0 +1,3 @@
+// Re-export core API so they don't get overwritten
+export * from '@luma.gl/core';
+export * from '@luma.gl/engine';
diff --git a/modules/engine/package.json b/modules/engine/package.json
@@ -35,8 +35,8 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build-minified-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.min.js",
-    "build-dev-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.dev.js -- --env=dev",
+    "build-minified-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.min.js",
+    "build-dev-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.dev.js --env=dev",
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {

diff --git a/modules/gltf/bundle.ts b/modules/gltf/bundle.ts
@@ -0,0 +1,3 @@
+// Re-export core API so they don't get overwritten
+export * from '@luma.gl/core';
+export * from '@luma.gl/gltf';
diff --git a/modules/gltf/package.json b/modules/gltf/package.json
@@ -35,8 +35,8 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build-minified-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.min.js",
-    "build-dev-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.dev.js -- --env=dev",
+    "build-minified-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.min.js",
+    "build-dev-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.dev.js --env=dev",
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {

diff --git a/modules/shadertools/bundle.ts b/modules/shadertools/bundle.ts
@@ -0,0 +1,3 @@
+// Re-export core API so they don't get overwritten
+export * from '@luma.gl/core';
+export * from '@luma.gl/shadertools';
diff --git a/modules/shadertools/package.json b/modules/shadertools/package.json
@@ -41,8 +41,8 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build-minified-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.min.js",
-    "build-dev-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.dev.js -- --env=dev",
+    "build-minified-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.min.js",
+    "build-dev-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.dev.js --env=dev",
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {

diff --git a/modules/webgl/bundle.ts b/modules/webgl/bundle.ts
@@ -0,0 +1,3 @@
+// Re-export core API so they don't get overwritten
+export * from '@luma.gl/core';
+export * from '@luma.gl/webgl';
diff --git a/modules/webgl/package.json b/modules/webgl/package.json
@@ -35,8 +35,8 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build-minified-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.min.js",
-    "build-dev-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.dev.js -- --env=dev",
+    "build-minified-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.min.js",
+    "build-dev-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.dev.js --env=dev",
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {

diff --git a/modules/webgpu/bundle.ts b/modules/webgpu/bundle.ts
@@ -0,0 +1,3 @@
+// Re-export core API so they don't get overwritten
+export * from '@luma.gl/core';
+export * from '@luma.gl/webgpu';
diff --git a/modules/webgpu/package.json b/modules/webgpu/package.json
@@ -32,8 +32,8 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build-minified-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.min.js",
-    "build-dev-bundle": "ocular-bundle ./src/index.ts -output=dist/dist.dev.js -- --env=dev",
+    "build-minified-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.min.js",
+    "build-dev-bundle": "ocular-bundle ./bundle.ts --output=dist/dist.dev.js --env=dev",
     "prepublishOnly": "npm run build-minified-bundle && npm run build-dev-bundle"
   },
   "peerDependencies": {