From 301e2100a1eb5d5966c702d58143115244fae695 Mon Sep 17 00:00:00 2001 From: moklick Date: Wed, 20 Jan 2021 14:35:09 +0100 Subject: [PATCH] refactor(rollup): cleanup tasks --- package.json | 2 +- rollup.config.js | 7 ++++--- rollup.examples.js | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4c953d92..5895297b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "start:examples": "rollup -c rollup.examples.js -w", "build:examples": "rollup -c rollup.examples.js --environment NODE_ENV:production", "dev": "npm run start:examples", - "start:testserver": "npm run build && rollup -c rollup.examples.js -w --environment NODE_ENV:testing", + "start:testserver": "rollup -c --environment NODE_ENV:testing && rollup -c rollup.examples.js -w --environment NODE_ENV:testing", "build:dev": "npm install && npm run build:examples", "dev:wait": "start-server-and-test start:testserver http-get://localhost:3000", "test": "npm run dev:wait test:chrome", diff --git a/rollup.config.js b/rollup.config.js index 329e4943..1f923453 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -10,9 +10,10 @@ import typescript from 'rollup-plugin-typescript2'; import pkg from './package.json'; const isProd = process.env.NODE_ENV === 'production'; -const processEnv = isProd ? 'production' : 'development'; +const isTesting = process.env.NODE_ENV === 'testing'; +const processEnv = isProd || isTesting ? 'production' : 'development'; -const baseConfig = ({ mainFile = pkg.main, moduleFile = pkg.module, injectCSS = true } = {}) => ({ +export const baseConfig = ({ mainFile = pkg.main, moduleFile = pkg.module, injectCSS = true } = {}) => ({ input: 'src/index.ts', external: ['react', 'react-dom', /@babel\/runtime/], onwarn(warning, rollupWarn) { @@ -61,7 +62,7 @@ const baseConfig = ({ mainFile = pkg.main, moduleFile = pkg.module, injectCSS = ], }); -export default isProd +export default isProd && !isTesting ? [ baseConfig(), baseConfig({ diff --git a/rollup.examples.js b/rollup.examples.js index 3c4dd283..b1f6a3c3 100644 --- a/rollup.examples.js +++ b/rollup.examples.js @@ -8,7 +8,7 @@ import postcss from 'rollup-plugin-postcss'; import livereload from 'rollup-plugin-livereload'; import serve from 'rollup-plugin-serve'; -import libraryRollupConfig from './rollup.config.js'; +import { baseConfig } from './rollup.config.js'; const isProd = process.env.NODE_ENV === 'production'; const isTesting = process.env.NODE_ENV === 'testing'; @@ -16,8 +16,8 @@ const isTesting = process.env.NODE_ENV === 'testing'; const serveFiles = !isProd || isTesting; const doLiveReload = !isProd && !isTesting; -const rollupConfig = { - input: ['example/src/index.js'], +const rollupExamplesConfig = { + input: 'example/src/index.js', output: [ { dir: 'example/public/dist', @@ -55,4 +55,4 @@ const rollupConfig = { ], }; -export default isTesting ? rollupConfig : [libraryRollupConfig, rollupConfig]; +export default isTesting ? rollupExamplesConfig : [baseConfig(), rollupExamplesConfig];