Skip to content

Commit b8d6b32

Browse files
elalishelalish
authored
update rollup (#4921)
1 parent d7af231 commit b8d6b32

File tree

10 files changed

+657
-1010
lines changed

10 files changed

+657
-1010
lines changed

‎package-lock.json‎

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

‎packages/model-viewer-effects/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "@google/model-viewer-effects",
3+
"type": "module",
34
"version": "1.4.0",
45
"description": "Easily add and combine post-processing effects with <model-viewer>!",
56
"repository": "https://github.com/google/model-viewer/tree/master/packages/model-viewer-effects",
@@ -79,9 +80,9 @@
7980
},
8081
"devDependencies": {
8182
"@google/model-viewer": "^4.0.0",
82-
"@rollup/plugin-commonjs": "^22.0.1",
83-
"@rollup/plugin-node-resolve": "^13.3.0",
84-
"@rollup/plugin-replace": "^4.0.0",
83+
"@rollup/plugin-commonjs": "^28.0.1",
84+
"@rollup/plugin-node-resolve": "^15.3.0",
85+
"@rollup/plugin-replace": "^6.0.1",
8586
"@types/chai": "^4.3.1",
8687
"@types/mocha": "^9.1.1",
8788
"@types/pngjs": "^6.0.1",
@@ -95,11 +96,11 @@
9596
"http-server": "^14.1.1",
9697
"mocha": "^10.0.0",
9798
"npm-run-all": "^4.1.5",
98-
"rollup": "^2.77.2",
99+
"rollup": "^4.24.0",
99100
"rollup-plugin-cleanup": "^3.2.1",
100-
"rollup-plugin-dts": "^4.2.2",
101+
"rollup-plugin-dts": "^6.1.1",
101102
"rollup-plugin-polyfill": "^3.0.0",
102-
"rollup-plugin-terser": "^7.0.2",
103+
"@rollup/plugin-terser": "^0.4.4",
103104
"three": "^0.169.0",
104105
"typescript": "4.8.4"
105106
},

‎packages/model-viewer-effects/rollup.config.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
* limitations under the License.
1414
*/
1515

16-
const { nodeResolve: resolve } = require('@rollup/plugin-node-resolve');
17-
const replace = require('@rollup/plugin-replace');
18-
const cleanup = require('rollup-plugin-cleanup');
19-
const { terser } = require('rollup-plugin-terser');
20-
const commonjs = require('@rollup/plugin-commonjs');
21-
const polyfill = require('rollup-plugin-polyfill');
16+
import commonjs from '@rollup/plugin-commonjs';
17+
import {nodeResolve as resolve} from '@rollup/plugin-node-resolve';
18+
import replace from '@rollup/plugin-replace';
19+
import terser from '@rollup/plugin-terser';
20+
import cleanup from 'rollup-plugin-cleanup';
2221
import dts from 'rollup-plugin-dts';
22+
import polyfill from 'rollup-plugin-polyfill';
2323

24-
const { NODE_ENV } = process.env;
24+
const {NODE_ENV} = process.env;
2525

2626
const onwarn = (warning, warn) => {
2727
// Suppress non-actionable warning caused by TypeScript boilerplate:
@@ -30,7 +30,7 @@ const onwarn = (warning, warn) => {
3030
}
3131
};
3232

33-
let plugins = [resolve(), replace({ 'Reflect.decorate': 'undefined' })];
33+
let plugins = [resolve(), replace({'Reflect.decorate': 'undefined'})];
3434

3535
const watchFiles = ['lib/**'];
3636

‎packages/model-viewer/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
"three": "^0.169.0"
9191
},
9292
"devDependencies": {
93-
"@rollup/plugin-commonjs": "^22.0.1",
94-
"@rollup/plugin-node-resolve": "^13.3.0",
95-
"@rollup/plugin-replace": "^4.0.0",
93+
"@rollup/plugin-commonjs": "^28.0.1",
94+
"@rollup/plugin-node-resolve": "^15.3.0",
95+
"@rollup/plugin-replace": "^6.0.1",
9696
"@types/chai": "^4.3.1",
9797
"@types/mocha": "^9.1.1",
9898
"@types/pngjs": "^6.0.1",
@@ -104,15 +104,15 @@
104104
"http-server": "^14.1.1",
105105
"mocha": "^10.0.0",
106106
"npm-run-all": "^4.1.5",
107-
"rollup": "^2.77.2",
107+
"rollup": "^4.24.0",
108108
"rollup-plugin-cleanup": "^3.2.1",
109-
"rollup-plugin-dts": "^4.2.2",
109+
"rollup-plugin-dts": "^6.1.1",
110110
"rollup-plugin-polyfill": "^3.0.0",
111-
"rollup-plugin-terser": "^7.0.2",
111+
"@rollup/plugin-terser": "^0.4.4",
112112
"typescript": "4.8.4",
113113
"three": "^0.169.0"
114114
},
115115
"publishConfig": {
116116
"access": "public"
117117
}
118-
}
118+
}

