Skip to content

Commit e9c4eaa

Browse files
elalishelalish
authored
update deployments again (#4407)
1 parent e88f462 commit e9c4eaa

File tree

10 files changed

+57
-48
lines changed

10 files changed

+57
-48
lines changed

‎lerna.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎package-lock.json

Lines changed: 34 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"clean": "npm run clean --workspaces",
1212
"build": "npm run build --workspaces",
1313
"serve": "./node_modules/.bin/http-server -c-1",
14-
"update:package-lock": "npm install --save && npm run clean --workspaces && node ./scripts/postinstall.js"
14+
"update:package-lock": "npm exec -y --workspaces -- npx rimraf package_lock.json node_modules && npx rimraf package_lock.json node_modules && npm install --save && npm run clean --workspaces && node ./scripts/postinstall.js"
1515
},
1616
"husky": {
1717
"hooks": {

‎packages/modelviewer.dev/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@
2828
"@types/prismjs": "^1.16.6",
2929
"focus-visible": "^5.2.0",
3030
"lit": "^2.7.2",
31-
"prismjs": "^1.24.1",
32-
"simple-dropzone": "^0.8.1",
33-
"js-beautify": "^1.14.0",
34-
"web-animations-js": "^2.3.2"
31+
"prismjs": "^1.24.1"
3532
},
3633
"devDependencies": {
3734
"rollup": "^2.77.2",

‎packages/modelviewer.dev/scripts/ci-before-deploy.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ DEPLOYABLE_STATIC_FILES=( \
3333
CNAME \
3434
LICENSE \
3535
README.md \
36-
node_modules/@google/model-viewer/dist \
37-
node_modules/@google/model-viewer-effects/dist \
38-
node_modules/js-beautify \
39-
node_modules/web-animations-js \
4036
shared-assets/models/*.* \
4137
shared-assets/models/twitter \
4238
shared-assets/models/glTF-Sample-Models/2.0/2CylinderEngine \
@@ -110,26 +106,32 @@ mkdir -p $DEPLOY_ROOT/node_modules
110106
mkdir -p $DEPLOY_ROOT/node_modules/@google
111107
mkdir -p $DEPLOY_ROOT/node_modules/@google/model-viewer
112108
mkdir -p $DEPLOY_ROOT/node_modules/@google/model-viewer/dist
109+
mkdir -p $DEPLOY_ROOT/node_modules/@google/model-viewer-effects
110+
mkdir -p $DEPLOY_ROOT/node_modules/@google/model-viewer-effects/dist
111+
mkdir -p $DEPLOY_ROOT/node_modules/js-beautify
112+
mkdir -p $DEPLOY_ROOT/node_modules/web-animations-js
113113

114114
mv ../render-fidelity-tools/test/results $DEPLOY_ROOT/fidelity/results
115115
cp ../render-fidelity-tools/test/results-viewer.html $DEPLOY_ROOT/fidelity/index.html
116116
cp ../render-fidelity-tools/dist/* $DEPLOY_ROOT/dist/
117117
cp ../space-opera/editor/index.html $DEPLOY_ROOT/editor/
118118
cp ../space-opera/editor/view/index.html $DEPLOY_ROOT/editor/view/
119119
cp ../space-opera/dist/space-opera.js $DEPLOY_ROOT/dist/
120-
cp ../model-viewer/dist/* $DEPLOY_ROOT/dist/
121-
cp ../model-viewer-effects/dist/* $DEPLOY_ROOT/dist/
122120
cp ../model-viewer/dist/* $DEPLOY_ROOT/node_modules/@google/model-viewer/dist/
123-
cp ../model-viewer-effects/dist/* $DEPLOY_ROOT/node_modules/@google/model-viewer/dist/
121+
cp ../model-viewer-effects/dist/* $DEPLOY_ROOT/node_modules/@google/model-viewer-effects/dist/
122+
cp ../../node_modules/js-beautify/* $DEPLOY_ROOT/node_modules/js-beautify
123+
cp ../../node_modules/web-animations-js/* $DEPLOY_ROOT/node_modules/web-animations-js
124124

125125
FILES_TO_PATCH_WITH_MINIFIED_BUNDLE=($(find $DEPLOY_ROOT \( -type d -name node_modules -prune \) -o -type f | grep \.html))
126126

127127
for file_to_patch in "${FILES_TO_PATCH_WITH_MINIFIED_BUNDLE[@]}"; do
128-
sed -i.bak 's ../../node_modules/@google/model-viewer/dist/model-viewer.js dist/model-viewer.min.js g' $file_to_patch
128+
sed -i.bak 's model-viewer.js model-viewer.min.js g' $file_to_patch
129129
rm $file_to_patch.bak
130-
sed -i.bak 's ../../node_modules/@google/model-viewer/dist/model-viewer-module.js dist/model-viewer-module.min.js g' $file_to_patch
130+
sed -i.bak 's model-viewer-module.js model-viewer-module.min.js g' $file_to_patch
131131
rm $file_to_patch.bak
132-
sed -i.bak 's ../../node_modules/@google/model-viewer-effects/dist/model-viewer-effects.js dist/model-viewer-effects.min.js g' $file_to_patch
132+
sed -i.bak 's model-viewer-effects.js model-viewer-effects.min.js g' $file_to_patch
133+
rm $file_to_patch.bak
134+
sed -i.bak 's ../../node_modules/ node_modules/ g' $file_to_patch
133135
rm $file_to_patch.bak
134136
done
135137

‎packages/render-fidelity-tools/test/renderers/filament/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</filament-viewer>
3434
</renderer-harness>
3535

36-
<script src="../../../node_modules/filament/filament.js"></script>
36+
<script src="../../../../../node_modules/filament/filament.js"></script>
3737
<script type="module" src="../../../dist/renderer-harness.js"></script>
3838
<script type="module" src="../../../dist/filament-viewer.js"></script>
3939
<script>

‎packages/render-fidelity-tools/test/renderers/gltf-sample-viewer/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<script type="module" src="../../../dist/renderer-harness.js"></script>
3737
<script src="https://www.gstatic.com/draco/v1/decoders/draco_decoder_gltf.js"></script>
38-
<script src="../../../node_modules/@khronosgroup/gltf-viewer/dist/libs/libktx.js"></script>
38+
<script src="../../../../../node_modules/@khronosgroup/gltf-viewer/dist/libs/libktx.js"></script>
3939
<script type="module" src="../../../dist/gltf-sample-viewer.js"></script>
4040
<script>
4141
harness.addEventListener('scenario-change', () => {

‎packages/render-fidelity-tools/test/renderers/three-gpu-pathtracer/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<script type="module" src="../../../dist/renderer-harness.js"></script>
3737
<script src="https://www.gstatic.com/draco/v1/decoders/draco_decoder_gltf.js"></script>
38-
<script src="../../../node_modules/@khronosgroup/gltf-viewer/dist/libs/libktx.js"></script>
38+
<script src="../../../../../node_modules/@khronosgroup/gltf-viewer/dist/libs/libktx.js"></script>
3939
<script type="module" src="../../../dist/three-gpu-pathtracer-viewer.js"></script>
4040
<script>
4141
harness.addEventListener('scenario-change', () => {

‎packages/space-opera/editor/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<link rel="shortcut icon" type="image/png" href="../../shared-assets/icons/favicon.png"/>
2626
<script defer src="https://web3dsurvey.com/collector.js"></script>
2727
<!-- Web animations for paper-dropdown -->
28-
<script src="../node_modules/web-animations-js/web-animations-next-lite.min.js"></script>
29-
<script src="../node_modules/js-beautify/js/lib/beautify-html.js"></script>
30-
<script src="../node_modules/js-beautify/js/lib/beautify-css.js"></script>
28+
<script src="../../../node_modules/web-animations-js/web-animations-next-lite.min.js"></script>
29+
<script src="../../../node_modules/js-beautify/js/lib/beautify-html.js"></script>
30+
<script src="../../../node_modules/js-beautify/js/lib/beautify-css.js"></script>
3131
<script>
3232
// Necessary hack for Redux. See: https://github.com/reduxjs/redux/pull/2910
3333
window.process = {

‎packages/space-opera/editor/view/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<link href="https://fonts.googleapis.com/css?family=Material+Icons&display=block" rel="stylesheet">
2525
<link rel="shortcut icon" type="image/png" href="../../../shared-assets/icons/favicon.png"/>
2626
<!-- Web animations for paper-dropdown -->
27-
<script src="../../node_modules/web-animations-js/web-animations-next-lite.min.js"></script>
28-
<script src="../../node_modules/js-beautify/js/lib/beautify-html.js"></script>
29-
<script src="../../node_modules/js-beautify/js/lib/beautify-css.js"></script>
27+
<script src="../../../../node_modules/web-animations-js/web-animations-next-lite.min.js"></script>
28+
<script src="../../../../node_modules/js-beautify/js/lib/beautify-html.js"></script>
29+
<script src="../../../../node_modules/js-beautify/js/lib/beautify-css.js"></script>
3030
<script>
3131
// Necessary hack for Redux. See: https://github.com/reduxjs/redux/pull/2910
3232
window.process = {

0 commit comments

Comments
 (0)