From 08e7c59df06f4f4ae261510e9218e92ed7e8eadb Mon Sep 17 00:00:00 2001 From: Hiroki Itoh Date: Sun, 11 Feb 2024 12:13:48 +0900 Subject: [PATCH] fix: Update rollup https://github.com/rollup/rollup/issues/4213 --- package-lock.json | 224 +++++++++++++++++- packages/app/package.json | 4 +- packages/app/rollup/{c.js => c.mjs} | 0 .../app/rollup/{comment.js => comment.mjs} | 2 +- .../app/rollup/{desktop.js => desktop.mjs} | 2 +- .../rollup/{extension.js => extension.mjs} | 2 +- packages/app/rollup/{server.js => server.mjs} | 2 +- 7 files changed, 229 insertions(+), 7 deletions(-) rename packages/app/rollup/{c.js => c.mjs} (100%) rename packages/app/rollup/{comment.js => comment.mjs} (89%) rename packages/app/rollup/{desktop.js => desktop.mjs} (93%) rename packages/app/rollup/{extension.js => extension.mjs} (94%) rename packages/app/rollup/{server.js => server.mjs} (89%) diff --git a/package-lock.json b/package-lock.json index 0fb16dd..e4a010f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1914,6 +1914,175 @@ "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", "dev": true }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.10.0.tgz", + "integrity": "sha512-/MeDQmcD96nVoRumKUljsYOLqfv1YFJps+0pTrb2Z9Nl/w5qNUysMaWQsrd1mvAlNT4yza1iVyIu4Q4AgF6V3A==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.10.0.tgz", + "integrity": "sha512-lvu0jK97mZDJdpZKDnZI93I0Om8lSDaiPx3OiCk0RXn3E8CMPJNS/wxjAvSJJzhhZpfjXsjLWL8LnS6qET4VNQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.10.0.tgz", + "integrity": "sha512-uFpayx8I8tyOvDkD7X6n0PriDRWxcqEjqgtlxnUA/G9oS93ur9aZ8c8BEpzFmsed1TH5WZNG5IONB8IiW90TQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.10.0.tgz", + "integrity": "sha512-nIdCX03qFKoR/MwQegQBK+qZoSpO3LESurVAC6s6jazLA1Mpmgzo3Nj3H1vydXp/JM29bkCiuF7tDuToj4+U9Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.10.0.tgz", + "integrity": "sha512-Fz7a+y5sYhYZMQFRkOyCs4PLhICAnxRX/GnWYReaAoruUzuRtcf+Qnw+T0CoAWbHCuz2gBUwmWnUgQ67fb3FYw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.10.0.tgz", + "integrity": "sha512-yPtF9jIix88orwfTi0lJiqINnlWo6p93MtZEoaehZnmCzEmLL0eqjA3eGVeyQhMtxdV+Mlsgfwhh0+M/k1/V7Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.10.0.tgz", + "integrity": "sha512-9GW9yA30ib+vfFiwjX+N7PnjTnCMiUffhWj4vkG4ukYv1kJ4T9gHNg8zw+ChsOccM27G9yXrEtMScf1LaCuoWQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.10.0.tgz", + "integrity": "sha512-X1ES+V4bMq2ws5fF4zHornxebNxMXye0ZZjUrzOrf7UMx1d6wMQtfcchZ8SqUnQPPHdOyOLW6fTcUiFgHFadRA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.10.0.tgz", + "integrity": "sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.10.0.tgz", + "integrity": "sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.10.0.tgz", + "integrity": "sha512-NrR6667wlUfP0BHaEIKgYM/2va+Oj+RjZSASbBMnszM9k+1AmliRjHc3lJIiOehtSSjqYiO7R6KLNrWOX+YNSQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.10.0.tgz", + "integrity": "sha512-FV0Tpt84LPYDduIDcXvEC7HKtyXxdvhdAOvOeWMWbQNulxViH2O07QXkT/FffX4FqEI02jEbCJbr+YcuKdyyMg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.10.0.tgz", + "integrity": "sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@sinclair/typebox": { "version": "0.24.51", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", @@ -6279,6 +6448,20 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -9866,6 +10049,7 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", "dev": true, + "peer": true, "bin": { "rollup": "dist/bin/rollup" }, @@ -11688,7 +11872,7 @@ "jest-environment-jsdom": "^28.1.2", "nodemon": "^2.0.16", "react-test-renderer": "^18.1.0", - "rollup": "^2.56.3", + "rollup": "^4.10.0", "rollup-plugin-copy": "^3.4.0", "rollup-plugin-terser": "^7.0.2", "supertest": "^6.1.6", @@ -11702,6 +11886,12 @@ "utf-8-validate": "^5.0.4" } }, + "packages/app/node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, "packages/app/node_modules/@types/node": { "version": "16.11.43", "dev": true, @@ -11715,6 +11905,38 @@ "@types/yargs-parser": "*" } }, + "packages/app/node_modules/rollup": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.10.0.tgz", + "integrity": "sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==", + "dev": true, + "dependencies": { + "@types/estree": "1.0.5" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.10.0", + "@rollup/rollup-android-arm64": "4.10.0", + "@rollup/rollup-darwin-arm64": "4.10.0", + "@rollup/rollup-darwin-x64": "4.10.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.10.0", + "@rollup/rollup-linux-arm64-gnu": "4.10.0", + "@rollup/rollup-linux-arm64-musl": "4.10.0", + "@rollup/rollup-linux-riscv64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-musl": "4.10.0", + "@rollup/rollup-win32-arm64-msvc": "4.10.0", + "@rollup/rollup-win32-ia32-msvc": "4.10.0", + "@rollup/rollup-win32-x64-msvc": "4.10.0", + "fsevents": "~2.3.2" + } + }, "packages/app/node_modules/tslib": { "version": "2.4.0", "dev": true, diff --git a/packages/app/package.json b/packages/app/package.json index 34ed6f9..f9bed7a 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -16,7 +16,7 @@ "watch": "node scripts/watch.mjs", "serve": "node scripts/serve.mjs", "build-comment": "NODE_ENV=production rollup -c rollup/comment.js", - "build-desktop": "rollup -c rollup/desktop.js", + "build-desktop": "rollup -c rollup/desktop.mjs", "build-servers": "NODE_ENV=production rollup -c rollup/server.js", "build-extension": "NODE_ENV=production rollup -c rollup/extension.js", "start-desktop": "electron . --open-dev-tools --verbose", @@ -71,7 +71,7 @@ "jest-environment-jsdom": "^28.1.2", "nodemon": "^2.0.16", "react-test-renderer": "^18.1.0", - "rollup": "^2.56.3", + "rollup": "^4.10.0", "rollup-plugin-copy": "^3.4.0", "rollup-plugin-terser": "^7.0.2", "supertest": "^6.1.6", diff --git a/packages/app/rollup/c.js b/packages/app/rollup/c.mjs similarity index 100% rename from packages/app/rollup/c.js rename to packages/app/rollup/c.mjs diff --git a/packages/app/rollup/comment.js b/packages/app/rollup/comment.mjs similarity index 89% rename from packages/app/rollup/comment.js rename to packages/app/rollup/comment.mjs index a842760..3df976e 100644 --- a/packages/app/rollup/comment.js +++ b/packages/app/rollup/comment.mjs @@ -1,4 +1,4 @@ -import { plugins, onwarn, watch } from './c.js' +import { plugins, onwarn, watch } from './c.mjs' import { mkdirSync } from 'fs' import { apps, toRollupCopyPluginFormat } from '../scripts/apps.mjs' diff --git a/packages/app/rollup/desktop.js b/packages/app/rollup/desktop.mjs similarity index 93% rename from packages/app/rollup/desktop.js rename to packages/app/rollup/desktop.mjs index f0c55c6..eb88c81 100644 --- a/packages/app/rollup/desktop.js +++ b/packages/app/rollup/desktop.mjs @@ -1,4 +1,4 @@ -import { plugins, onwarn, watch, } from './c.js' +import { plugins, onwarn, watch, } from './c.mjs' import { apps, entryPointsToOutFiles } from '../scripts/apps.mjs' const entryPoints = apps.desktop.entryPoints diff --git a/packages/app/rollup/extension.js b/packages/app/rollup/extension.mjs similarity index 94% rename from packages/app/rollup/extension.js rename to packages/app/rollup/extension.mjs index 90e06d9..2cd8d1e 100644 --- a/packages/app/rollup/extension.js +++ b/packages/app/rollup/extension.mjs @@ -1,4 +1,4 @@ -import { plugins, onwarn, watch } from './c.js' +import { plugins, onwarn, watch } from './c.mjs' import { mkdirSync } from 'fs' import { apps, toRollupCopyPluginFormat, entryPointsToOutFiles } from '../scripts/apps.mjs' import path from 'node:path' diff --git a/packages/app/rollup/server.js b/packages/app/rollup/server.mjs similarity index 89% rename from packages/app/rollup/server.js rename to packages/app/rollup/server.mjs index 587fe59..949dd7e 100644 --- a/packages/app/rollup/server.js +++ b/packages/app/rollup/server.mjs @@ -1,4 +1,4 @@ -import { plugins, onwarn, watch } from './c.js' +import { plugins, onwarn, watch } from './c.mjs' import { apps } from '../scripts/apps.mjs' export default [