npm-pkgbuild 6.12.77 → 6.12.81

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/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2018-2021 by arlac77
1
+ Copyright (c) 2018-2022 by arlac77
2
2
  All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "npm-pkgbuild",
3
- "version": "6.12.77",
3
+ "version": "6.12.81",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -40,8 +40,8 @@
40
40
  "dependencies": {
41
41
  "aggregate-async-iterator": "^1.1.7",
42
42
  "commander": "^8.3.0",
43
- "content-entry": "^2.10.0",
44
- "content-entry-filesystem": "^3.1.11",
43
+ "content-entry": "^3.0.2",
44
+ "content-entry-filesystem": "^3.1.14",
45
45
  "execa": "^6.0.0",
46
46
  "expression-expander": "^7.0.9",
47
47
  "globby": "^12.0.2",
@@ -53,7 +53,7 @@
53
53
  },
54
54
  "devDependencies": {
55
55
  "ava": "^3.15.0",
56
- "c8": "^7.10.0",
56
+ "c8": "^7.11.0",
57
57
  "documentation": "^13.2.5",
58
58
  "semantic-release": "^18.0.1",
59
59
  "stream-buffers": "^3.0.2"
package/src/context.mjs CHANGED
@@ -36,9 +36,11 @@ export async function createContext(dir, properties = {}) {
36
36
  if (m) {
37
37
  properties.organtization = m[1];
38
38
  properties.name = m[2];
39
+ properties.fullName = `${m[1]}-${m[2]}`;
39
40
  }
40
41
  if(properties.pacman && properties.pacman.name) {
41
42
  properties.name = properties.pacman.name;
43
+ properties.fullName = properties.name;
42
44
  }
43
45
 
44
46
  //console.log(properties);
package/src/pkgbuild.mjs CHANGED
@@ -101,7 +101,7 @@ pkgver() {
101
101
 
102
102
  const npmDistPackage = options.npmDist
103
103
  ? `( cd \${pkgdir}${installdir}
104
- tar -x --transform="s/^package\\///" -f \${srcdir}/\${pkgname}${directory}/${context.properties.name}-${context.properties.pkgver}.tgz)`
104
+ tar -x --transform="s/^package\\///" -f \${srcdir}/\${pkgname}${directory}/${context.properties.fullName}-${context.properties.pkgver}.tgz)`
105
105
  : "";
106
106
 
107
107
  const npmModulesPackage = options.npmModules