fix: simplify build

salesforce · Jul 18, 2018 · 13bd2ee · 13bd2ee
1 parent 11e83ee
commit 13bd2ee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "observable-membrane",
   "version": "0.25.0",
   "description": "A Javascript Membrane implementation using Proxies to observe mutation on an object graph",
-  "main": "dist/commonjs/observable-membrane.js",
+  "main": "dist/umd/observable-membrane.js",
   "module": "dist/modules/observable-membrane.js",
   "license": "MIT",
   "author": "David Turissini <dturissini@salesforce.com>",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,28 +1,19 @@
-/* eslint-env node */
-
+// -- Modules -----------------------------------------------------------------
 const path = require('path');
 const typescript = require('rollup-plugin-typescript');
 const replace = require('rollup-plugin-replace');
 const babelMinify = require('babel-minify');
 const { version } = require('./package.json');
 
+// -- Config ------------------------------------------------------------------
 const input = path.resolve(__dirname, 'src/main.ts');
-const umdDirectory = path.resolve(__dirname, 'dist/umd');
-const commonJSDirectory = path.resolve(__dirname, 'dist/commonjs');
-const modulesDirectory = path.resolve(__dirname, 'dist/modules');
-
-const name = 'ObservableMembrane';
-
+const umdDir = path.resolve(__dirname, 'dist/umd');
+const modulesDir = path.resolve(__dirname, 'dist/modules');
 const banner = (`/**\n * Copyright (C) 2017 salesforce.com, inc.\n */`);
 const footer = `/** version: ${version} */`;
+const prodToken = JSON.stringify('production');
 
-const baseRollupConfig = {
-    input,
-    name,
-    banner,
-    footer,
-};
-
+// -- Helpers -----------------------------------------------------------------
 function inlineMinifyPlugin() {
     return {
         transformBundle(code) {
@@ -34,34 +25,29 @@ function inlineMinifyPlugin() {
 function rollupConfig({ formats, prod }) {
     const plugins = [
         typescript({ target: 'es6', typescript: require('typescript') }),
-        prod && replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
+        prod && replace({ 'process.env.NODE_ENV': prodToken }),
         prod && inlineMinifyPlugin({})
     ].filter(Boolean);
 
     const output = formats.map(format => {
-        const targetDirectory = format === 'umd' ? umdDirectory :  format === 'es' ? modulesDirectory : commonJSDirectory;
-
-        const targetName = [
-            'observable-membrane',
-            prod ? '.min' : '',
-            '.js'
-        ].join('');
+        const targetDirectory = format === 'umd' ? umdDir : modulesDir;
+        const targetName = `observable-membrane${prod ? '.min' : '' }.js`;
 
         return {
             name: 'ObservableMembrane',
-            format,
             file: path.join(targetDirectory, targetName),
+            format,
+            banner,
+            footer
         }
     });
 
-    return Object.assign({}, baseRollupConfig, {
-        output,
-        plugins
-    });
+    return { input, output, plugins };
 }
 
+// -- Rollup ------------------------------------------------------------------
+
 module.exports = [
-    // DEV & PROD
-    rollupConfig({ formats: ['umd', 'cjs', 'es'], prod: false }),
+    rollupConfig({ formats: ['umd', 'es'], prod: false }),
     rollupConfig({ formats: ['umd'], prod: true })
 ];