Fixed importing in Node ESM (#3029)

* Fixed importing in Node ESM * Fixed macro types * rerun preconstruct fix * remove redundant .default files
emotion-js · May 4, 2023 · eed5e6c · eed5e6c
1 parent e6e5b3d
commit eed5e6c
Show file tree

Hide file tree

Showing 32 changed files with 203 additions and 56 deletions.
diff --git a/.changeset/perfect-otters-compete.md b/.changeset/perfect-otters-compete.md
@@ -0,0 +1,27 @@
+---
+'@emotion/babel-plugin': patch
+'@emotion/babel-plugin-jsx-pragmatic': patch
+'@emotion/babel-preset-css-prop': patch
+'@emotion/cache': patch
+'@emotion/css': patch
+'@emotion/css-prettifier': patch
+'@emotion/eslint-plugin': patch
+'@emotion/hash': patch
+'@emotion/is-prop-valid': patch
+'@emotion/jest': patch
+'@emotion/memoize': patch
+'@emotion/native': patch
+'@emotion/primitives': patch
+'@emotion/primitives-core': patch
+'@emotion/react': patch
+'@emotion/serialize': patch
+'@emotion/server': patch
+'@emotion/sheet': patch
+'@emotion/styled': patch
+'@emotion/unitless': patch
+'@emotion/use-insertion-effect-with-fallbacks': patch
+'@emotion/utils': patch
+'@emotion/weak-memoize': patch
+---
+
+Fixed importing in Node ESM
diff --git a/package.json b/package.json
@@ -128,9 +128,8 @@
       "react/jsx-runtime": "ReactJSX",
       "react/jsx-dev-runtime": "ReactJSXDev"
     },
-    "exports": true,
-    "___experimentalFlags_WILL_CHANGE_IN_PATCH": {
-      "exports": true
+    "exports": {
+      "importConditionDefaultExport": "default"
     }
   },
   "bugs": {
@@ -181,7 +180,7 @@
     "@changesets/changelog-github": "^0.4.0",
     "@changesets/cli": "^2.16.0",
     "@manypkg/cli": "^0.19.1",
-    "@preconstruct/cli": "^2.2.1",
+    "@preconstruct/cli": "^2.6.2",
     "@testing-library/react": "13.0.0-alpha.5",
     "@types/jest": "^27.0.3",
     "@types/node": "^12.20.37",

diff --git a/packages/babel-plugin-jsx-pragmatic/package.json b/packages/babel-plugin-jsx-pragmatic/package.json
@@ -7,6 +7,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-babel-plugin-jsx-pragmatic.esm.js",
+      "import": "./dist/emotion-babel-plugin-jsx-pragmatic.cjs.mjs",
       "default": "./dist/emotion-babel-plugin-jsx-pragmatic.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/babel-plugin/package.json b/packages/babel-plugin/package.json
@@ -7,6 +7,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-babel-plugin.esm.js",
+      "import": "./dist/emotion-babel-plugin.cjs.mjs",
       "default": "./dist/emotion-babel-plugin.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/babel-preset-css-prop/package.json b/packages/babel-preset-css-prop/package.json
@@ -7,6 +7,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-babel-preset-css-prop.esm.js",
+      "import": "./dist/emotion-babel-preset-css-prop.cjs.mjs",
       "default": "./dist/emotion-babel-preset-css-prop.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -14,6 +14,7 @@
         "browser": "./dist/emotion-cache.browser.esm.js",
         "default": "./dist/emotion-cache.esm.js"
       },
+      "import": "./dist/emotion-cache.cjs.mjs",
       "default": "./dist/emotion-cache.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/css-prettifier/package.json b/packages/css-prettifier/package.json
@@ -11,6 +11,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-css-prettifier.esm.js",
+      "import": "./dist/emotion-css-prettifier.cjs.mjs",
       "default": "./dist/emotion-css-prettifier.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/css/macro.d.mts b/packages/css/macro.d.mts
@@ -0,0 +1 @@
+export * from './macro.js'
diff --git a/packages/css/package.json b/packages/css/package.json
@@ -9,9 +9,7 @@
     "src",
     "dist",
     "types",
-    "macro.js",
-    "macro.d.ts",
-    "macro.js.flow",
+    "macro.*",
     "create-instance"
   ],
   "scripts": {
@@ -46,14 +44,22 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-css.esm.js",
+      "import": "./dist/emotion-css.cjs.mjs",
       "default": "./dist/emotion-css.cjs.js"
     },
     "./create-instance": {
       "module": "./create-instance/dist/emotion-css-create-instance.esm.js",
+      "import": "./create-instance/dist/emotion-css-create-instance.cjs.mjs",
       "default": "./create-instance/dist/emotion-css-create-instance.cjs.js"
     },
     "./package.json": "./package.json",