‎packages/model-viewer/rollup.config.js‎

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
* limitations under the License.
1414
*/
1515

16-
const { nodeResolve: resolve } = require('@rollup/plugin-node-resolve');
17-
const replace = require('@rollup/plugin-replace');
18-
const cleanup = require('rollup-plugin-cleanup');
19-
const { terser } = require('rollup-plugin-terser');
20-
const commonjs = require('@rollup/plugin-commonjs');
21-
const polyfill = require('rollup-plugin-polyfill');
16+
import commonjs from '@rollup/plugin-commonjs';
17+
import {nodeResolve as resolve} from '@rollup/plugin-node-resolve';
18+
import replace from '@rollup/plugin-replace';
19+
import terser from '@rollup/plugin-terser';
20+
import cleanup from 'rollup-plugin-cleanup';
2221
import dts from 'rollup-plugin-dts';
22+
import polyfill from 'rollup-plugin-polyfill';
2323

24-
const { NODE_ENV } = process.env;
24+
const {NODE_ENV} = process.env;
2525

2626
const onwarn = (warning, warn) => {
2727
// Suppress non-actionable warning caused by TypeScript boilerplate:
@@ -30,40 +30,39 @@ const onwarn = (warning, warn) => {
3030
}
3131
};
3232

33-
let commonPlugins = [
34-
resolve({ dedupe: 'three' }),
35-
replace({ 'Reflect.decorate': 'undefined' })
36-
];
33+
let commonPlugins =
34+
[resolve({dedupe: 'three'}), replace({'Reflect.decorate': 'undefined'})];
3735

3836
const watchFiles = ['lib/**'];
3937

40-
const createModelViewerOutput = (file, format, plugins = commonPlugins, external = []) => {
41-
const globals = external.reduce((acc, mod) => {
42-
acc[mod] = mod; // Assuming global variable names are the same as module names
43-
return acc;
44-
}, {});
38+
const createModelViewerOutput =
39+
(file, format, plugins = commonPlugins, external = []) => {
40+
const globals = external.reduce((acc, mod) => {
41+
acc[mod] =
42+
mod; // Assuming global variable names are the same as module names
43+
return acc;
44+
}, {});
4545

46-
return {
47-
input: './lib/model-viewer.js',
48-
output: {
49-
file,
50-
format,
51-
sourcemap: true,
52-
name: 'ModelViewerElement',
53-
globals
54-
},
55-
external,
56-
watch: {
57-
include: watchFiles
58-
},
59-
plugins,
60-
onwarn
61-
};
62-
};
46+
return {
47+
input: './lib/model-viewer.js',
48+
output: {
49+
file,
50+
format,
51+
sourcemap: true,
52+
name: 'ModelViewerElement',
53+
globals
54+
},
55+
external,
56+
watch: {include: watchFiles},
57+
plugins,
58+
onwarn
59+
};
60+
};
6361

6462
const outputOptions = [
6563
createModelViewerOutput('./dist/model-viewer.js', 'esm'),
66-
createModelViewerOutput('./dist/model-viewer-module.js', 'esm', commonPlugins, ['three'])
64+
createModelViewerOutput(
65+
'./dist/model-viewer-module.js', 'esm', commonPlugins, ['three'])
6766
];
6867

6968
if (NODE_ENV !== 'development') {
@@ -82,20 +81,28 @@ if (NODE_ENV !== 'development') {
8281
// IE11 does not support modules, so they are removed here, as well as in a
8382
// dedicated unit test build which is needed for the same reason.
8483
outputOptions.push(
85-
createModelViewerOutput('./dist/model-viewer-umd.js', 'umd', pluginsIE11),
84+
createModelViewerOutput('./dist/model-viewer-umd.js', 'umd', pluginsIE11),
8685
/** Bundled w/o three */
87-
createModelViewerOutput('./dist/model-viewer-module-umd.js', 'umd', pluginsIE11, ['three'])
88-
);
86+
createModelViewerOutput(
87+
'./dist/model-viewer-module-umd.js', 'umd', pluginsIE11, ['three']));
8988

9089
// Minified Versions
9190
const minifiedPlugins = [...commonPlugins, terser()];
9291

9392
outputOptions.push(
94-
createModelViewerOutput('./dist/model-viewer.min.js', 'esm', minifiedPlugins),
95-
createModelViewerOutput('./dist/model-viewer-umd.min.js', 'umd', minifiedPlugins),
96-
createModelViewerOutput('./dist/model-viewer-module.min.js', 'esm', minifiedPlugins, ['three']),
97-
createModelViewerOutput('./dist/model-viewer-module-umd.min.js', 'umd', minifiedPlugins, ['three'])
98-
);
93+
createModelViewerOutput(
94+
'./dist/model-viewer.min.js', 'esm', minifiedPlugins),
95+
createModelViewerOutput(
96+
'./dist/model-viewer-umd.min.js', 'umd', minifiedPlugins),
97+
createModelViewerOutput(
98+
'./dist/model-viewer-module.min.js',
99+
'esm',
100+
minifiedPlugins,
101+
['three']),
102+
createModelViewerOutput(
103+
'./dist/model-viewer-module-umd.min.js', 'umd', minifiedPlugins, [
104+
'three'
105+
]));
99106

