Przeglądaj źródła

build(deps): upgrade rollup@2 to rollup@3 (#6990)

* build(deps): upgrade rollup@2 to rollup@3

Signed-off-by: JayFate <37610029@qq.com>

* build(rollup): move rollup.config.js to rollup.config.mjs

Signed-off-by: JayFate <37610029@qq.com>

Signed-off-by: JayFate <37610029@qq.com>
JayFate 3 lat temu
rodzic
commit
f2c46ed9cf
3 zmienionych plików z 261 dodań i 179 usunięć
  1. 10 8
      package.json
  2. 233 158
      pnpm-lock.yaml
  3. 18 13
      rollup.config.mjs

+ 10 - 8
package.json

@@ -56,15 +56,16 @@
     "@babel/types": "^7.12.0",
     "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
     "@microsoft/api-extractor": "~7.20.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-json": "^4.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-replace": "^2.3.4",
+    "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-json": "^5.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-replace": "^5.0.1",
     "@types/hash-sum": "^1.0.0",
     "@types/jest": "^27.0.1",
     "@types/node": "^16.4.7",
     "@types/puppeteer": "^5.0.0",
     "@typescript-eslint/parser": "^5.23.0",
+    "@vue/consolidate": "0.17.3",
     "@vue/reactivity": "workspace:*",
     "@vue/runtime-core": "workspace:*",
     "@vue/runtime-dom": "workspace:*",
@@ -85,13 +86,14 @@
     "minimist": "^1.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
-    "puppeteer": "^10.0.0",
-    "rollup": "~2.38.5",
+    "pug": "^3.0.1",
+    "puppeteer": "^10.4.0",
+    "rollup": "~3.2.3",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.4.0",
-    "rollup-plugin-polyfill-node": "^0.6.2",
+    "rollup-plugin-polyfill-node": "^0.11.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.27.2",
+    "rollup-plugin-typescript2": "^0.34.1",
     "semver": "^7.3.2",
     "serve": "^12.0.0",
     "terser": "^5.15.1",

Plik diff jest za duży
+ 233 - 158
pnpm-lock.yaml


+ 18 - 13
rollup.config.js → rollup.config.mjs

@@ -1,16 +1,29 @@
 // @ts-check
+import { createRequire } from 'module'
+import { fileURLToPath } from 'url'
 import path from 'path'
 import ts from 'rollup-plugin-typescript2'
 import replace from '@rollup/plugin-replace'
 import json from '@rollup/plugin-json'
+import chalk from 'chalk'
+import commonJS from '@rollup/plugin-commonjs'
+import polyfillNode from 'rollup-plugin-polyfill-node'
+import { nodeResolve } from '@rollup/plugin-node-resolve'
+import { terser } from 'rollup-plugin-terser'
 
 if (!process.env.TARGET) {
   throw new Error('TARGET package must be specified via --environment flag.')
 }
 
+const require = createRequire(import.meta.url)
+const __dirname = fileURLToPath(new URL('.', import.meta.url))
+
 const masterVersion = require('./package.json').version
+const consolidatePkg = require('@vue/consolidate/package.json')
+
 const packagesDir = path.resolve(__dirname, 'packages')
 const packageDir = path.resolve(packagesDir, process.env.TARGET)
+
 const resolve = p => path.resolve(packageDir, p)
 const pkg = require(resolve(`package.json`))
 const packageOptions = pkg.buildOptions || {}
@@ -76,7 +89,7 @@ export default packageConfigs
 
 function createConfig(format, output, plugins = []) {
   if (!output) {
-    console.log(require('chalk').yellow(`invalid format: "${format}"`))
+    console.log(chalk.yellow(`invalid format: "${format}"`))
     process.exit(1)
   }
 
@@ -153,11 +166,8 @@ function createConfig(format, output, plugins = []) {
   // requires a ton of template engines which should be ignored.
   let cjsIgnores = []
   if (pkg.name === '@vue/compiler-sfc') {
-    const consolidatePath = require.resolve('@vue/consolidate/package.json', {
-      paths: [packageDir]
-    })
     cjsIgnores = [
-      ...Object.keys(require(consolidatePath).devDependencies),
+      ...Object.keys(consolidatePkg.devDependencies),
       'vm',
       'crypto',
       'react-dom/server',
@@ -172,16 +182,12 @@ function createConfig(format, output, plugins = []) {
     (format === 'cjs' && Object.keys(pkg.devDependencies || {}).length) ||
     packageOptions.enableNonBrowserBranches
       ? [
-          // @ts-ignore
-          require('@rollup/plugin-commonjs')({
+          commonJS({
             sourceMap: false,
             ignore: cjsIgnores
           }),
-          ...(format === 'cjs'
-            ? []
-            : // @ts-ignore
-              [require('rollup-plugin-polyfill-node')()]),
-          require('@rollup/plugin-node-resolve').nodeResolve()
+          ...(format === 'cjs' ? [] : [polyfillNode()]),
+          nodeResolve()
         ]
       : []
 
@@ -301,7 +307,6 @@ function createProductionConfig(format) {
 }
 
 function createMinifiedConfig(format) {
-  const { terser } = require('rollup-plugin-terser')
   return createConfig(
     format,
     {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików