From 2d08a93d857e4dcf0333d22cb143caa865faaa68 Mon Sep 17 00:00:00 2001 From: Emmett Lalish Date: Wed, 19 Jul 2023 15:41:43 -0700 Subject: [PATCH] build works --- package-lock.json | 70 ++++++++------------- package.json | 8 ++- packages/model-viewer-effects/package.json | 2 +- packages/model-viewer/package.json | 2 +- packages/render-fidelity-tools/package.json | 2 +- packages/space-opera/package.json | 2 +- packages/space-opera/rollup.config.js | 7 +-- 7 files changed, 39 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index df8f46244c..946acd9666 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,11 @@ "name": "model-viewer-packages", "license": "Apache-2.0", "workspaces": [ - "./packages/*" + "./packages/model-viewer", + "./packages/model-viewer-effects", + "./packages/modelviewer.dev", + "./packages/render-fidelity-tools", + "./packages/space-opera" ], "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.31.0", @@ -2591,8 +2595,7 @@ "node_modules/@tweenjs/tween.js": { "version": "18.6.4", "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-18.6.4.tgz", - "integrity": "sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ==", - "dev": true + "integrity": "sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ==" }, "node_modules/@types/accepts": { "version": "1.3.5", @@ -3092,8 +3095,7 @@ "node_modules/@types/stats.js": { "version": "0.17.0", "resolved": "https://registry.npmjs.org/@types/stats.js/-/stats.js-0.17.0.tgz", - "integrity": "sha512-9w+a7bR8PeB0dCT/HBULU2fMqf6BAzvKbxFboYhmDtDkKPiyXYbjoe2auwsXlEFI7CFNMF1dCv3dFH5Poy9R1w==", - "dev": true + "integrity": "sha512-9w+a7bR8PeB0dCT/HBULU2fMqf6BAzvKbxFboYhmDtDkKPiyXYbjoe2auwsXlEFI7CFNMF1dCv3dFH5Poy9R1w==" }, "node_modules/@types/streamx": { "version": "2.9.1", @@ -3105,11 +3107,16 @@ } }, "node_modules/@types/three": { - "version": "0.148.1", - "resolved": "https://registry.npmjs.org/@types/three/-/three-0.148.1.tgz", - "integrity": "sha512-gZwIyTBMxKXqJHXmZ0dzvDieuQ4hz8MPNHtkRrAwER/xPlAh9eP2WIfaolvQY+wJAzlNV5a9ceS4JT+i/jybsw==", + "version": "0.154.0", + "resolved": "https://registry.npmjs.org/@types/three/-/three-0.154.0.tgz", + "integrity": "sha512-IioqpGhch6FdLDh4zazRn3rXHj6Vn2nVOziJdXVbJFi9CaI65LtP9qqUtpzbsHK2Ezlox8NtsLNHSw3AQzucjA==", "dependencies": { - "@types/webxr": "*" + "@tweenjs/tween.js": "~18.6.4", + "@types/stats.js": "*", + "@types/webxr": "*", + "fflate": "~0.6.9", + "lil-gui": "~0.17.0", + "meshoptimizer": "~0.18.1" } }, "node_modules/@types/triple-beam": { @@ -6887,8 +6894,7 @@ "node_modules/fflate": { "version": "0.6.10", "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.6.10.tgz", - "integrity": "sha512-IQrh3lEPM93wVCEczc9SaAOvkmcoQn/G8Bo1e8ZPlY3X3bnAxWaBdvTdvM1hP62iZp0BXWDy4vTAy4fF0+Dlpg==", - "dev": true + "integrity": "sha512-IQrh3lEPM93wVCEczc9SaAOvkmcoQn/G8Bo1e8ZPlY3X3bnAxWaBdvTdvM1hP62iZp0BXWDy4vTAy4fF0+Dlpg==" }, "node_modules/filament": { "version": "1.31.5", @@ -9267,8 +9273,7 @@ "node_modules/lil-gui": { "version": "0.17.0", "resolved": "https://registry.npmjs.org/lil-gui/-/lil-gui-0.17.0.tgz", - "integrity": "sha512-MVBHmgY+uEbmJNApAaPbtvNh1RCAeMnKym82SBjtp5rODTYKWtM+MXHCifLe2H2Ti1HuBGBtK/5SyG4ShQ3pUQ==", - "dev": true + "integrity": "sha512-MVBHmgY+uEbmJNApAaPbtvNh1RCAeMnKym82SBjtp5rODTYKWtM+MXHCifLe2H2Ti1HuBGBtK/5SyG4ShQ3pUQ==" }, "node_modules/linked-list": { "version": "0.1.0", @@ -9656,6 +9661,11 @@ "node": ">= 8" } }, + "node_modules/meshoptimizer": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/meshoptimizer/-/meshoptimizer-0.18.1.tgz", + "integrity": "sha512-ZhoIoL7TNV4s5B6+rx5mC//fw8/POGyNxS/DZyCJeiZ12ScLfVwRE/GfsxwiTkMYYD5DmK2/JXnEVXqL4rF+Sw==" + }, "node_modules/micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", @@ -14846,7 +14856,7 @@ "@types/chai": "^4.3.1", "@types/mocha": "^9.1.1", "@types/pngjs": "^6.0.1", - "@types/three": "^0.152.1", + "@types/three": "^0.154.0", "@ungap/event-target": "^0.2.3", "@web/test-runner": "^0.16.1", "@web/test-runner-playwright": "^0.10.0", @@ -14885,7 +14895,7 @@ "@types/chai": "^4.3.1", "@types/mocha": "^9.1.1", "@types/pngjs": "^6.0.1", - "@types/three": "^0.152.1", + "@types/three": "^0.154.0", "@ungap/event-target": "^0.2.3", "@web/test-runner": "^0.16.1", "@web/test-runner-playwright": "^0.10.0", @@ -14917,19 +14927,6 @@ "@types/node": "*" } }, - "packages/model-viewer-effects/node_modules/@types/three": { - "version": "0.152.1", - "resolved": "https://registry.npmjs.org/@types/three/-/three-0.152.1.tgz", - "integrity": "sha512-PMOCQnx9JRmq+2OUGTPoY9h1hTWD2L7/nmuW/SyNq1Vbq3Lwt3MNdl3wYSa4DvLTGv62NmIXD9jYdAOwohwJyw==", - "dev": true, - "dependencies": { - "@tweenjs/tween.js": "~18.6.4", - "@types/stats.js": "*", - "@types/webxr": "*", - "fflate": "~0.6.9", - "lil-gui": "~0.17.0" - } - }, "packages/model-viewer/node_modules/@types/pngjs": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/@types/pngjs/-/pngjs-6.0.1.tgz", @@ -14939,19 +14936,6 @@ "@types/node": "*" } }, - "packages/model-viewer/node_modules/@types/three": { - "version": "0.152.1", - "resolved": "https://registry.npmjs.org/@types/three/-/three-0.152.1.tgz", - "integrity": "sha512-PMOCQnx9JRmq+2OUGTPoY9h1hTWD2L7/nmuW/SyNq1Vbq3Lwt3MNdl3wYSa4DvLTGv62NmIXD9jYdAOwohwJyw==", - "dev": true, - "dependencies": { - "@tweenjs/tween.js": "~18.6.4", - "@types/stats.js": "*", - "@types/webxr": "*", - "fflate": "~0.6.9", - "lil-gui": "~0.17.0" - } - }, "packages/model-viewer/node_modules/three": { "version": "0.154.0", "resolved": "https://registry.npmjs.org/three/-/three-0.154.0.tgz", @@ -15001,7 +14985,7 @@ "@types/pngjs": "^3.4.0", "@types/puppeteer": "^5.4.6", "@types/rimraf": "^3.0.1", - "@types/three": "^0.148.0", + "@types/three": "^0.154.0", "filament": "1.31.5", "http-server": "^14.1.1", "lit": "^2.7.2", @@ -15068,7 +15052,7 @@ "gltf-validator": "^2.0.0-dev.3.5", "http-server": "^14.1.1", "js-beautify": "^1.14.0", - "jszip": "^3.6.0", + "jszip": "^3.10.1", "lit": "^2.7.2", "npm-run-all": "^4.1.5", "pwa-helpers": "^0.9.1", diff --git a/package.json b/package.json index 3c254e92df..46f8945bcd 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "clean": "npm run clean --workspaces", "build": "npm run build --workspaces", "serve": "./node_modules/.bin/http-server -c-1", - "update:package-lock": "npm install && npm run clean && node ./scripts/postinstall.js" + "update:package-lock": "npm install --save && npm run clean && node ./scripts/postinstall.js" }, "husky": { "hooks": { @@ -23,7 +23,11 @@ "url": "git+https://github.com/google/model-viewer.git" }, "workspaces": [ - "./packages/*" + "./packages/model-viewer", + "./packages/model-viewer-effects", + "./packages/modelviewer.dev", + "./packages/render-fidelity-tools", + "./packages/space-opera" ], "author": "DevXR Contributors", "license": "Apache-2.0", diff --git a/packages/model-viewer-effects/package.json b/packages/model-viewer-effects/package.json index 47fe2a809e..3cacf54a0f 100644 --- a/packages/model-viewer-effects/package.json +++ b/packages/model-viewer-effects/package.json @@ -85,7 +85,7 @@ "@types/chai": "^4.3.1", "@types/mocha": "^9.1.1", "@types/pngjs": "^6.0.1", - "@types/three": "^0.152.1", + "@types/three": "^0.154.0", "@ungap/event-target": "^0.2.3", "@web/test-runner": "^0.16.1", "@web/test-runner-playwright": "^0.10.0", diff --git a/packages/model-viewer/package.json b/packages/model-viewer/package.json index 70d9704327..15daadc8a4 100644 --- a/packages/model-viewer/package.json +++ b/packages/model-viewer/package.json @@ -95,7 +95,7 @@ "@types/chai": "^4.3.1", "@types/mocha": "^9.1.1", "@types/pngjs": "^6.0.1", - "@types/three": "^0.152.1", + "@types/three": "^0.154.0", "@ungap/event-target": "^0.2.3", "@web/test-runner": "^0.16.1", "@web/test-runner-playwright": "^0.10.0", diff --git a/packages/render-fidelity-tools/package.json b/packages/render-fidelity-tools/package.json index 7aaf09c59d..afb053d6d1 100644 --- a/packages/render-fidelity-tools/package.json +++ b/packages/render-fidelity-tools/package.json @@ -35,7 +35,7 @@ "@types/pngjs": "^3.4.0", "@types/puppeteer": "^5.4.6", "@types/rimraf": "^3.0.1", - "@types/three": "^0.148.0", + "@types/three": "^0.154.0", "filament": "1.31.5", "http-server": "^14.1.1", "lit": "^2.7.2", diff --git a/packages/space-opera/package.json b/packages/space-opera/package.json index b9f4475dd2..5228bf88f4 100644 --- a/packages/space-opera/package.json +++ b/packages/space-opera/package.json @@ -61,7 +61,7 @@ "gltf-validator": "^2.0.0-dev.3.5", "http-server": "^14.1.1", "js-beautify": "^1.14.0", - "jszip": "^3.6.0", + "jszip": "^3.10.1", "lit": "^2.7.2", "npm-run-all": "^4.1.5", "pwa-helpers": "^0.9.1", diff --git a/packages/space-opera/rollup.config.js b/packages/space-opera/rollup.config.js index e8f4018f9b..1f3a49f8d1 100644 --- a/packages/space-opera/rollup.config.js +++ b/packages/space-opera/rollup.config.js @@ -18,16 +18,13 @@ import commonjs from '@rollup/plugin-commonjs'; import resolve from '@rollup/plugin-node-resolve'; -const watchFiles = [ - 'lib/**', - '../model-viewer/lib/**' -]; +const watchFiles = ['lib/**', '../model-viewer/lib/**']; const plugins = [ { resolveId: (id) => { if (id === 'jszip') { - return './node_modules/jszip/dist/jszip.min.js'; + return '../../node_modules/jszip/dist/jszip.min.js'; } return null; },