pkgbld 1.5.4 → 1.6.0

package/README.md

@@ -73,6 +73,14 @@ pkgbld --dir=dist
 
 Directory to put output files.
 
+### sourcedir
+
+```
+pkgbld --sourcedir=src
+```
+
+Directory to search for input files.
+
 # License
 
 [MIT](./LICENSE)

package/dist/get-cli-options.d.ts

@@ -5,4 +5,5 @@ export declare function getCliOptions(): {
     formats: string[];
     preprocess: string[];
     dir: string;
+    sourceDir: string;
 };

package/dist/get-plugins.d.ts

@@ -1,4 +1,4 @@
 import { InternalModuleFormat, Plugin } from 'rollup';
 import { getCliOptions } from './get-cli-options';
-export declare function getBuildPlugins(format: InternalModuleFormat, config: ReturnType<typeof getCliOptions>): Plugin[];
+export declare function getBuildPlugins(format: InternalModuleFormat, config: ReturnType<typeof getCliOptions>, inputs?: string[], currentInput?: string): Plugin[];
 export declare function getOutputPlugins(format: InternalModuleFormat, config: ReturnType<typeof getCliOptions>): Plugin[];

package/dist/helpers.d.ts

@@ -1,13 +1,12 @@
 import { getCliOptions } from './get-cli-options';
 export declare function getHelpers(pkg: any): {
-    external: (id: string | string[]) => any;
     getGlobalName: (anInput: string) => string;
     getExternalGlobalName: (id: string) => string;
     umdFilter: typeof umdFilter;
 };
 export declare function umdFilter(config: ReturnType<typeof getCliOptions>, filename: string): boolean;
 export declare function toArray<T>(object: T): (T & any[]) | T[];
-export declare function isExternalInput(id: string, inputs: string | string[], currentInput: string): boolean;
+export declare function isExternalInput(id: string, inputs: string | string[], currentInput: string, config: ReturnType<typeof getCliOptions>): boolean;
 export declare function formatInput(input: string[] | string | undefined): string | undefined;
 export declare function formatOutput(output: any, field: string): string | undefined;
 export declare function getTimeDiff(starting: number): string;

package/dist/index.js

@@ -11,8 +11,8 @@ var commonjs = require('@rollup/plugin-commonjs');
 var resolve = require('@rollup/plugin-node-resolve');
 var preprocess = require('rollup-plugin-preprocess');
 var rollupPluginTerser = require('rollup-plugin-terser');
-var clean = require('@rollup-extras/plugin-clean');
-var isBuiltinModule = require('is-builtin-module');
+var cleanFactory = require('@rollup-extras/plugin-clean');
+var externals = require('@rollup-extras/plugin-externals');
 var camelCase = require('lodash/camelCase');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -24,8 +24,8 @@ var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
 var commonjs__default = /*#__PURE__*/_interopDefaultLegacy(commonjs);
 var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve);
 var preprocess__default = /*#__PURE__*/_interopDefaultLegacy(preprocess);
