Fix import rewrites for CJS and ES builds

timdorr · timdorr · commit afebe674caff · 2018-09-28T10:15:53.000-04:00
diff --git a/packages/react-router-config/modules/.babelrc b/packages/react-router-config/modules/.babelrc
@@ -6,7 +6,15 @@
         "dev-expression",
         "transform-class-properties",
         ["transform-object-rest-spread", { "useBuiltIns": true }],
-        "transform-export-default"
+        "transform-export-default",
+        [
+          "transform-imports",
+          {
+            "react-router": {
+              "transform": "react-router/${member}"
+            }
+          }
+        ]
       ]
     },
     "build-esm": {
@@ -15,7 +23,15 @@
         "dev-expression",
         "transform-class-properties",
         ["transform-object-rest-spread", { "useBuiltIns": true }],
-        "transform-export-default"
+        "transform-export-default",
+        [
+          "transform-imports",
+          {
+            "react-router": {
+              "transform": "react-router/es/${member}"
+            }
+          }
+        ]
       ]
     },
     "test": {
diff --git a/packages/react-router-dom/modules/.babelrc b/packages/react-router-dom/modules/.babelrc
@@ -6,7 +6,15 @@
         "dev-expression",
         "transform-class-properties",
         ["transform-object-rest-spread", { "useBuiltIns": true }],
-        "transform-export-default"
+        "transform-export-default",
+        [
+          "transform-imports",
+          {
+            "react-router": {
+              "transform": "react-router/${member}"
+            }
+          }
+        ]
       ]
     },
     "build-esm": {
@@ -20,7 +28,7 @@
           "transform-imports",
           {
             "react-router": {
-              "transform": "react-router/modules/${member}"
+              "transform": "react-router/es/${member}"
             }
           }
         ]

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,15 @@`
`6`	`6`	`"dev-expression",`
`7`	`7`	`"transform-class-properties",`
`8`	`8`	`["transform-object-rest-spread", { "useBuiltIns": true }],`
`9`		`- "transform-export-default"`
	`9`	`+ "transform-export-default",`
	`10`	`+ [`
	`11`	`+ "transform-imports",`
	`12`	`+ {`
	`13`	`+ "react-router": {`
	`14`	`+ "transform": "react-router/${member}"`
	`15`	`+ }`
	`16`	`+ }`
	`17`	`+ ]`
`10`	`18`	`]`
`11`	`19`	`},`
`12`	`20`	`"build-esm": {`
`@@ -20,7 +28,7 @@`
`20`	`28`	`"transform-imports",`
`21`	`29`	`{`
`22`	`30`	`"react-router": {`
`23`		`- "transform": "react-router/modules/${member}"`
	`31`	`+ "transform": "react-router/es/${member}"`
`24`	`32`	`}`
`25`	`33`	`}`
`26`	`34`	`]`