diff --git a/lerna.json b/lerna.json index 5c53c1a53..b0cc88fdf 100644 --- a/lerna.json +++ b/lerna.json @@ -11,8 +11,12 @@ "ignore": [ "test", "*.md", - "loaders.gl", - "@luma.gl/debug" + "@luma.gl/debug", + "@luma.gl/glfx", + "@luma.gl/gpgpu", + "@luma.gl/imageprocessing", + "@luma.gl/io", + "@luma.gl/scripts" ] }, "bootstrap": {} diff --git a/modules/debug/package.json b/modules/debug/package.json index 193173a35..ff78f3260 100644 --- a/modules/debug/package.json +++ b/modules/debug/package.json @@ -33,7 +33,7 @@ "build-es5": "BABEL_ENV=es5 babel src --config-file ../../babel.config.js --out-dir dist/es5 --source-maps --ignore 'node_modules/'" }, "dependencies": { - "luma.gl": "^6.2.0-alpha.1", + "luma.gl": "^6.3.0-alpha.1", "glsl-transpiler": "^1.7.1" } } diff --git a/modules/glfx/package.json b/modules/glfx/package.json index 8d0b49e40..72670a1ba 100644 --- a/modules/glfx/package.json +++ b/modules/glfx/package.json @@ -1,36 +1,27 @@ { - "name": "luma-glfx", + "name": "@luma.gl/glfx", "description": "glfx - image processing packaged as composable shader modules", "private": "true", "version": "0.0.1", "license": "MIT", - "repository": "", - "main": "lib/index.js", - "module": "es/index.js", - "jsnext:main": "es/index.js", + "repository": { + "type": "git", + "url": "https://github.com/uber/luma.gl" + }, + "main": "dist/es5/index.js", + "module": "dist/esm/index.js", + "esnext": "dist/es6/index.js", "files": [ + "src", "dist", - "lib", - "es", - "src" + "README.md" ], "sideEffects": false, "scripts": { - "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --config-file ../../babel.config.js --out-dir dist/lib", - "build:es": "cross-env BABEL_ENV=es babel src --config-file ../../babel.config.js --out-dir dist/es", - "build:umd": "webpack", - "build:umd:min": "webpack --env minified", - "build": "mkdir -p dist/lib dist/es && npm run build:commonjs && npm run build:es && npm run build:umd && npm run build:umd:min" - }, - "devDependencies": { - "babel-loader": "^8.0.0-beta", - "babel-plugin-add-module-exports": "^0.2.1", - "babel-plugin-external-helpers": "^6.3.15", - "cross-env": "^5.0.5", - "eslint": "^4.8.0", - "eslint-loader": "^1.9.0" - }, - "dependencies": { - "luma.gl": "^6.1.0" + "clean": "rm -fr dist && mkdir -p dist/es5 dist/esm dist/es6", + "build": "npm run clean && npm run build-es6 && npm run build-esm && npm run build-es5", + "build-es6": "BABEL_ENV=es6 babel src --config-file ../../babel.config.js --out-dir dist/es6 --source-maps --ignore 'node_modules/'", + "build-esm": "BABEL_ENV=esm babel src --config-file ../../babel.config.js --out-dir dist/esm --source-maps --ignore 'node_modules/'", + "build-es5": "BABEL_ENV=es5 babel src --config-file ../../babel.config.js --out-dir dist/es5 --source-maps --ignore 'node_modules/'" } } diff --git a/modules/gpgpu/package.json b/modules/gpgpu/package.json new file mode 100644 index 000000000..c64e6487d --- /dev/null +++ b/modules/gpgpu/package.json @@ -0,0 +1,26 @@ +{ + "name": "@luma.gl/gpgpu", + "description": "general purpose gpu calculation", + "private": "true", + "version": "0.0.1", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/uber/luma.gl" + }, + "main": "dist/es5/index.js", + "module": "dist/esm/index.js", + "esnext": "dist/es6/index.js", + "files": [ + "src", + "dist" + ], + "sideEffects": false, + "scripts": { + "clean": "rm -fr dist && mkdir -p dist/es5 dist/esm dist/es6", + "build": "npm run clean && npm run build-es6 && npm run build-esm && npm run build-es5", + "build-es6": "BABEL_ENV=es6 babel src --config-file ../../babel.config.js --out-dir dist/es6 --source-maps --ignore 'node_modules/'", + "build-esm": "BABEL_ENV=esm babel src --config-file ../../babel.config.js --out-dir dist/esm --source-maps --ignore 'node_modules/'", + "build-es5": "BABEL_ENV=es5 babel src --config-file ../../babel.config.js --out-dir dist/es5 --source-maps --ignore 'node_modules/'" + } +} diff --git a/modules/gpgpu/diff-images.js b/modules/gpgpu/src/diff-images.js similarity index 100% rename from modules/gpgpu/diff-images.js rename to modules/gpgpu/src/diff-images.js diff --git a/modules/gpgpu/index.js b/modules/gpgpu/src/index.js similarity index 100% rename from modules/gpgpu/index.js rename to modules/gpgpu/src/index.js diff --git a/modules/imageprocessing/package.json b/modules/imageprocessing/package.json new file mode 100644 index 000000000..511cc5f21 --- /dev/null +++ b/modules/imageprocessing/package.json @@ -0,0 +1,27 @@ +{ + "name": "@luma.gl/imageprocessing", + "description": "image processing library", + "private": "true", + "version": "0.0.1", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/uber/luma.gl" + }, + "main": "dist/es5/index.js", + "module": "dist/esm/index.js", + "esnext": "dist/es6/index.js", + "files": [ + "src", + "dist", + "README.md" + ], + "sideEffects": false, + "scripts": { + "clean": "rm -fr dist && mkdir -p dist/es5 dist/esm dist/es6", + "build": "npm run clean && npm run build-es6 && npm run build-esm && npm run build-es5", + "build-es6": "BABEL_ENV=es6 babel src --config-file ../../babel.config.js --out-dir dist/es6 --source-maps --ignore 'node_modules/'", + "build-esm": "BABEL_ENV=esm babel src --config-file ../../babel.config.js --out-dir dist/esm --source-maps --ignore 'node_modules/'", + "build-es5": "BABEL_ENV=es5 babel src --config-file ../../babel.config.js --out-dir dist/es5 --source-maps --ignore 'node_modules/'" + } +} diff --git a/modules/io/_package.json b/modules/io/_package.json deleted file mode 100644 index e54093b2c..000000000 --- a/modules/io/_package.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "name": "luma.gl-io", - "version": "1.0.0", - "description": "Advanced io for luma.gl", - "license": "MIT", - "author": "Ib Green ", - "contributors": [ - "Mikola Lysenko dist/lumagl.min.js", - "lint": "eslint src", - "precommit": "npm test", - "prepublish": "npm run build", - "test": "npm run lint && npm run test-headless && npm run test-headless-nowebgl", - "test-headless": "babel-node --include='' test/headless.js | faucet", - "test-headless-nowebgl": "babel-node --include='' test/headless-nowebgl.js | faucet", - "test-browser": "budo test/browser.js:build/test-bundle.js --dir test --live --open --port 3001 --watch-glob '**/*.{html,css,js,glsl}' -- -t babelify -t glslify", - "test-electron": "browserify test/electron.js | testron | faucet", - "profile-disc": "browserify src/bundle.js --full-paths -t babelify -t glslify | discify --open", - "start": "budo src/bundle.js:dist/lumagl.js --live --open --port 3000 --watch-glob '**/*.{html,css,js,glsl}' -- -t babelify -t glslify" - } -} diff --git a/modules/io/package.json b/modules/io/package.json new file mode 100644 index 000000000..9953dec47 --- /dev/null +++ b/modules/io/package.json @@ -0,0 +1,35 @@ +{ + "name": "@luma.gl/io", + "version": "1.0.0", + "description": "Advanced io for luma.gl", + "license": "MIT", + "author": "Ib Green ", + "contributors": [ + "Mikola Lysenko =6.1.0-beta.4" + "build-dev": "webpack --env.dev --config webpack.config.js", + "build-prod": "webpack --config webpack.config.js", + "build": "npm run build-prod" } } diff --git a/package.json b/package.json index af1076baf..cd4b38a19 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,7 @@ "3d" ], "workspaces": [ - "modules/core", - "modules/debug", - "modules/loaders.gl" + "modules/*" ], "browser": { "fs": false diff --git a/yarn.lock b/yarn.lock index d09b55e48..2500d024d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -574,8 +574,8 @@ source-map-support "^0.5.9" "@babel/runtime@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c" + version "7.1.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3" dependencies: regenerator-runtime "^0.12.0" @@ -2395,6 +2395,10 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" +escaper@^2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz#8b8fe90ba364054151ab7eff18b4ce43b1e13ab5" + eslint-config-prettier@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.0.1.tgz#479214f64c1a4b344040924bfb97543db334b7b1" @@ -2525,7 +2529,7 @@ eventemitter3@^3.0.0: events@^1.0.0: version "1.1.1" - resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" eventsource@0.1.6: version "0.1.6" @@ -3163,12 +3167,18 @@ glsl-parser@^2.0.1: through "2.3.4" through2 "^0.6.3" -glsl-tokenizer@^2.0.2, glsl-tokenizer@^2.1.4: +glsl-tokenizer@^2.0.2: version "2.1.4" resolved "https://registry.yarnpkg.com/glsl-tokenizer/-/glsl-tokenizer-2.1.4.tgz#aadec0039e68e07a6e591cd0454d97a905797225" dependencies: through2 "^0.6.3" +glsl-tokenizer@^2.1.4: + version "2.1.5" + resolved "https://registry.yarnpkg.com/glsl-tokenizer/-/glsl-tokenizer-2.1.5.tgz#1c2e78c16589933c274ba278d0a63b370c5fee1a" + dependencies: + through2 "^0.6.3" + glsl-transpiler@^1.7.1: version "1.7.2" resolved "https://registry.yarnpkg.com/glsl-transpiler/-/glsl-transpiler-1.7.2.tgz#c488a55edaf750ce4fbb502da1e8eb785731851e" @@ -4229,16 +4239,6 @@ lru-cache@^4.0.1, lru-cache@^4.1.1: pseudomap "^1.0.2" yallist "^2.1.2" -luma.gl@^6.2.0-alpha.1: - version "6.2.0" - resolved "https://registry.yarnpkg.com/luma.gl/-/luma.gl-6.2.0.tgz#449760dc735e2e89a55bb78697c8dd1093626b2c" - dependencies: - "@babel/runtime" "^7.0.0" - math.gl "^2.2.0" - probe.gl "^2.0.1" - seer "^0.2.4" - webgl-debug "^2.0.0" - make-dir@^1.0.0, make-dir@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -5254,10 +5254,11 @@ prepend-http@^1.0.1: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" prepr@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/prepr/-/prepr-1.1.1.tgz#9538e526cf5b3bc616b97a182e03830aac4a7351" + version "1.2.0" + resolved "https://registry.yarnpkg.com/prepr/-/prepr-1.2.0.tgz#176c09e3f773b8c7968435d4faaf3b72bbe4ca5b" dependencies: balanced-match "^0.3.0" + escaper "^2.5.3" parenthesis "^3.0.0" xtend "^4.0.1"