From b9148736e79d999fabb315c1a41758ea90c10e7c Mon Sep 17 00:00:00 2001 From: Ludwig Schubert Date: Tue, 11 Feb 2020 14:39:25 -0800 Subject: [PATCH] fix rollup configs to prvent hanging on CI --- package.json | 2 +- rollup.config.common.js | 81 +++++++++++++++++++++++ rollup.config.dev.js | 78 +++++----------------- rollup.config.js => rollup.config.prod.js | 22 +----- 4 files changed, 100 insertions(+), 83 deletions(-) create mode 100644 rollup.config.common.js rename rollup.config.js => rollup.config.prod.js (55%) diff --git a/package.json b/package.json index 3262943..05d8f96 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "serve": "http-server", "test": "mocha", "lint": "eslint", - "build": "rollup -c rollup.config.js", + "build": "rollup -c rollup.config.prod.js", "prepare": "npm run build" }, "repository": { diff --git a/rollup.config.common.js b/rollup.config.common.js new file mode 100644 index 0000000..0951ce2 --- /dev/null +++ b/rollup.config.common.js @@ -0,0 +1,81 @@ +// Copyright 2018 The Distill Template Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import resolve from "rollup-plugin-node-resolve"; +import string from "rollup-plugin-string"; +import commonjs from "rollup-plugin-commonjs"; +import buble from "rollup-plugin-buble"; +import babili from "rollup-plugin-babili"; + +// uncomment to show dependencies [1/2] +// import rollupGrapher from 'rollup-plugin-grapher' + +const defaultConfig = { + sourcemap: true, + plugins: [ + resolve({ + jsnext: true, + browser: true + }), + commonjs(), + string({ + include: ["**/*.txt", "**/*.svg", "**/*.html", "**/*.css", "**/*.base64"] + }) + ] +}; + +const componentsConfig = { + input: "src/components.js", + output: [{ format: "umd", name: "dl", file: "dist/template.v2.js" }] +}; + +const transformsConfig = { + input: "src/transforms.js", + output: [ + { + format: "umd", + name: "dl", + file: "dist/transforms.v2.js", + globals: { fs: "fs" } + } + ], + external: ["fs"] +}; + +Object.assign(componentsConfig, defaultConfig); +Object.assign(transformsConfig, defaultConfig); + +// transpile transforms so the node render script works… +transformsConfig.plugins.push( + buble({ + target: { node: 6 } + }) +); + +componentsConfig.plugins.push( + babili({ + comments: false, // means: *remove* comments + sourceMap: true + }) +); + +// uncomment to show dependencies [2/2] +// transformsConfig.plugins.push( +// rollupGrapher({ +// dest: '/dev/null', +// verbose: true +// }) +// ); + +export default [componentsConfig, transformsConfig]; diff --git a/rollup.config.dev.js b/rollup.config.dev.js index cb7dde5..7796042 100644 --- a/rollup.config.dev.js +++ b/rollup.config.dev.js @@ -12,72 +12,26 @@ // See the License for the specific language governing permissions and // limitations under the License. -import resolve from "rollup-plugin-node-resolve"; -import string from "rollup-plugin-string"; -import commonjs from "rollup-plugin-commonjs"; -import buble from "rollup-plugin-buble"; +import configs from "./rollup.config.common"; +import babili from "rollup-plugin-babili"; import serve from "rollup-plugin-serve"; -// uncomment to show dependencies [1/2] -// import rollupGrapher from 'rollup-plugin-grapher' +const [componentsConfig, transformsConfig] = configs; -const componentsConfig = { - input: "src/components.js", - output: [{ format: "umd", name: "dl", file: "dist/template.v2.js" }] -}; - -const transformsConfig = { - input: "src/transforms.js", - output: [ - { - format: "umd", - name: "dl", - file: "dist/transforms.v2.js", - globals: { fs: "fs" } - } - ], - external: ["fs"] -}; - -const defaultConfig = { - sourcemap: true, - plugins: [ - resolve({ - jsnext: true, - browser: true - }), - commonjs(), - string({ - include: ["**/*.txt", "**/*.svg", "**/*.html", "**/*.css", "**/*.base64"] - }), - serve({ - open: true, - openPage: "/examples/index.html", - contentBase: ["dist", "examples"], - headers: { - "Access-Control-Allow-Origin": "*" - }, - port: 8088 - }) - ] -}; - -Object.assign(componentsConfig, defaultConfig); -Object.assign(transformsConfig, defaultConfig); - -// transpile transforms so the node render script works… -transformsConfig.plugins.push( - buble({ - target: { node: 6 } +componentsConfig.plugins.push( + babili({ + comments: false, // means: *remove* comments + sourceMap: true + }), + serve({ + open: true, + openPage: "/examples/index.html", + contentBase: ["dist", "examples"], + headers: { + "Access-Control-Allow-Origin": "*" + }, + port: 8088 }) ); -// uncomment to show dependencies [2/2] -// transformsConfig.plugins.push( -// rollupGrapher({ -// dest: '/dev/null', -// verbose: true -// }) -// ); - export default [componentsConfig, transformsConfig]; diff --git a/rollup.config.js b/rollup.config.prod.js similarity index 55% rename from rollup.config.js rename to rollup.config.prod.js index c0e0f04..7b27433 100644 --- a/rollup.config.js +++ b/rollup.config.prod.js @@ -12,24 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import configs from "./rollup.config.dev"; -import babili from "rollup-plugin-babili"; +import configs from "./rollup.config.common"; -function isNotServePlugin(plugin) { - return plugin.name !== "serve"; -} - -for (const config of configs) { - config.plugins = config.plugins.filter(isNotServePlugin); -} - -const [componentsConfig, transformsConfig] = configs; - -componentsConfig.plugins.push( - babili({ - comments: false, // means: *remove* comments - sourceMap: true - }) -); - -export default [componentsConfig, transformsConfig]; +export default configs;