From: 三咲智子 Kevin Deng <sxzz@sxzz.moe>
Date: Fri, 1 Dec 2023 00:16:50 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/minor'
X-Git-Tag: v3.6.0-alpha.1~16^2~774
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d28d57bd3f4cfb3e1f6ce8e99c443669f886f9f6;p=thirdparty%2Fvuejs%2Fcore.git

Merge remote-tracking branch 'upstream/minor'
---

d28d57bd3f4cfb3e1f6ce8e99c443669f886f9f6
diff --cc rollup.config.js
index 59e6924daf,b7d38e4527..eb1902234f
--- a/rollup.config.js
+++ b/rollup.config.js
@@@ -150,43 -148,9 +148,43 @@@ function createConfig(format, output, p
    // Rollup to complain for non-ESM targets, so we use separate entries for
    // esm vs. non-esm builds.
    if (isCompatPackage && (isBrowserESMBuild || isBundlerESMBuild)) {
 -    entryFile = /runtime$/.test(format)
 -      ? `src/esm-runtime.ts`
 -      : `src/esm-index.ts`
 +    entryFile = `esm-${entryFile}`
 +  }
 +  entryFile = 'src/' + entryFile
 +
 +  return {
 +    input: resolve(entryFile),
 +    // Global and Browser ESM builds inlines everything so that they can be
 +    // used alone.
 +    external: resolveExternal(),
 +    plugins: [
 +      json({
 +        namedExports: false
 +      }),
 +      alias({
 +        entries
 +      }),
 +      enumPlugin,
 +      ...resolveReplace(),
 +      esbuild({
 +        tsconfig: path.resolve(__dirname, 'tsconfig.json'),
 +        sourceMap: output.sourcemap,
 +        minify: false,
 +        target: isServerRenderer || isNodeBuild ? 'es2019' : 'es2015',
 +        define: resolveDefine()
 +      }),
 +      ...resolveNodePlugins(),
 +      ...plugins
 +    ],
 +    output,
 +    onwarn(msg, warn) {
-       if (!/Circular/.test(msg.message)) {
++      if (msg.code !== 'CIRCULAR_DEPENDENCY') {
 +        warn(msg)
 +      }
 +    },
 +    treeshake: {
 +      moduleSideEffects: false
 +    }
    }
  
    function resolveDefine() {
@@@ -337,15 -301,47 +335,12 @@@
  
      return nodePlugins
    }
 -
 -  return {
 -    input: resolve(entryFile),
 -    // Global and Browser ESM builds inlines everything so that they can be
 -    // used alone.
 -    external: resolveExternal(),
 -    plugins: [
 -      json({
 -        namedExports: false
 -      }),
 -      alias({
 -        entries
 -      }),
 -      enumPlugin,
 -      ...resolveReplace(),
 -      esbuild({
 -        tsconfig: path.resolve(__dirname, 'tsconfig.json'),
 -        sourceMap: output.sourcemap,
 -        minify: false,
 -        target: isServerRenderer || isNodeBuild ? 'es2019' : 'es2015',
 -        define: resolveDefine()
 -      }),
 -      ...resolveNodePlugins(),
 -      ...plugins
 -    ],
 -    output,
 -    onwarn: (msg, warn) => {
 -      if (msg.code !== 'CIRCULAR_DEPENDENCY') {
 -        warn(msg)
 -      }
 -    },
 -    treeshake: {
 -      moduleSideEffects: false
 -    }
 -  }
  }
  
- /**
-  * @param {Format} format
-  */
- function createProductionConfig(format) {
+ function createProductionConfig(/** @type {PackageFormat} */ format) {
    return createConfig(format, {
 -    file: resolve(`dist/${name}.${format}.prod.js`),
 -    format: outputConfigs[format].format
 +    ...outputConfigs[format],
 +    file: resolve(`dist/${name}.${format}.prod.js`)
    })
  }
  
diff --cc tsconfig.build.json
index 43161f91fd,954103c0f2..c3be791568
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@@ -10,9 -10,6 +10,7 @@@
      "packages/runtime-test",
      "packages/template-explorer",
      "packages/sfc-playground",
 -    "packages/dts-test"
 +    "packages/dts-test",
-     "rollup.config.js",
-     "scripts/*",
 +    "playground"
    ]
  }
diff --cc tsconfig.json
index 931831bda6,f47b7fc8eb..ced7bbc1ea
--- a/tsconfig.json
+++ b/tsconfig.json
@@@ -35,8 -34,7 +35,8 @@@
      "packages/*/__tests__",
      "packages/dts-test",
      "packages/vue/jsx-runtime",
+     "scripts/*",
 -    "rollup.*.js"
 +    "rollup.*.js",
 +    "playground"
-   ],
-   "exclude": ["rollup.config.js"]
+   ]
  }