From: Eduardo San Martin Morote <posva@users.noreply.github.com>
Date: Thu, 30 Sep 2021 08:29:27 +0000 (+0200)
Subject: build: refactor cjs + mjs (#694)
X-Git-Tag: pinia@2.0.0-rc.10~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1949e5e939b8703ae16c8e91f7d346338254de23;p=thirdparty%2Fvuejs%2Fpinia.git

build: refactor cjs + mjs (#694)
---

diff --git a/packages/pinia/index.js b/packages/pinia/index.js
new file mode 100644
index 00000000..e2b094b3
--- /dev/null
+++ b/packages/pinia/index.js
@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/pinia.cjs.prod.js')
+} else {
+  module.exports = require('./dist/pinia.cjs.js')
+}
diff --git a/packages/pinia/index.mjs b/packages/pinia/index.mjs
new file mode 100644
index 00000000..fcb9204c
--- /dev/null
+++ b/packages/pinia/index.mjs
@@ -0,0 +1 @@
+export * from './index.js'
diff --git a/packages/pinia/package.json b/packages/pinia/package.json
index c298f8f3..80dd2541 100644
--- a/packages/pinia/package.json
+++ b/packages/pinia/package.json
@@ -2,17 +2,21 @@
   "name": "pinia",
   "version": "2.0.0-rc.9",
   "description": "Intuitive, type safe and flexible Store for Vue",
-  "main": "dist/pinia.cjs",
-  "module": "dist/pinia.mjs",
+  "main": "index.js",
+  "module": "dist/pinia.esm-bundler.js",
   "unpkg": "dist/pinia.iife.js",
   "jsdelivr": "dist/pinia.iife.js",
   "types": "dist/pinia.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/pinia.mjs",
-      "require": "./dist/pinia.cjs"
+      "import": {
+        "node": "./index.mjs",
+        "default": "./dist/pinia.esm-bundler.js"
+      },
+      "require": "./index.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./dist/*": "./dist/*"
   },
   "sideEffects": false,
   "author": {
@@ -33,6 +37,8 @@
     "dist/*.mjs",
     "dist/*.cjs",
     "dist/pinia.d.ts",
+    "index.js",
+    "index.mjs",
     "LICENSE",
     "README.md"
   ],
diff --git a/rollup.config.js b/rollup.config.js
index c6b30209..fa144fb7 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -46,17 +46,13 @@ const outputConfigs = {
     format: `es`,
   },
   cjs: {
-    file: pkg.main,
+    file: pkg.module.replace('esm-bundler', 'cjs'),
     format: `cjs`,
   },
   global: {
     file: pkg.unpkg,
     format: `iife`,
   },
-  esm: {
-    file: pkg.module.replace('.mjs', '.browser.js'),
-    format: `es`,
-  },
 }
 
 const allFormats = Object.keys(outputConfigs)
@@ -196,9 +192,7 @@ function createReplacePlugin(
 }
 
 function getProdFileName(format, name) {
-  return format === 'cjs'
-    ? `dist/${name}.prod.cjs`
-    : `dist/${name}.${format}.prod.js`
+  return `dist/${name}.${format}.prod.js`
 }
 
 function createProductionConfig(format) {