From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 16 Aug 2022 10:04:49 +0000 (+0200)
Subject: fix(build): production mjs import
X-Git-Tag: v4.1.4~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53f720622aa273e33c05517fa917cdcfbfba52bc;p=thirdparty%2Fvuejs%2Frouter.git

fix(build): production mjs import

Fix #1516
---

diff --git a/packages/router/package.json b/packages/router/package.json
index 8dbac949..ccb3889d 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -11,7 +11,7 @@
       "types": "./dist/vue-router.d.ts",
       "node": {
         "import": {
-          "production": "./dist/vue-router.prod.cjs",
+          "production": "./dist/vue-router.node.mjs",
           "development": "./dist/vue-router.node.mjs",
           "default": "./dist/vue-router.node.mjs"
         },
diff --git a/packages/router/rollup.config.js b/packages/router/rollup.config.js
index d5d73d38..d79038a6 100644
--- a/packages/router/rollup.config.js
+++ b/packages/router/rollup.config.js
@@ -80,7 +80,7 @@ function createConfig(buildName, output, plugins = []) {
   const isProductionBuild = /\.prod\.[cm]?js$/.test(output.file)
   const isGlobalBuild = buildName === 'global'
   const isRawESMBuild = buildName === 'browser'
-  const isNodeBuild = buildName === 'cjs'
+  const isNodeBuild = output.file.includes('.node.') || buildName === 'cjs'
   const isBundlerESMBuild = buildName === 'mjs'
 
   if (isGlobalBuild) output.name = 'VueRouter'
@@ -204,8 +204,8 @@ function createReplacePlugin(
 }
 
 function createProductionConfig(format) {
-  const extension = format === 'cjs' ? 'cjs' : 'js'
-  const descriptor = format === 'cjs' ? '' : `.${format}`
+  const extension = format === 'cjs' || format === 'mjs' ? format : 'js'
+  const descriptor = format === 'cjs' || format === 'mjs' ? '' : `.${format}`
   return createConfig(format, {
     file: `dist/${name}${descriptor}.prod.${extension}`,
     format: outputConfigs[format].format,
diff --git a/packages/router/src/global.d.ts b/packages/router/src/global.d.ts
index bb649e5a..e5206cd2 100644
--- a/packages/router/src/global.d.ts
+++ b/packages/router/src/global.d.ts
@@ -3,4 +3,5 @@ declare var __DEV__: boolean
 declare var __TEST__: boolean
 declare var __FEATURE_PROD_DEVTOOLS__: boolean
 declare var __BROWSER__: boolean
+declare var __NODE_JS__: boolean
 declare var __CI__: boolean