@pi-r/rollup 0.12.0 → 0.12.1

package/index.js

@@ -13,9 +13,9 @@ const PLUGIN_MAP = Object.freeze({
     '@rollup/plugin-commonjs': commonjs,
     '@rollup/plugin-node-resolve': nodeResolve
 });
-function getPlugins(plugin) {
-    if (plugin) {
-        return !Array.isArray(plugin) ? [plugin] : plugin;
+function asArray(value) {
+    if (value !== undefined) {
+        return !Array.isArray(value) ? [value] : value;
     }
     return [];
 }
@@ -38,6 +38,9 @@ async function transform(context, value, options) {
     if (Array.isArray(baseConfig.plugins)) {
         baseConfig.plugins = loadPlugins(baseConfig.plugins, PLUGIN_MAP);
     }
+    if (Array.isArray(outputConfig.plugins)) {
+        outputConfig.plugins = loadPlugins(outputConfig.plugins, PLUGIN_MAP);
+    }
     if (esmData?.sourceFile) {
         const files = [];
         for (const [inputFile, content, localFile] of esmData.sourceFile) {
@@ -73,7 +76,7 @@ async function transform(context, value, options) {
                 }
             };
         };
-        const plugins = getPlugins(baseConfig.plugins);
+        const plugins = asArray(baseConfig.plugins);
         baseConfig.plugins = plugins;
         plugins.unshift(dynamicImportPlugin());
     }
@@ -106,21 +109,38 @@ async function transform(context, value, options) {
             url = path.basename(outputConfig.sourcemapFile);
         }
     }
-    const bundle = await context.rollup(baseConfig);
-    if (Array.isArray(outputConfig.plugins)) {
-        outputConfig.plugins = loadPlugins(outputConfig.plugins, PLUGIN_MAP);
-    }
-    if (external) {
+    if (isPlainObject(external)) {
+        if ('external' in external) {
+            baseConfig.external = asArray(baseConfig.external).concat(asArray(external.external));
+            delete external.external;
+        }
         if ('plugins' in external) {
-            if (Array.isArray(external.plugins)) {
-                const plugins = getPlugins(outputConfig.plugins);
-                outputConfig.plugins = plugins;
-                plugins.push(...loadPlugins(external.plugins, PLUGIN_MAP));
-            }
+            const plugins = asArray(outputConfig.plugins);
+            plugins.push(...loadPlugins(asArray(external.plugins), PLUGIN_MAP));
+            outputConfig.plugins = plugins;
             delete external.plugins;
         }
         Object.assign(outputConfig, external);
     }
+    if (baseConfig.external) {
+        baseConfig.external = asArray(baseConfig.external).map(specifier => {
+            if (typeof specifier === 'string') {
+                const match = /^\/(\^)?(?:[^/]|(?<=\\)\/)+?(\$)?\/[dgimsuvy]*$/.exec(specifier);
+                if (match && (match[1] || match[2]) && !specifier.includes('**')) {
+                    try {
+                        const pattern = eval(specifier);
+                        if (pattern instanceof RegExp) {
+                            return pattern;
+                        }
+                    }
+                    catch {
+                    }
+                }
+            }
+            return specifier;
+        });
+    }
+    const bundle = await context.rollup(baseConfig);
     if (sourcesRelativeTo) {
         outputConfig.sourcemapPathTransform = (relativeSourcePath, sourcemapPath) => {
             return path.resolve(path.dirname(sourcemapPath), relativeSourcePath);
@@ -177,7 +197,7 @@ async function transform(context, value, options) {
         }
     }
     const length = bundle.watchFiles.length;
-    if (length) {
+    if (length > 0) {
         if (length > 1) {
             options.out.ignoreCache = true;
         }
@@ -190,9 +210,6 @@ async function transform(context, value, options) {
             for (const file of tmp) {
                 fs.unlink(file, () => { });
             }
-            if (tempDir) {
-                fs.rm(tempDir, { recursive: true, force: true }, () => { });
-            }
         });
     }
     if (result) {

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@pi-r/rollup",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Rollup transform function for E-mc.",
   "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/pi-r.git",
@@ -19,9 +16,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.14.0",
+    "@e-mc/document": "^0.14.1",
     "@rollup/plugin-commonjs": "*",
     "@rollup/plugin-node-resolve": "*",
-    "rollup": "^4.60.2"
+    "rollup": "^4.60.3"
   }
 }