ppackage 2.3.3 → 2.3.5
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/.eslintrc +0 -0
- package/index.js +4 -2
- package/package.json +1 -1
package/.eslintrc
CHANGED
|
File without changes
|
package/index.js
CHANGED
|
@@ -8,6 +8,7 @@ const {spawn} = require('child_process');
|
|
|
8
8
|
const args = require('nyks/process/parseArgs')();
|
|
9
9
|
const passthru = require('nyks/child_process/passthru');
|
|
10
10
|
const wait = require('nyks/child_process/wait');
|
|
11
|
+
const trim = require('mout/string/trim');
|
|
11
12
|
|
|
12
13
|
const Dockerfile = require('./lib/dockerfile');
|
|
13
14
|
const {Parser, Composer} = require('yaml');
|
|
@@ -18,6 +19,7 @@ const GIT_FOLDER = ".git";
|
|
|
18
19
|
const NPM_PACKAGE_PATH = 'package.json';
|
|
19
20
|
const DOCKERIGNORE_PATH = ".dockerignore";
|
|
20
21
|
const NPMIGNORE_PATH = ".npmignore";
|
|
22
|
+
const NPMRC_PATH = ".npmrc"; //default ignored by npm
|
|
21
23
|
const GITIGNORE_PATH = ".gitignore";
|
|
22
24
|
|
|
23
25
|
|
|
@@ -162,7 +164,7 @@ class ppackage {
|
|
|
162
164
|
await passthru("git", ["config", "--unset", "core.bare"]);
|
|
163
165
|
await passthru("git", ["reset", "HEAD", "--", "."]);
|
|
164
166
|
|
|
165
|
-
for(let line of [GITIGNORE_PATH, DOCKERIGNORE_PATH, NPMIGNORE_PATH])
|
|
167
|
+
for(let line of [GITIGNORE_PATH, DOCKERIGNORE_PATH, NPMIGNORE_PATH, NPMRC_PATH])
|
|
166
168
|
await passthru("git", ["checkout", "--", line]).catch(()=>{});
|
|
167
169
|
|
|
168
170
|
let restore = [];
|
|
@@ -174,7 +176,7 @@ class ppackage {
|
|
|
174
176
|
let ignore = fs.readFileSync(NPMIGNORE_PATH, 'utf8');
|
|
175
177
|
restore.push(...ignore.split("\n"));
|
|
176
178
|
}
|
|
177
|
-
restore = restore.map(v => v.trim()).filter(v => v && v[0] != "#");
|
|
179
|
+
restore = restore.map(v => trim(v.trim(), '/')).filter(v => v && v[0] != "#");
|
|
178
180
|
|
|
179
181
|
for(let line of restore)
|
|
180
182
|
await passthru("git", ["checkout", "--", line]).catch(()=>{});
|