-    "./macro": "./macro.js"
+    "./macro": {
+      "types": {
+        "import": "./macro.d.mts",
+        "default": "./macro.d.ts"
+      },
+      "default": "./macro.js"
+    }
   },
   "preconstruct": {
     "umdName": "emotion",
@@ -63,7 +69,13 @@
     ],
     "exports": {
       "extra": {
-        "./macro": "./macro.js"
+        "./macro": {
+          "types": {
+            "import": "./macro.d.mts",
+            "default": "./macro.d.ts"
+          },
+          "default": "./macro.js"
+        }
       }
     }
   }

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -14,6 +14,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-eslint-plugin.esm.js",
+      "import": "./dist/emotion-eslint-plugin.cjs.mjs",
       "default": "./dist/emotion-eslint-plugin.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/hash/package.json b/packages/hash/package.json
@@ -22,6 +22,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-hash.esm.js",
+      "import": "./dist/emotion-hash.cjs.mjs",
       "default": "./dist/emotion-hash.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/is-prop-valid/package.json b/packages/is-prop-valid/package.json
@@ -28,6 +28,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-is-prop-valid.esm.js",
+      "import": "./dist/emotion-is-prop-valid.cjs.mjs",
       "default": "./dist/emotion-is-prop-valid.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -7,18 +7,22 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-jest.esm.js",
+      "import": "./dist/emotion-jest.cjs.mjs",
       "default": "./dist/emotion-jest.cjs.js"
     },
     "./enzyme": {
       "module": "./enzyme/dist/emotion-jest-enzyme.esm.js",
+      "import": "./enzyme/dist/emotion-jest-enzyme.cjs.mjs",
       "default": "./enzyme/dist/emotion-jest-enzyme.cjs.js"
     },
     "./serializer": {
       "module": "./serializer/dist/emotion-jest-serializer.esm.js",
+      "import": "./serializer/dist/emotion-jest-serializer.cjs.mjs",
       "default": "./serializer/dist/emotion-jest-serializer.cjs.js"
     },
     "./enzyme-serializer": {
       "module": "./enzyme-serializer/dist/emotion-jest-enzyme-serializer.esm.js",
+      "import": "./enzyme-serializer/dist/emotion-jest-enzyme-serializer.cjs.mjs",
       "default": "./enzyme-serializer/dist/emotion-jest-enzyme-serializer.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/memoize/package.json b/packages/memoize/package.json
@@ -25,6 +25,7 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-memoize.esm.js",
+      "import": "./dist/emotion-memoize.cjs.mjs",
       "default": "./dist/emotion-memoize.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/native/macro.d.mts b/packages/native/macro.d.mts
@@ -0,0 +1,3 @@
+import styled from '@emotion/native'
+export * from '@emotion/native'
+export default styled
diff --git a/packages/native/macro.d.ts b/packages/native/macro.d.ts
@@ -0,0 +1,3 @@
+import styled from '@emotion/native'
+export * from '@emotion/native'
+export default styled
diff --git a/packages/native/package.json b/packages/native/package.json
@@ -7,10 +7,17 @@
   "exports": {
     ".": {
       "module": "./dist/emotion-native.esm.js",
+      "import": "./dist/emotion-native.cjs.mjs",
       "default": "./dist/emotion-native.cjs.js"
     },
     "./package.json": "./package.json",
-    "./macro": "./macro.js"
+    "./macro": {
+      "types": {
+        "import": "./macro.d.mts",
+        "default": "./macro.d.ts"
+      },
+      "default": "./macro.js"
+    }
   },
   "scripts": {
     "test:typescript": "dtslint types"
@@ -19,7 +26,7 @@
     "src",
     "dist",
     "types/*.d.ts",
-    "macro.js"
+    "macro.*"
   ],
   "types": "types/index.d.ts",
   "devDependencies": {
@@ -55,7 +62,13 @@
   "preconstruct": {
     "exports": {
       "extra": {
-        "./macro": "./macro.js"
+        "./macro": {
+          "types": {
+            "import": "./macro.d.mts",
+            "default": "./macro.d.ts"
+          },
+          "default": "./macro.js"
+        }
       }
     }
   }

diff --git a/packages/primitives-core/package.json b/packages/primitives-core/package.json
@@ -46,6 +46,7 @@
         "browser": "./dist/emotion-primitives-core.browser.esm.js",
         "default": "./dist/emotion-primitives-core.esm.js"
       },
+      "import": "./dist/emotion-primitives-core.cjs.mjs",
       "default": "./dist/emotion-primitives-core.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/primitives/package.json b/packages/primitives/package.json
@@ -6,7 +6,7 @@
   "files": [
     "src",
     "dist",
-    "macro.js"
+    "macro.*"
   ],
   "dependencies": {
     "@emotion/babel-plugin": "^11.10.6",
@@ -49,6 +49,7 @@
         "browser": "./dist/emotion-primitives.browser.esm.js",
         "default": "./dist/emotion-primitives.esm.js"
       },
+      "import": "./dist/emotion-primitives.cjs.mjs",
       "default": "./dist/emotion-primitives.cjs.js"
     },
     "./package.json": "./package.json",

