npm-pkgbuild 7.21.4 → 7.22.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.21.4",
+  "version": "7.22.3",
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +46,7 @@
     "content-entry-transform": "^1.3.4",
     "execa": "^6.0.0",
     "expression-expander": "^7.0.9",
-    "globby": "^12.2.0",
+    "globby": "^13.0.0",
     "iterable-string-interceptor": "^1.0.8",
     "key-value-transformer": "^2.0.0",
     "node-fetch": "^3.2.0",

package/src/extract-from-package.mjs

@@ -62,7 +62,7 @@ export async function extractFromPackage(pkg, dir) {
   let output = {};
   let arch = new Set();
 
-  const processPkg = (pkg, dir) => {
+  const processPkg = (pkg, dir, modulePath) => {
     if (pkg.cpu) {
       for (const a of asArray(pkg.cpu)) {
         arch.add(npmArchMapping[a]);
@@ -84,7 +84,7 @@ export async function extractFromPackage(pkg, dir) {
         .filter(([k, v]) => typeof v === "string")
         .forEach(([k, v]) => (properties[k] = v));
 
-      if (pkgbuild.content) {
+      if (pkgbuild.content && !modulePath) {
         Object.entries(pkgbuild.content).forEach(
           ([destination, definitions]) => {
             for (const definition of asArray(definitions)) {
@@ -116,7 +116,7 @@ export async function extractFromPackage(pkg, dir) {
 
   await packageWalker(async (pkg, base, modulePath) => {
     if (modulePath.length > 0) {
-      processPkg(pkg, base);
+      processPkg(pkg, base, modulePath);
     }
     return true;
   }, dir);

package/src/npm-pkgbuild-cli.mjs

@@ -47,18 +47,17 @@ program
   )
   .option("-m --meta <dir>", "meta directory", (c, a) => a.concat([c]), [])
   .addOption(
-    new program.Option("--publish <url>", "publishing url of the package").env(
-      "PACMAN_PUBLISH"
-    ).argParser((value) => {
-        let [url, user, password] = value.split(/,/);
-        if(user) {
-        	url = process.env[url];
-        	console.log(this,url,user,password);
-        	return url;	
+    new program.Option("--publish <url>", "publishing url of the package")
+      .env("PACMAN_PUBLISH")
+      .argParser(value => {
+        let values = value.split(/,/);
+        if (values.length > 1) {
+          values = values.map(v => process.env[v] || v);
+          return { url: value[0], user: value[1], password: value[2] };
         }
 
-        return value;
-    })
+        return { url: value };
+      })
   )
   .action(async options => {
     try {
@@ -120,6 +119,7 @@ program
               ".json",
               ".html",
               ".txt",
+              ".webmanifest",
               ".service",
               ".socket"
             ]),

package/src/output/packager.mjs

@@ -58,7 +58,6 @@ export class Packager {
     return properties;
   }
 
-
   async prepareExecute(options) {
     const tmpdir = await this.tmpdir;
 
@@ -80,13 +79,13 @@ export class Packager {
       mkdir(join(tmpdir, d), mdo)
     ])) {
       await nd[2];
-      out[nd[0]] = nd[1]; 
+      out[nd[0]] = nd[1];
     }
 
     if (options.publish) {
-      const { publish, scheme } = analysePublish(options.publish, out.properties);
+      const publish = analysePublish(options.publish, out.properties);
 
-      out.destination = scheme === 'file:' ? publish : tmpdir;
+      out.destination = publish.scheme === "file:" ? publish.url : tmpdir;
 
       await mkdir(dirname(out.destination), { recursive: true });
     }

package/src/publish.mjs

@@ -3,15 +3,16 @@ import { createReadStream } from "fs";
 import fetch from "node-fetch";
 
 export function analysePublish(publish, properties) {
-  publish = publish.replace(
+  publish.url = publish.url.replace(
     /\{\{(\w+)\}\}/m,
-    (match, key, offset, string) => properties[key]
+    (match, key, offset, string) => properties[key] || '{{' + key + '}}'
   );
 
-  const m = publish.match(/^([\w_\+]+:)\/\/(.*)/);
-  const scheme = m ? m[0] : "file:";
+  const m = publish.url.match(/^([\w_\+]+:)\/\/(.*)/);
 
-  return { publish, scheme };
+  publish.scheme = m ? m[1] : "file:";
+
+  return publish;
 }
 
 export async function publish(fileName, destination, properties) {
@@ -19,24 +20,24 @@ export async function publish(fileName, destination, properties) {
     return;
   }
 
-  let { publish, scheme } = analysePublish(destination, properties);
+  const publish = analysePublish(destination, properties);
 
-  publish = publish + "/" + basename(fileName);
+  publish.url = publish.url + "/" + basename(fileName);
 
-  console.log(publish);
+  console.log(publish.url);
 
-  if (scheme === "http:" || scheme === "https:") {
+  if (publish.scheme === "http:" || publish.scheme === "https:") {
     const headers = {};
 
-    if (properties.username) {
+    if (publish.username) {
       headers.authorization =
         "Basic " +
-        Buffer.from(properties.username + ":" + properties.password).toString(
+        Buffer.from(publish.username + ":" + publish.password).toString(
           "base64"
         );
     }
 
-    const response = await fetch(publish, {
+    const response = await fetch(publish.url, {
       method: "PUT",
       headers,
       body: createReadStream(fileName)