diff --git a/package.json b/package.json index 7bd020e52..994cdbec8 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "jest-serializer-html": "^4.0.1", "jsdom": "^11.3.0", "lerna": "^2.2.0", - "lerna-alias": "^3.0.0", + "lerna-alias": "^3.0.1", "module-alias": "^2.0.1", "npm-run-all": "^4.0.2", "polished": "^1.2.1", diff --git a/rollup.config.js b/rollup.config.js index b3564e014..b4bc2fc95 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -5,6 +5,7 @@ import babel from 'rollup-plugin-babel' import alias from 'rollup-plugin-alias' import cjs from 'rollup-plugin-commonjs' import path from 'path' +import { rollup as lernaAliases } from 'lerna-alias' const pkg = require(path.resolve(process.cwd(), './package.json')) @@ -53,22 +54,7 @@ const mainConfig = Object.assign({}, baseConfig, { }) const umdConfig = Object.assign({}, baseConfig, { - plugins: basePlugins.concat( - alias({ - emotion: path.resolve(__dirname, './packages/emotion/src/index.js'), - 'emotion-utils': path.resolve( - __dirname, - './packages/emotion-utils/src/index.js' - ), - 'create-emotion': path.resolve( - __dirname, - './packages/create-emotion/src/index.js' - ), - 'create-emotion-styled': path.resolve( - __dirname, - './packages/create-emotion-styled/src/index.js' - ) - }), + plugins: [alias(lernaAliases())].concat(basePlugins).concat( replace({ 'process.env.NODE_ENV': JSON.stringify('production') }), diff --git a/yarn.lock b/yarn.lock index fc261435b..8742280f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6163,9 +6163,9 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -lerna-alias@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lerna-alias/-/lerna-alias-3.0.0.tgz#3e1cce3e83463fcfa42c5486d19d8edfe4035afb" +lerna-alias@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lerna-alias/-/lerna-alias-3.0.1.tgz#dfdf2f692ebc778792425ebd66b7b9418c8c96ba" dependencies: glob "^7.1.2"