diff --git a/packages/react/macro.d.mts b/packages/react/macro.d.mts
@@ -0,0 +1 @@
+export * from './macro.js'
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -13,6 +13,7 @@
         "browser": "./dist/emotion-react.browser.esm.js",
         "default": "./dist/emotion-react.esm.js"
       },
+      "import": "./dist/emotion-react.cjs.mjs",
       "default": "./dist/emotion-react.cjs.js"
     },
     "./jsx-runtime": {
@@ -21,6 +22,7 @@
         "browser": "./jsx-runtime/dist/emotion-react-jsx-runtime.browser.esm.js",
         "default": "./jsx-runtime/dist/emotion-react-jsx-runtime.esm.js"
       },
+      "import": "./jsx-runtime/dist/emotion-react-jsx-runtime.cjs.mjs",
       "default": "./jsx-runtime/dist/emotion-react-jsx-runtime.cjs.js"
     },
     "./_isolated-hnrs": {
@@ -29,6 +31,7 @@
         "browser": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.browser.esm.js",
         "default": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.esm.js"
       },
+      "import": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.cjs.mjs",
       "default": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.cjs.js"
     },
     "./jsx-dev-runtime": {
@@ -37,11 +40,18 @@
         "browser": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.browser.esm.js",
         "default": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.esm.js"
       },
+      "import": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.cjs.mjs",
       "default": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.cjs.js"
     },
     "./package.json": "./package.json",
     "./types/css-prop": "./types/css-prop.d.ts",
-    "./macro": "./macro.js"
+    "./macro": {
+      "types": {
+        "import": "./macro.d.mts",
+        "default": "./macro.d.ts"
+      },
+      "default": "./macro.js"
+    }
   },
   "types": "types/index.d.ts",
   "files": [
@@ -51,9 +61,7 @@
     "jsx-dev-runtime",
     "_isolated-hnrs",
     "types/*.d.ts",
-    "macro.js",
-    "macro.d.ts",
-    "macro.js.flow"
+    "macro.*"
   ],
   "sideEffects": false,
   "author": "Emotion Contributors",
@@ -110,7 +118,13 @@
       ],
       "extra": {
         "./types/css-prop": "./types/css-prop.d.ts",
-        "./macro": "./macro.js"
+        "./macro": {
+          "types": {
+            "import": "./macro.d.mts",
+            "default": "./macro.d.ts"
+          },
+          "default": "./macro.js"
+        }
       }
     }
   }

diff --git a/packages/serialize/package.json b/packages/serialize/package.json
@@ -38,6 +38,7 @@
         "browser": "./dist/emotion-serialize.browser.esm.js",
         "default": "./dist/emotion-serialize.esm.js"
       },
+      "import": "./dist/emotion-serialize.cjs.mjs",
       "default": "./dist/emotion-serialize.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -61,13 +61,15 @@
         "browser": "./dist/emotion-server.browser.esm.js",
         "default": "./dist/emotion-server.esm.js"
       },
+      "import": "./dist/emotion-server.cjs.mjs",
       "default": "./dist/emotion-server.cjs.js"
     },
     "./create-instance": {
       "module": {
         "browser": "./create-instance/dist/emotion-server-create-instance.browser.esm.js",
         "default": "./create-instance/dist/emotion-server-create-instance.esm.js"
       },
+      "import": "./create-instance/dist/emotion-server-create-instance.cjs.mjs",
       "default": "./create-instance/dist/emotion-server-create-instance.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/sheet/package.json b/packages/sheet/package.json
@@ -13,6 +13,7 @@
         "browser": "./dist/emotion-sheet.browser.esm.js",
         "default": "./dist/emotion-sheet.esm.js"
       },
+      "import": "./dist/emotion-sheet.cjs.mjs",
       "default": "./dist/emotion-sheet.cjs.js"
     },
     "./package.json": "./package.json"

diff --git a/packages/styled/macro.d.mts b/packages/styled/macro.d.mts
@@ -0,0 +1,3 @@
+import styled from '@emotion/styled'
+export * from '@emotion/styled'
+export default styled
diff --git a/packages/styled/macro.d.ts b/packages/styled/macro.d.ts
@@ -1,5 +1,3 @@
-declare module '@emotion/styled/macro' {
-  import styled from '@emotion/styled'
-  export * from '@emotion/styled'
-  export default styled
-}
+import styled from '@emotion/styled'
+export * from '@emotion/styled'
+export default styled