pkgbld 1.18.0 → 1.19.0

package/README.md

@@ -118,7 +118,13 @@ File(s) to make executable. The first entry will be added to package.json
 pkgbld --include-externals
 ```
 
-Bundles all externals into a package.
+or
+
+```
+pkgbld --include-externals=lodash
+```
+
+Bundles all or specified externals into a package.
 
 ### eject
 

package/dist/index.js

@@ -49,6 +49,15 @@ const defaults = {
 function CommaSeparatedString(value) {
     return value.split(',').map((arg) => arg.trim());
 }
+function CommaSeparatedStringOrBoolean(value) {
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    if (Array.isArray(value) && value.length === 0) {
+        return true;
+    }
+    return CommaSeparatedString(value);
+}
 function getCliOptions(plugins, pkg) {
     const cliOptions = cleye.cli({
         name: 'pkgbld',
@@ -94,14 +103,14 @@ function getCliOptions(plugins, pkg) {
                 description: 'Executable files'
             },
             includeExternals: {
-                type: Boolean,
-                description: 'Include all externals into result bundle(s)',
+                type: CommaSeparatedStringOrBoolean,
+                description: 'Include all/specified externals into result bundle(s)',
                 default: defaults.includeExternals
             },
             eject: {
                 type: Boolean,
                 description: 'Eject config',
-                default: defaults.includeExternals
+                default: defaults.eject
             },
             noTsConfig: {
                 type: Boolean,
@@ -179,28 +188,54 @@ async function commonjs (provider) {
 }
 
 async function externals (provider, config, inputs) {
-    if (config.includeExternals) {
+    if (config.includeExternals === true) {
         return;
     }
     const pluginExternals = await provider.import('@rollup-extras/plugin-externals');
     const allowGenericUmd = config.umdInputs.length === 1 && inputs.length === 1;
     if (config.formats.length > 0) {
         const format = (allowGenericUmd ? undefined : config.formats.filter(format => format !== 'umd'));
-        provider.provide(() => pluginExternals(), 2000 /* Priority.externals */, { format });
+        provider.provide(() => pluginExternals({
+            external: (id, external, importer) => includeExternals(importer, external, id, config)
+        }), 2000 /* Priority.externals */, { format });
+        // for eject config
+        provider.globalImport('path', 'path');
+        provider.globalSetup(includeExternals);
     }
     if (!allowGenericUmd && config.umdInputs.length > 0) {
         const curry = (await provider.import('lodash/curry.js'));
         for (const currentInput of config.umdInputs) {
-            const isExternal = curry((currentInput, id, external) => external || isExternalInput(currentInput, inputs, id, config))(currentInput);
+            const isExternal = curry((currentInput, id, external, importer) => includeExternals(importer, external, id, config) || isExternalInput(currentInput, inputs, id, config))(currentInput);
             provider.provide(() => pluginExternals({
                 external: isExternal
             }), 2000 /* Priority.externals */, { format: 'umd', inputs: [`./${config.sourceDir}/${currentInput}.ts`] });
         }
         // for eject config
-        provider.globalImport('path', 'path');
+        if (config.formats.length === 0) {
+            provider.globalImport('path', 'path');
+            provider.globalSetup(includeExternals);
+        }
         provider.globalSetup(isExternalInput);
     }
 }
+function includeExternals(importer, external, id, config) {
+    if (config.includeExternals === false)
+        return external;
+    if (!external)
+        return false;
+    if (path.isAbsolute(id)) {
+        id = './' + path.relative(process.cwd(), id);
+    }
+    const internals = config.includeExternals;
+    if (internals.includes(id) || internals.some(internal => id.startsWith(internal))) {
+        return false;
+    }
+    const relative = path.relative('.', path.resolve(importer ?? '.', id));
+    if (internals.some(internal => relative.includes(`node_modules/${internal}/`))) {
+        return false;
+    }
+    return true;
+}
 function isExternalInput(currentInput, inputs, id, config) {
     let normalizedPath;
     if (path.isAbsolute(currentInput)) {
@@ -637,7 +672,7 @@ async function writeJson(path, json) {
     await fs.writeFile(path, JSON.stringify(json, null, 2) + '\n');
 }
 
-var version = "1.18.0";
+var version = "1.19.0";
 var name = "pkgbld";
 var license = "MIT";
 var author = "Konstantin Shutkin";

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

@@ -9,7 +9,7 @@ export declare function getCliOptions(plugins: Partial<PkgbldPlugin>[], pkg: Pac
     dir: string;
     sourceDir: string;
     bin?: string[] | undefined;
-    includeExternals: boolean;
+    includeExternals: boolean | string[];
     eject: boolean;
     noTsConfig: boolean;
     noUpdatePackageJson: boolean;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.18.0",
+  "version": "1.19.0",
   "name": "pkgbld",
   "license": "MIT",
   "author": "Konstantin Shutkin",