100107
outputOptions.push({
101108
input: './lib/model-viewer.d.ts',

‎packages/modelviewer.dev/package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "@google/model-viewer-docs",
3+
"type": "module",
34
"private": true,
45
"version": "0.0.1",
56
"description": "<model-viewer> web site and live documentation",
@@ -32,9 +33,9 @@
3233
"prismjs": "^1.24.1"
3334
},
3435
"devDependencies": {
35-
"rollup": "^2.77.2",
36-
"@rollup/plugin-node-resolve": "^13.3.0",
37-
"@rollup/plugin-replace": "^4.0.0",
36+
"rollup": "^4.24.0",
37+
"@rollup/plugin-node-resolve": "^15.3.0",
38+
"@rollup/plugin-replace": "^6.0.1",
3839
"typescript": "4.8.4"
3940
}
4041
}

‎packages/modelviewer.dev/rollup.config.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* limitations under the License.
1414
*/
1515

16-
const {nodeResolve: resolve} = require('@rollup/plugin-node-resolve');
17-
const replace = require('@rollup/plugin-replace');
16+
import {nodeResolve as resolve} from '@rollup/plugin-node-resolve';
17+
import replace from '@rollup/plugin-replace';
1818

1919
const onwarn = (warning, warn) => {
2020
// Suppress non-actionable warning caused by TypeScript boilerplate:
@@ -25,7 +25,8 @@ const onwarn = (warning, warn) => {
2525

2626
const plugins = [resolve(), replace({'Reflect.decorate': 'undefined'})];
2727

28-
const watchFiles = ['lib/**', '../model-viewer/lib/**', '../model-viewer-effects/lib/**'];
28+
const watchFiles =
29+
['lib/**', '../model-viewer/lib/**', '../model-viewer-effects/lib/**'];
2930

3031
const outputOptions = [
3132
{

‎packages/render-fidelity-tools/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
"yargs": "^17.7.2"
3939
},
4040
"devDependencies": {
41-
"@rollup/plugin-commonjs": "^28.0.0",
41+
"@rollup/plugin-commonjs": "^28.0.1",
4242
"@rollup/plugin-node-resolve": "^15.3.0",
4343
"@rollup/plugin-replace": "^6.0.1",
4444
"@types/yargs": "^17.0.29",
4545
"polymer-build": "^3.1.4",
46-
"rollup": "^2.77.2",
47-
"rollup-plugin-external-globals": "^0.6.1",
46+
"rollup": "^4.24.0",
47+
"rollup-plugin-external-globals": "^0.12.0",
4848
"typescript": "4.8.4"
4949
}
5050
}

‎packages/render-fidelity-tools/rollup.config.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* limitations under the License.
1414
*/
1515

16-
const {nodeResolve: resolve} = require('@rollup/plugin-node-resolve');
17-
const replace = require('@rollup/plugin-replace');
18-
const externalGlobals = require('rollup-plugin-external-globals');
19-
const {basename} = require('path');
20-
const commonjs = require('@rollup/plugin-commonjs')
16+
import commonjs from '@rollup/plugin-commonjs';
17+
import {nodeResolve as resolve} from '@rollup/plugin-node-resolve';
18+
import replace from '@rollup/plugin-replace';
19+
import {basename} from 'path';
20+
import externalGlobals from 'rollup-plugin-external-globals';
2121

2222
const onwarn = (warning, warn) => {
2323
// Suppress non-actionable warning caused by TypeScript boilerplate:

‎packages/space-opera/package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "@google/model-viewer-space-opera",
3+
"type": "module",
34
"private": true,
45
"version": "0.0.1",
56
"description": "An interactive, client-side web UI for editing GLBs and model-viewer attributes.",
@@ -49,8 +50,8 @@
4950
"@polymer/paper-listbox": "^3.0.1",
5051
"@polymer/paper-slider": "^3.0.1",
5152
"@reduxjs/toolkit": "^1.6.0",
52-
"@rollup/plugin-commonjs": "^19.0.0",
53-
"@rollup/plugin-node-resolve": "^13.0.0",
53+
"@rollup/plugin-commonjs": "^28.0.1",
54+
"@rollup/plugin-node-resolve": "^15.3.0",
5455
"@types/remote-redux-devtools": "^0.5.5",
5556
"@gltf-transform/core": "^2.5.1",
5657
"@gltf-transform/extensions": "^2.5.1",
@@ -68,7 +69,7 @@
6869
"qrious": "^4.0.2",
6970
"redux": "^4.1.0",
7071
"remote-redux-devtools": "^0.5.16",
71-
"rollup": "^2.77.2",
72+
"rollup": "^4.24.0",
7273
"simple-dropzone": "^0.8.1",
7374
"ts-closure-library": "^2019.11.1-1.21",
7475
"typescript": "4.8.4",

0 commit comments

Comments
 (0)