npm-pkgbuild 7.22.4 → 7.22.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "npm-pkgbuild",
3
- "version": "7.22.4",
3
+ "version": "7.22.8",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -38,21 +38,21 @@
38
38
  "lint:docs": "documentation lint ./src/**/*.mjs"
39
39
  },
40
40
  "dependencies": {
41
- "@npmcli/arborist": "^4.2.1",
42
- "aggregate-async-iterator": "^1.1.7",
41
+ "@npmcli/arborist": "^4.3.0",
42
+ "aggregate-async-iterator": "^1.1.9",
43
43
  "commander": "^8.3.0",
44
44
  "content-entry": "^4.1.2",
45
- "content-entry-filesystem": "^4.0.3",
46
- "content-entry-transform": "^1.3.4",
45
+ "content-entry-filesystem": "^4.0.4",
46
+ "content-entry-transform": "^1.3.7",
47
47
  "execa": "^6.0.0",
48
- "expression-expander": "^7.0.9",
49
- "globby": "^13.0.0",
50
- "iterable-string-interceptor": "^1.0.8",
51
- "key-value-transformer": "^2.0.0",
48
+ "expression-expander": "^7.0.14",
49
+ "globby": "^13.1.0",
50
+ "iterable-string-interceptor": "^1.0.13",
51
+ "key-value-transformer": "^2.0.2",
52
52
  "node-fetch": "^3.2.0",
53
- "npm-package-walker": "^5.0.3",
53
+ "npm-package-walker": "^5.0.5",
54
54
  "npm-packlist": "^3.0.0",
55
- "pacote": "^12.0.2",
55
+ "pacote": "^12.0.3",
56
56
  "pkg-dir": "^6.0.1",
57
57
  "tar-stream": "^2.2.0"
58
58
  },
@@ -48,7 +48,7 @@ export class NodeModulesContentProvider extends ContentProvider {
48
48
 
49
49
  const arb = new Arborist({ path: tmp });
50
50
  await arb.buildIdealTree({
51
- rm: ["@types/node", "@types/uuid"],
51
+ //rm: ["@types/node", "@types/uuid"],
52
52
  update: true,
53
53
  prune: true,
54
54
  saveType: "prod"
@@ -171,6 +171,6 @@ const toBeSkipped = new RegExp(
171
171
  "chains and topics\\.md",
172
172
  "build_detect_platform"
173
173
  ].join("|") +
174
- ")$",
174
+ ")$|(node_modules\/\@types)",
175
175
  "i"
176
176
  );
@@ -63,12 +63,6 @@ export async function extractFromPackage(pkg, dir) {
63
63
  let arch = new Set();
64
64
 
65
65
  const processPkg = (pkg, dir, modulePath) => {
66
- if (pkg.cpu) {
67
- for (const a of asArray(pkg.cpu)) {
68
- arch.add(npmArchMapping[a]);
69
- }
70
- }
71
-
72
66
  if (pkg.pkg) {
73
67
  const pkgbuild = pkg.pkg;
74
68
 
@@ -79,6 +73,12 @@ export async function extractFromPackage(pkg, dir) {
79
73
  }
80
74
  }
81
75
 
76
+ if (pkg.cpu) {
77
+ for (const a of asArray(pkg.cpu)) {
78
+ arch.add(npmArchMapping[a]);
79
+ }
80
+ }
81
+
82
82
  Object.assign(output, pkgbuild.output);
83
83
 
84
84
  Object.entries(pkgbuild)
package/src/publish.mjs CHANGED
@@ -8,7 +8,7 @@ export function analysePublish(publish, properties) {
8
8
  (match, key, offset, string) => properties[key] || '{{' + key + '}}'
9
9
  );
10
10
 
11
- const m = publish.url.match(/^([\w_\+]+:)\/\/(.*)/);
11
+ const m = publish.url.match(/^([^:]+:)\/\/(.*)/);
12
12
 
13
13
  publish.scheme = m ? m[1] : "file:";
14
14