pkgbld 1.15.0 → 1.15.2

package/dist/eject.d.ts

@@ -2,5 +2,5 @@ import type { PackageJson, PkgbldRollupPlugin, Provider } from './types';
 import type { RollupOptions } from 'rollup';
 import { getCliOptions } from './get-cli-options';
 import { getHelpers } from './helpers';
-export declare function createEjectProvider(): Promise<[Provider, PkgbldRollupPlugin[]]>;
+export declare function createEjectProvider(preimportMap: Map<string, Promise<never>>): Promise<[Provider, PkgbldRollupPlugin[]]>;
 export declare function ejectConfig(config: RollupOptions[], pkgPath: string, options: ReturnType<typeof getCliOptions>, inputs: string[], helpers: ReturnType<typeof getHelpers>, pkg: PackageJson): Promise<void>;

package/dist/get-plugins.d.ts

@@ -1,4 +1,4 @@
 import type { PkgbldRollupPlugin, Provider } from './types';
 import externals from './builtin-plugins/externals';
 export declare const plugins: (typeof externals)[];
-export declare function createProvider(): [Provider, PkgbldRollupPlugin[]];
+export declare function createProvider(preimportMap: Map<string, Promise<never>>): [Provider, PkgbldRollupPlugin[]];

package/dist/index.js

@@ -106,14 +106,16 @@ async function externals (provider, config, inputs) {
         provider.provide(() => pluginExternals(), 2000 /* Priotiry.externals */, { format });
     }
     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);
             provider.provide(() => pluginExternals({
-                external: (id, external) => external || isExternalInput(currentInput, inputs, id, config)
+                external: isExternal
             }), 2000 /* Priotiry.externals */, { format: 'umd', inputs: [`./${config.sourceDir}/${currentInput}.ts`] });
         }
         // for eject config
         provider.globalImport('path', 'path');
-        provider.globalSetupt(isExternalInput);
+        provider.globalSetup(isExternalInput);
     }
 }
 function isExternalInput(currentInput, inputs, id, config) {
@@ -207,18 +209,18 @@ const plugins = [
     binify
 ];
 const noop = () => undefined;
-function createProvider() {
+function createProvider(preimportMap) {
     const plugins = [];
     return [{
             provide: (plugin, priority, options) => {
                 plugins.push({ priority, plugin, format: options?.format, inputs: options?.inputs, outputPlugin: options?.outputPlugin });
             },
             import: async (name, exportName) => {
-                const result = await import(name);
+                const result = preimportMap.has(name) ? await preimportMap.get(name) : await import(name);
                 return result[exportName ?? 'default'];
             },
             globalImport: noop,
-            globalSetupt: noop
+            globalSetup: noop
         }, plugins];
 }
 
@@ -532,7 +534,7 @@ async function writeJson(path, json) {
 const imports = new Map;
 const setup = new Set;
 let generate, generateGlobals;
-async function createEjectProvider() {
+async function createEjectProvider(preimportMap) {
     const createMockProvider = (await import('@slimlib/smart-mock')).default;
     const provider = createMockProvider();
     const createMock = provider.createMock;
@@ -544,7 +546,7 @@ async function createEjectProvider() {
                 plugins.push({ priority, plugin, format: options?.format, inputs: options?.inputs, outputPlugin: options?.outputPlugin });
             },
             import: async (name, exportName) => {
-                const result = await import(name);
+                const result = preimportMap.has(name) ? await preimportMap.get(name) : await import(name);
                 const exports = result[exportName ?? 'default'];
                 const mangledName = lodash.camelCase(name);
                 imports.set(name, mangledName);
@@ -554,7 +556,7 @@ async function createEjectProvider() {
                 imports.set(module, exportName ?? 'default');
             },
             // eslint-disable-next-line @typescript-eslint/ban-types
-            globalSetupt: (code) => {
+            globalSetup: (code) => {
                 if (typeof code === 'function') {
                     setup.add(code.toString());
                 }
@@ -583,6 +585,7 @@ async function ejectConfig(config, pkgPath, options, inputs, helpers, pkg) {
         .join('\n');
     const setupString = Array.from(setup)
         .join('\n');
+    console.log(setupString);
     const { minify } = await import('terser');
     const result = await minify(`${importsString}\n${setupString}\nexport default ${text};`, {
         module: true,
@@ -643,6 +646,7 @@ async function checkTsConfig(options, mainLogger) {
     mainLogger('done');
 }
 
+execute();
 async function execute() {
     const time = Date.now();
     logger.createLogger().update(' '); // blank line
@@ -654,7 +658,8 @@ async function execute() {
         checkTsConfig(options, mainLogger);
         const inputs = processPackage(pkg, options);
         const helpers = getHelpers(pkg.name);
-        const provider = options.eject ? await createEjectProvider() : createProvider();
+        const preimportMap = preimport();
+        const provider = options.eject ? await createEjectProvider(preimportMap) : createProvider(preimportMap);
         const rollupConfigs = await getRollupConfigs(provider, inputs, options, helpers);
         if (options.eject) {
             await ejectConfig(rollupConfigs, pkgPath, options, inputs, helpers, pkg);
@@ -687,4 +692,10 @@ async function execute() {
         mainLogger.update(updater());
     }
 }
-execute();
+function preimport() {
+    return (process.env.PKGBLD_INTERNAL ? new Map([
+        ['@rollup-extras/plugin-binify', import('@rollup-extras/plugin-binify')],
+        ['@rollup-extras/plugin-clean', import('@rollup-extras/plugin-clean')],
+        ['@rollup-extras/plugin-externals', import('@rollup-extras/plugin-externals')]
+    ]) : new Map);
+}

package/dist/types.d.ts

@@ -32,7 +32,7 @@ export type Provider = {
     provide: ProvideFunction;
     import: (module: string, exportName?: string) => Promise<((...args: unknown[]) => Plugin)>;
     globalImport: (module: string, exportName?: string | string[]) => void;
-    globalSetupt: (code: Function | string) => void;
+    globalSetup: (code: Function | string) => void;
 };
 export type PkgbldRollupPlugin = {
     plugin: () => Plugin;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.15.0",
+  "version": "1.15.2",
   "license": "MIT",
   "name": "pkgbld",
   "author": {