-var clean__default = /*#__PURE__*/_interopDefaultLegacy(clean);
-var isBuiltinModule__default = /*#__PURE__*/_interopDefaultLegacy(isBuiltinModule);
+var cleanFactory__default = /*#__PURE__*/_interopDefaultLegacy(cleanFactory);
+var externals__default = /*#__PURE__*/_interopDefaultLegacy(externals);
 var camelCase__default = /*#__PURE__*/_interopDefaultLegacy(camelCase);
 
 async function createSubpackages(inputs, config) {
@@ -47,10 +47,11 @@ const defaults = {
     compressTargets: ['umd'],
     sourcemapTargets: ['umd'],
     preprocess: [],
-    dir: 'dist'
+    dir: 'dist',
+    sourceDir: 'src'
 };
 function getCliOptions() {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const parsedArgs = minimist__default["default"](process.argv.slice(2));
     const umdTargets = (_b = (_a = parsedArgs.umd) === null || _a === void 0 ? void 0 : _a.split(',').map((arg) => arg.trim())) !== null && _b !== void 0 ? _b : defaults.umdTargets;
     const compressTargets = (_d = (_c = parsedArgs.compress) === null || _c === void 0 ? void 0 : _c.split(',').map((arg) => arg.trim())) !== null && _d !== void 0 ? _d : defaults.compressTargets;
@@ -58,13 +59,15 @@ function getCliOptions() {
     const formats = (_h = (_g = parsedArgs.formats) === null || _g === void 0 ? void 0 : _g.split(',').map((arg) => arg.trim())) !== null && _h !== void 0 ? _h : defaults.formats;
     const preprocess = (_k = (_j = parsedArgs.preprocess) === null || _j === void 0 ? void 0 : _j.split(',').map((arg) => arg.trim())) !== null && _k !== void 0 ? _k : defaults.preprocess;
     const dir = (_l = parsedArgs.dir) !== null && _l !== void 0 ? _l : defaults.dir;
+    const sourceDir = (_m = parsedArgs.sourceDir) !== null && _m !== void 0 ? _m : defaults.sourceDir;
     return {
         umdTargets,
         compressTargets,
         sourcemapTargets,
         formats,
         preprocess,
-        dir
+        dir,
+        sourceDir
     };
 }
 
@@ -74,46 +77,8 @@ async function getPackage() {
     return [pkgPath, JSON.parse(buffer.toString())];
 }
 
-function getBuildPlugins(format, config) {
-    const result = [
-        clean__default["default"](),
-        resolve__default["default"](),
-        commonjs__default["default"](),
-        typescript__default["default"]()
-    ];
-    if (config.preprocess.length) {
-        result.unshift(preprocess__default["default"]({ include: config.preprocess.map(name => `src/${name}.ts`), context: getPreprocessContext(format) }));
-    }
-    return result;
-}
-function getPreprocessContext(format) {
-    if (format == 'es') {
-        return { esm: true };
-    }
-    else {
-        return { cjs: true };
-    }
-}
-function getOutputPlugins(format, config) {
-    return config.compressTargets.includes(format) ? [rollupPluginTerser.terser({
-            mangle: {
-                properties: {
-                    regex: /_$/
-                }
-            }
-        })] : [];
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getHelpers(pkg) {
-    const scopeTest = /(@.+)\/.+$/g.exec(pkg.name);
-    let scope = undefined;
-    if (scopeTest && scopeTest[1]) {
-        scope = scopeTest[1];
-    }
-    const external = scope != null
-        ? (id) => id.indexOf('node_modules') >= 0 || id.indexOf(scope) >= 0 || isBuiltinModule__default["default"](id)
-        : (id) => id.indexOf('node_modules') >= 0 || isBuiltinModule__default["default"](id);
     function getGlobalName(anInput) {
         return camelCase__default["default"](path__default["default"].join(pkg.name, path__default["default"].basename(anInput, '.ts') !== 'index' ? path__default["default"].basename(anInput, '.ts') : ''));
     }
@@ -124,7 +89,6 @@ function getHelpers(pkg) {
         return camelCase__default["default"](id);
     }
     return {
-        external,
         getGlobalName,
         getExternalGlobalName,
         umdFilter
@@ -140,13 +104,13 @@ function toArray(object) {
     }
     return [object];
 }
-function isExternalInput(id, inputs, currentInput) {
+function isExternalInput(id, inputs, currentInput, config) {
     let normalizedPath;
     if (path__default["default"].isAbsolute(id)) {
         normalizedPath = './' + path__default["default"].relative(process.cwd(), id);
     }
     else {
-        normalizedPath = './' + path__default["default"].join('src', id + '.ts');
+        normalizedPath = './' + path__default["default"].join(config.sourceDir, id + '.ts');
     }
     return normalizedPath !== currentInput && inputs.includes(normalizedPath);
 }
@@ -165,6 +129,41 @@ function getTimeDiff(starting) {
     return `${now - starting}ms`;
 }
 
+const clean = cleanFactory__default["default"]();
+function getBuildPlugins(format, config, inputs, currentInput) {
+    const result = [
+        clean,
+        externals__default["default"]({
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            external: (id, external) => external || (format === 'umd' ? isExternalInput(id, inputs, currentInput, config) : false)
+        }),
+        resolve__default["default"](),
+        commonjs__default["default"](),
+        typescript__default["default"]()
+    ];
+    if (config.preprocess.length) {
+        result.unshift(preprocess__default["default"]({ include: config.preprocess.map(name => `${config.sourceDir}/${name}.ts`), context: getPreprocessContext(format) }));
+    }
+    return result;
+}
+function getPreprocessContext(format) {
+    if (format == 'es') {
+        return { esm: true };
+    }
+    else {
+        return { cjs: true };
+    }
+}
+function getOutputPlugins(format, config) {
+    return config.compressTargets.includes(format) ? [rollupPluginTerser.terser({
+            mangle: {
+                properties: {
+                    regex: /_$/
+                }
+            }
+        })] : [];
+}
+
 function getRollupConfigs(inputs, config, helpers) {
     const configs = [];
     if (config.formats.includes('es')) {
@@ -178,8 +177,7 @@ function getRollupConfigs(inputs, config, helpers) {
                 plugins: getOutputPlugins('es', config),
                 sourcemap: config.sourcemapTargets.includes('es')
             },
-            plugins: getBuildPlugins('es', config),
-            external: helpers.external
+            plugins: getBuildPlugins('es', config)
         });
     }
     if (config.formats.includes('cjs')) {
@@ -194,8 +192,7 @@ function getRollupConfigs(inputs, config, helpers) {
                 plugins: getOutputPlugins('cjs', config),
                 sourcemap: config.sourcemapTargets.includes('cjs')
             },
-            plugins: getBuildPlugins('cjs', config),
-            external: helpers.external
+            plugins: getBuildPlugins('cjs', config)
         });
     }
     const umdConfigs = inputs.filter((input) => umdFilter(config, input)).map(currentInput => ({
@@ -209,8 +206,7 @@ function getRollupConfigs(inputs, config, helpers) {
             plugins: getOutputPlugins('umd', config),
             sourcemap: config.sourcemapTargets.includes('umd')
         },
-        plugins: getBuildPlugins('umd', config),
-        external: (id) => helpers.external(id) || isExternalInput(id, inputs, currentInput)
+        plugins: getBuildPlugins('umd', config, inputs, currentInput)
     }));
     if (umdConfigs && umdConfigs.length) {
         configs.push(...umdConfigs);
@@ -275,7 +271,7 @@ function processPackage(pkg, config) {
                 pkg.files.push(basename);
             }
         }
-        input.push(`./src/${basename}.ts`);
+        input.push(`./${config.sourceDir}/${basename}.ts`);
     }
     return input;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.4",
+  "version": "1.6.0",
   "license": "MIT",
   "name": "pkgbld",
   "author": {
@@ -47,7 +47,6 @@
   },
   "dependencies": {
     "@niceties/logger": "1.1.4",
-    "is-builtin-module": "3.2.0",
     "lodash": "4.17.21",
     "rollup": "2.79.0",
     "rollup-plugin-terser": "7.0.2",
@@ -56,6 +55,7 @@
     "@rollup/plugin-commonjs": "22.0.2",
     "@rollup/plugin-node-resolve": "14.1.0",
     "@rollup-extras/plugin-clean": "1.2.4",
+    "@rollup-extras/plugin-externals": "1.0.2",
     "typescript": "4.8.3",
     "minimist": "1.2.6"
   }