Add type: module

Author: perrin4869

packages/react-router-dom/package.json

@@ -9,20 +9,21 @@
     "directory": "packages/react-router-dom"
   },
   "license": "MIT",
-  "main": "./main.js",
+  "main": "./main.cjs",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {
     ".": {
       "node": {
-        "require": "./main.js",
-        "import": "./index.mjs"
+        "require": "./index.cjs",
+        "import": "./index.js"
       },
+      "types": "./index.d.ts",
       "default": "./index.js"
     },
     "./server": {
-      "require": "./server.js",
-      "import": "./server.mjs"
+      "require": "./server.cjs",
+      "import": "./server.js"
     },
     "./package.json": "./package.json"
   },

packages/react-router/package.json

@@ -9,15 +9,16 @@
     "directory": "packages/react-router"
   },
   "license": "MIT",
-  "main": "./main.js",
+  "main": "./index.cjs",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {
     ".": {
       "node": {
-        "require": "./main.js",
-        "import": "./index.mjs"
+        "require": "./index.cjs",
+        "import": "./index.js"
       },
+      "types": "./index.d.ts",
       "default": "./index.js"
     },
     "./package.json": "./package.json"

rollup.config.js

@@ -24,6 +24,13 @@ function getVersion(sourceDir) {
   return require(`./${sourceDir}/package.json`).version;
 }
 
+function addTypeModule(contents) {
+  return JSON.stringify({
+    type: "module",
+    ...JSON.parse(contents.toString()),
+  }, null, 2);
+}
+
 function reactRouter() {
   const SOURCE_DIR = "packages/react-router";
   const OUTPUT_DIR = "build/node_modules/react-router";
@@ -33,20 +40,12 @@ function reactRouter() {
   const modules = [
     {
       input: `${SOURCE_DIR}/index.tsx`,
-      output: [
-        {
-          file: `${OUTPUT_DIR}/index.js`,
-          format: "esm",
-          sourcemap: !PRETTY,
-          banner: createBanner("React Router", version)
-        },
-        {
-          file: `${OUTPUT_DIR}/index.mjs`,
-          format: "esm",
-          sourcemap: !PRETTY,
-          banner: createBanner("React Router", version)
-        }
-      ],
+      output: {
+        file: `${OUTPUT_DIR}/index.js`,
+        format: "esm",
+        sourcemap: !PRETTY,
+        banner: createBanner("React Router", version)
+      },
       external: ["history", "react"],
       plugins: [
         babel({
@@ -61,7 +60,7 @@ function reactRouter() {
         }),
         copy({
           targets: [
-            { src: `${SOURCE_DIR}/package.json`, dest: OUTPUT_DIR },
+            { src: `${SOURCE_DIR}/package.json`, dest: OUTPUT_DIR, transform: addTypeModule },
             { src: `${SOURCE_DIR}/README.md`, dest: OUTPUT_DIR },
             { src: "LICENSE.md", dest: OUTPUT_DIR }
           ],
@@ -208,7 +207,7 @@ function reactRouter() {
     {
       input: `${SOURCE_DIR}/node-main.js`,
       output: {
-        file: `${OUTPUT_DIR}/main.js`,
+        file: `${OUTPUT_DIR}/index.cjs`,
         format: "cjs",
         banner: createBanner("React Router", version)
       },
@@ -228,20 +227,12 @@ function reactRouterDom() {
   const modules = [
     {
       input: `${SOURCE_DIR}/index.tsx`,
-      output: [
-        {
-          file: `${OUTPUT_DIR}/index.js`,
-          format: "esm",
-          sourcemap: !PRETTY,
-          banner: createBanner("React Router DOM", version)
-        },
-        {
-          file: `${OUTPUT_DIR}/index.mjs`,
-          format: "esm",
-          sourcemap: !PRETTY,
-          banner: createBanner("React Router DOM", version)
-        }
-      ],
+      output: {
+        file: `${OUTPUT_DIR}/index.js`,
+        format: "esm",
+        sourcemap: !PRETTY,
+        banner: createBanner("React Router DOM", version)
+      },
       external: ["history", "react", "react-dom", "react-router"],
       plugins: [
         babel({
@@ -256,7 +247,7 @@ function reactRouterDom() {
         }),
         copy({
           targets: [
-            { src: `${SOURCE_DIR}/package.json`, dest: OUTPUT_DIR },
+            { src: `${SOURCE_DIR}/package.json`, dest: OUTPUT_DIR, transform: addTypeModule },
             { src: `${SOURCE_DIR}/README.md`, dest: OUTPUT_DIR },
             { src: "LICENSE.md", dest: OUTPUT_DIR }
           ],
@@ -413,7 +404,7 @@ function reactRouterDom() {
     {
       input: `${SOURCE_DIR}/node-main.js`,
       output: {
-        file: `${OUTPUT_DIR}/main.js`,
+        file: `${OUTPUT_DIR}/index.cjs`,
         format: "cjs",
         banner: createBanner("React Router DOM", version)
       },
@@ -422,7 +413,7 @@ function reactRouterDom() {
     {
       input: `${SOURCE_DIR}/server.tsx`,
       output: {
-        file: `${OUTPUT_DIR}/server.js`,
+        file: `${OUTPUT_DIR}/server.cjs`,
         format: "cjs"
       },
       external: [
@@ -449,7 +440,7 @@ function reactRouterDom() {
     {
       input: `${SOURCE_DIR}/server.tsx`,
       output: {
-        file: `${OUTPUT_DIR}/server.mjs`,
+        file: `${OUTPUT_DIR}/server.js`,
         format: "esm"
       },
       external: [

yarn.lock

@@ -4476,10 +4476,10 @@ history@^5.0.0:
   dependencies:
     "@babel/runtime" "^7.7.6"
 
-history@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.npmjs.org/history/-/history-5.0.3.tgz#23d0b3046f695623c95a870506545e2b67e82edb"
-  integrity sha512-LoyCVOpCBkNAgrsdpTDZP77fys7lFDg8JdxTr7s6GHueZbTplKf8NAJu3y6/QuJIjk6TFsEGrhtILVP814X8+A==
+history@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/history/-/history-5.1.0.tgz#2e93c09c064194d38d52ed62afd0afc9d9b01ece"
+  integrity sha512-zPuQgPacm2vH2xdORvGGz1wQMuHSIB56yNAy5FnLuwOwgSYyPKptJtcMm6Ev+hRGeS+GzhbmRacHzvlESbFwDg==
   dependencies:
     "@babel/runtime" "^7.7.6"