Change some stuff

emotion-js · emmatown · Jul 2, 2018 · May 5, 2018 · May 5, 2018 · Jun 28, 2018
commit df609e9016b3f06c2a1e0b91fa0ed08ebbbeaf41
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /coverage
 /demo/dist
 dist/
-lib/
 node_modules/
 *.log
 .idea

diff --git a/packages/babel-plugin-emotion/lib/macro-styled.js b/packages/babel-plugin-emotion/lib/macro-styled.js
@@ -0,0 +1 @@
+module.exports = require('babel-plugin-emotion').macros.styled
diff --git a/packages/babel-plugin-emotion/lib/macro.js b/packages/babel-plugin-emotion/lib/macro.js
@@ -0,0 +1 @@
+module.exports = require('babel-plugin-emotion').macros.emotion
diff --git a/packages/babel-plugin-emotion/package.json b/packages/babel-plugin-emotion/package.json
@@ -2,7 +2,7 @@
   "name": "babel-plugin-emotion",
   "version": "9.2.4",
   "description": "A recommended babel preprocessing plugin for emotion, The Next Generation of CSS-in-JS.",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "files": [
     "src",
     "lib"

diff --git a/packages/babel-plugin-emotion/src/index.js b/packages/babel-plugin-emotion/src/index.js
@@ -29,9 +29,10 @@ import { getExpressionsFromTemplateLiteral } from '@emotion/babel-utils'
 
 export type BabelPath = any
 
-export const emotionMacro = require('./macro')
-
-export const styledMacro = require('./macro-styled')
+export const macros = {
+  emotion: require('./macro'),
+  styled: require('./macro-styled')
+}
 
 export function hashArray(arr: Array<string>) {
   return hashString(arr.join(''))

diff --git a/packages/babel-plugin-emotion/test/macro/babel-macros-register.js b/packages/babel-plugin-emotion/test/macro/babel-macros-register.js
@@ -1,9 +1,7 @@
 require('babel-register')
 const path = require('path')
 require('module-alias').addAliases({
-  'emotion-utils': path.join(__dirname, '../../../emotion-utils/src'),
-  'react-emotion/macro': path.join(__dirname, '../../src/macro-styled'),
-  'emotion/macro': path.join(__dirname, '../../src/macro')
+  'babel-plugin-emotion': path.join(__dirname, '../../src')
 })
 
 module.exports = require('babel-plugin-macros')
diff --git a/packages/create-emotion-server/package.json b/packages/create-emotion-server/package.json
@@ -2,7 +2,7 @@
   "name": "create-emotion-server",
   "version": "9.2.4",
   "description": "SSR and style extraction tooling for emotion, The Next Generation of CSS-in-JS.",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "types": "types/index.d.ts",
   "files": [
     "src",

diff --git a/packages/emotion-server/package.json b/packages/emotion-server/package.json
@@ -2,7 +2,7 @@
   "name": "emotion-server",
   "version": "9.2.4",
   "description": "Extract and inline critical css with emotion for server side rendering.",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "types": "types/index.d.ts",
   "files": [
     "src",

diff --git a/packages/emotion/macro.js b/packages/emotion/macro.js
@@ -1 +1 @@
-module.exports = require('babel-plugin-emotion').emotionMacro
+module.exports = require('babel-plugin-emotion').macros.emotion
diff --git a/packages/jest-emotion/package.json b/packages/jest-emotion/package.json
@@ -2,7 +2,7 @@
   "name": "jest-emotion",
   "version": "9.2.4",
   "description": "Jest utilities for emotion",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "types": "types/index.d.ts",
   "files": [
     "src",

diff --git a/packages/preact-emotion/macro.js b/packages/preact-emotion/macro.js
@@ -1 +1 @@
-module.exports = require('babel-plugin-emotion').styledMacro
+module.exports = require('babel-plugin-emotion').macros.styled
diff --git a/packages/react-emotion/macro.js b/packages/react-emotion/macro.js
@@ -1 +1 @@
-module.exports = require('babel-plugin-emotion').styledMacro
+module.exports = require('babel-plugin-emotion').macros.styled
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('babel-plugin-emotion').macros.styled
Copy link Member Andarist Jun 30, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. whats the reason behind those 2 "proxy" files? Copy link Member Author emmatown Jun 30, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. In case people have custom instances of emotion and they're using the macros with them since this they were previously imported via `babel-plugin-emotion/lib/macro` and `babel-plugin-emotion/lib/macro-styled` Copy link Member Andarist Jun 30, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. gotcha, maybe add a comment that this can be removed with next major? emmatown reacted with thumbs up emoji
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = require('babel-plugin-emotion').emotionMacro
		module.exports = require('babel-plugin-emotion').macros.emotion