diff --git a/package.json b/package.json index 165bf2ba1..e1522523f 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,6 @@ "prettier": "^3.0.0", "rollup": "4.24.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-re": "1.0.7", "rollup-plugin-typescript2": "0.36.0", "size-limit": "^8.2.4", "typedoc": "0.26.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 06fc7b0ad..28951950a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -120,9 +120,6 @@ importers: rollup-plugin-delete: specifier: ^2.0.0 version: 2.1.0(rollup@4.24.0) - rollup-plugin-re: - specifier: 1.0.7 - version: 1.0.7 rollup-plugin-typescript2: specifier: 0.36.0 version: 0.36.0(rollup@4.24.0)(typescript@5.6.2) @@ -1981,9 +1978,6 @@ packages: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} - estree-walker@0.6.1: - resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==} - estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} @@ -2519,9 +2513,6 @@ packages: lunr@2.3.9: resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} - magic-string@0.16.0: - resolution: {integrity: sha512-c4BEos3y6G2qO0B9X7K0FVLOPT9uGrjYwYRLFmDqyl5YMboUviyecnXWp94fJTSMwPw2/sf+CEYt5AGpmklkkQ==} - magic-string@0.30.10: resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} @@ -2922,18 +2913,12 @@ packages: peerDependencies: rollup: '*' - rollup-plugin-re@1.0.7: - resolution: {integrity: sha512-TyFf3QaV/eJ/50k4wp5BM0SodGy0Idq0uOgvA1q3gHRwgXLPVX5y3CRKkBuHzKTZPC9CTZX7igKw5UvgjDls8w==} - rollup-plugin-typescript2@0.36.0: resolution: {integrity: sha512-NB2CSQDxSe9+Oe2ahZbf+B4bh7pHwjV5L+RSYpCu7Q5ROuN94F9b6ioWwKfz3ueL3KTtmX4o2MUH2cgHDIEUsw==} peerDependencies: rollup: '>=1.26.3' typescript: '>=2.4.0' - rollup-pluginutils@2.8.2: - resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==} - rollup@4.24.0: resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -3281,8 +3266,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.7.0-dev.20241002: - resolution: {integrity: sha512-FHahwICnaTEQZYVLpDwZdoy/lgPn30O+XQ5VbNGk1UQojnr60qb2XgoPOfohDBojGtQGL5iilNhThM4gLxaMjQ==} + typescript@5.7.0-dev.20241006: + resolution: {integrity: sha512-XbEUvmjO3pXSwKpsgTKNHLRROzF2K1tSdqiyRPKwJfv84gPU0H6AjRwvaAaYC9D/6+Hpen0bQLLC0uaGePRHTQ==} engines: {node: '>=14.17'} hasBin: true @@ -3423,9 +3408,6 @@ packages: jsdom: optional: true - vlq@0.2.3: - resolution: {integrity: sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==} - w3c-xmlserializer@5.0.0: resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==} engines: {node: '>=18'} @@ -5511,7 +5493,7 @@ snapshots: dependencies: semver: 7.6.0 shelljs: 0.8.5 - typescript: 5.7.0-dev.20241002 + typescript: 5.7.0-dev.20241006 electron-to-chromium@1.5.4: {} @@ -5801,8 +5783,6 @@ snapshots: estraverse@5.3.0: {} - estree-walker@0.6.1: {} - estree-walker@2.0.2: {} estree-walker@3.0.3: @@ -6371,10 +6351,6 @@ snapshots: lunr@2.3.9: {} - magic-string@0.16.0: - dependencies: - vlq: 0.2.3 - magic-string@0.30.10: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -6746,11 +6722,6 @@ snapshots: del: 5.1.0 rollup: 4.24.0 - rollup-plugin-re@1.0.7: - dependencies: - magic-string: 0.16.0 - rollup-pluginutils: 2.8.2 - rollup-plugin-typescript2@0.36.0(rollup@4.24.0)(typescript@5.6.2): dependencies: '@rollup/pluginutils': 4.2.1 @@ -6761,10 +6732,6 @@ snapshots: tslib: 2.7.0 typescript: 5.6.2 - rollup-pluginutils@2.8.2: - dependencies: - estree-walker: 0.6.1 - rollup@4.24.0: dependencies: '@types/estree': 1.0.6 @@ -7127,7 +7094,7 @@ snapshots: typescript@5.6.2: {} - typescript@5.7.0-dev.20241002: {} + typescript@5.7.0-dev.20241006: {} uc.micro@2.1.0: {} @@ -7272,8 +7239,6 @@ snapshots: - supports-color - terser - vlq@0.2.3: {} - w3c-xmlserializer@5.0.0: dependencies: xml-name-validator: 5.0.0 diff --git a/rollup.config.js b/rollup.config.js index a87f441d0..d8a0b3362 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -5,7 +5,6 @@ import json from '@rollup/plugin-json'; import { nodeResolve } from '@rollup/plugin-node-resolve'; import terser from '@rollup/plugin-terser'; import del from 'rollup-plugin-delete'; -import replace from 'rollup-plugin-re'; import typescript from 'rollup-plugin-typescript2'; import packageJson from './package.json'; @@ -55,18 +54,6 @@ export default { plugins: [ del({ targets: 'dist/*' }), typescript({ tsconfig: './tsconfig.json' }), - ...commonPlugins, - replace({ - patterns: [ - { - // protobuf.js uses `eval` to determine whether a module is present or not - // in most modern browsers this will fail anyways due to CSP, and it's safer to just replace it with `undefined` - // until this PR is merged: https://github.com/protobufjs/protobuf.js/pull/1548 - // related discussion: https://github.com/protobufjs/protobuf.js/issues/593 - test: /eval.*\(moduleName\);/g, - replace: 'undefined;', - }, - ], - }), + ...commonPlugins ], }; diff --git a/vite.config.mjs b/vite.config.mjs index e4644821a..5353c45fb 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -2,7 +2,6 @@ import { babel } from '@rollup/plugin-babel'; import dns from 'dns'; import { resolve } from 'path'; -import replace from 'rollup-plugin-re'; import { defineConfig } from 'vite'; dns.setDefaultResultOrder('verbatim'); @@ -34,18 +33,6 @@ export default defineConfig({ presets: ['@babel/preset-env'], extensions: ['.js', '.ts', '.mjs'], }), - replace({ - patterns: [ - { - // protobuf.js uses `eval` to determine whether a module is present or not - // in most modern browsers this will fail anyways due to CSP, and it's safer to just replace it with `undefined` - // until this PR is merged: https://github.com/protobufjs/protobuf.js/pull/1548 - // related discussion: https://github.com/protobufjs/protobuf.js/issues/593 - test: /eval.*\(moduleName\);/g, - replace: 'undefined;', - }, - ], - }), ], }, },