npm-pkgbuild 7.20.3 → 7.20.4

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/content/node-modules-content-provider.mjs +89 -54
  3. package/src/output/rpm.mjs +7 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "npm-pkgbuild",
3
- "version": "7.20.3",
3
+ "version": "7.20.4",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
package/src/content/node-modules-content-provider.mjs CHANGED
@@ -53,11 +53,7 @@ export class NodeModulesContentProvider extends ContentProvider {
53
53
  for (const name of await globby("node_modules/**/*", {
54
54
  cwd: tmp
55
55
  })) {
56
- if (
57
- !name.match(
58
- /(~|\.map|\.ts|\.orig|\.log|\.tmp|\.bak|\.bat|\.gypi|\.gyp|appveyor\.yml|yarn\.lock|\.DS_Store|jenkinsfile|\.travis\.yml|\.jshint(rc)?|\.npm.*|\.git.*|rollup\.config\.(js|mjs|cjs)|CODE_OF_CONDUCT(\.md)?|GOVERNANCE(\.md)?|CODEOWNERS(\.md)?|UPGRAD(E|ING)(\.md)?|AUTHORS(\.md)?|CONTRIBUT(ORS|ING)(.md)?|CHANGELOG(\.md)?|HISTORY(\.md)?|LICENSE(\-\w+|\.md|\.txt)?|README(.*\.md)?|\.o|\.a|\.c|\.cc|\.h|\.in|Makefile|\.cmake|\.mk|\.\d)$/i
59
- )
60
- ) {
56
+ if (!toBeSkipped.test(name)) {
61
57
  yield Object.assign(
62
58
  new FileSystemEntry(name, tmp),
63
59
  this.entryProperties
@@ -67,52 +63,91 @@ export class NodeModulesContentProvider extends ContentProvider {
67
63
  }
68
64
  }
69
65
 
70
- const toBeIgnored = [
71
- {
72
- pattern: [
73
- "*.d.ts*",
74
- "*.patch",
75
- ".jshintrc*",
76
- ".esl*",
77
- ".zuul.yml",
78
- ".doclets.yml",
79
- ".editorconfig",
80
- ".tern-project",
81
- ".dockerignore",
82
- ".dir-locals.el",
83
- "gulpfile.js",
84
- "jsdoc.json",
85
- "Gruntfile.js",
86
- "karma.conf.js",
87
- "verb.md",
88
- ".nvmrc",
89
- "bower.json",
90
- "*.bash_completion.*",
91
- ".coveralls.yml",
92
- ".istanbul.yml",
93
- ".babelrc.*",
94
- ".nycrc",
95
- ".env",
96
- "x-package.json5",
97
- "component.json",
98
- "tsconfig.json",
99
- "cypress.json",
100
- ".airtap.yml",
101
- ".jscs.json",
102
- "sauce-labs.svg",
103
- "PATENTS*",
104
- "NOTICE*",
105
- "SUMMARY.md",
106
- "MIGRAT*.md",
107
- "PULL_REQUEST_TEMPLATE.md",
108
- "PATTERNS.md",
109
- "REFERENCE.md",
110
- "SECURITY.md",
111
- "SFTPStream.md",
112
- "LIMITS.md",
113
- "Porting-Buffer.md",
114
- "chains and topics.md",
115
- "CODE_OF_CONDUCT*"
116
- ]
117
- }
118
- ];
66
+ const toBeSkipped = new RegExp(
67
+ "(" +
68
+ [
69
+ "~",
70
+ "\\.map",
71
+ "\\.ts",
72
+ "\\.orig",
73
+ "\\.log",
74
+ "\\.tmp",
75
+ "\\.bak",
76
+ "\\.bat",
77
+ "\\.gypi",
78
+ "\\.gyp",
79
+ "appveyor\\.yml",
80
+ "yarn\\.lock",
81
+ "\\.DS_Store",
82
+ "jenkinsfile",
83
+ "\\.travis\\.yml",
84
+ "\\.jshint(rc)?",
85
+ "\\.npm.*",
86
+ "\\.git.*",
87
+ "rollup\\.config\\.(js|mjs|cjs)",
88
+ "CODE_OF_CONDUCT(\\.md)?",
89
+ "GOVERNANCE(\\.md)?",
90
+ "CODEOWNERS(\\.md)?",
91
+ "UPGRAD(E|ING)(\\.md)?",
92
+ "AUTHORS(\\.md)?",
93
+ "CONTRIBUT(ORS|ING)(\\.md)?",
94
+ "CHANGELOG(\\.md)?",
95
+ "HISTORY(\\.md)?",
96
+ "LICENSE(-w+|\\.md|\\.txt)?",
97
+ "README(.*\\.md)?",
98
+ "\\.o",
99
+ "\\.a",
100
+ "\\.c",
101
+ "\\.cc",
102
+ "\\.h",
103
+ "\\.in",
104
+ "Makefile",
105
+ "\\.cmake",
106
+ "\\.mk",
107
+ "\\.d",
108
+
109
+ "\\.patch",
110
+ "\\.esl*",
111
+ "\\.zuul\\.yml",
112
+ "\\.doclets\\.yml",
113
+ "\\.editorconfig",
114
+ "\\.tern-project",
115
+ "\\.dockerignore",
116
+ "\\.dir-locals\\.el",
117
+ "gulpfile\\.js",
118
+ "jsdoc\\.json",
119
+ "Gruntfile\\.js",
120
+ "karma\\.conf\\.js",
121
+ "verb\\.md",
122
+ "\\.nvmrc",
123
+ "bower\\.json",
124
+ "\\.bash_completion.*",
125
+ "\\.coveralls\\.yml",
126
+ "\\.istanbul\\.yml",
127
+ "\\.babelrc.*",
128
+ "\\.nycrc",
129
+ "\\.env",
130
+ "x-package\\.json5",
131
+ "component\\.json",
132
+ "tsconfig\\.json",
133
+ "cypress\\.json",
134
+ "\\.airtap\\.yml",
135
+ "\\.jscs\\.json",
136
+ "sauce-labs\\.svg",
137
+ "PATENTS(\\.md)?",
138
+ "NOTICE(\\.md)?",
139
+ "SUMMARY\\.md",
140
+ "MIGRAT.*\\.md",
141
+ "PULL_REQUEST_TEMPLATE\\.md",
142
+ "PATTERNS\\.md",
143
+ "REFERENCE\\.md",
144
+ "SECURITY\\.md",
145
+ "SFTPStream\\.md",
146
+ "LIMITS\\.md",
147
+ "Porting-Buffer\\.md",
148
+ "chains and topics\\.md",
149
+ ].join("|") +
150
+ ")$",
151
+ "i"
152
+ );
153
+
package/src/output/rpm.mjs CHANGED
@@ -37,7 +37,7 @@ export class RPM extends Packager {
37
37
  named: {
38
38
  staging: "BUILDROOT"
39
39
  },
40
- others: ["RPMS", "SRPMS", "SOURCES", "SPECS"],
40
+ others: ["RPMS", "SRPMS", "SOURCES", "SPECS"]
41
41
  };
42
42
  }
43
43
 
@@ -51,7 +51,8 @@ export class RPM extends Packager {
51
51
  }
52
52
 
53
53
  async execute(sources, transformer, dependencies, options, expander) {
54
- const { properties, tmpdir, staging, destination } = await this.prepareExecute(options);
54
+ const { properties, tmpdir, staging, destination } =
55
+ await this.prepareExecute(options);
55
56
 
56
57
  properties.Requires = Object.entries(dependencies)
57
58
  .map(([n, e]) => `${n}${e}`)
@@ -125,12 +126,14 @@ export class RPM extends Packager {
125
126
  console.log(rpmbuild.stdout);
126
127
  }
127
128
 
129
+ const packageFile = join(destination, this.packageFileName);
130
+
128
131
  await cp(
129
132
  join(tmpdir, "RPMS", properties.arch, this.packageFileName),
130
- join(destination, this.packageFileName),
133
+ packageFile,
131
134
  { preserveTimestamps: true }
132
135
  );
133
- return join(destination, this.packageFileName);
136
+ return packageFile;
134
137
  }
135
138
  }
136
139