@modernpoacher/deps 1.6.0 → 1.6.3
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/bin/common/index.js +15 -18
- package/lib/common/git/index.js +3 -3
- package/lib/common/index.js +3 -7
- package/lib/index.js +1 -1
- package/lib/install/index.js +1 -1
- package/package.json +1 -1
- package/src/common/git/index.js +18 -16
- package/src/common/index.js +5 -10
- package/src/index.js +26 -20
- package/src/install/index.js +9 -5
- package/test/common/index.spec.js +3 -3
package/bin/common/index.js
CHANGED
|
@@ -44,6 +44,12 @@ const log = debug('@modernpoacher/deps')
|
|
|
44
44
|
|
|
45
45
|
log(`\`common\` (${VERSION} - ${PLATFORM}) is awake`)
|
|
46
46
|
|
|
47
|
+
const OPTIONS = {
|
|
48
|
+
maxBuffer: 1024 * 2000,
|
|
49
|
+
shell: true,
|
|
50
|
+
stdio: 'inherit'
|
|
51
|
+
}
|
|
52
|
+
|
|
47
53
|
const CODE = 0
|
|
48
54
|
|
|
49
55
|
const MESSAGE = 'Either no error message has been defined or no error has been supplied'
|
|
@@ -56,35 +62,26 @@ const toRelativePath = (to) => relative(process.cwd(), to) // const toRelativePa
|
|
|
56
62
|
|
|
57
63
|
const getRmrfCommands = PLATFORM === 'win32'
|
|
58
64
|
? (directory = DIRECTORY) => tidy(`
|
|
59
|
-
|
|
60
|
-
|
|
65
|
+
rmdir /s /q node_modules 2> nul & \
|
|
66
|
+
del package-lock.json 2> nul
|
|
61
67
|
`)
|
|
62
68
|
: (directory = DIRECTORY) => tidy(`
|
|
63
|
-
cd "${normalize(directory)}"
|
|
64
69
|
rm -rf node_modules package-lock.json
|
|
65
70
|
`)
|
|
66
71
|
|
|
67
72
|
const getNpmiCommands = PLATFORM === 'win32'
|
|
68
|
-
? (directory = DIRECTORY, registry = REGISTRY, force = false) => tidy(
|
|
69
|
-
cd "${normalize(directory)}"
|
|
70
|
-
${getRegistryParameter(registry, getForceParameter(force, 'npm i'))}
|
|
71
|
-
`)
|
|
73
|
+
? (directory = DIRECTORY, registry = REGISTRY, force = false) => tidy(getRegistryParameter(registry, getForceParameter(force, 'npm i')))
|
|
72
74
|
: (directory = DIRECTORY, registry = REGISTRY, force = false) => tidy(`
|
|
73
75
|
export PATH=/usr/local/bin:$PATH &> /dev/null
|
|
74
|
-
|
|
75
|
-
. "${normalize(NVM)}" 2> /dev/null
|
|
76
|
+
. "${NVM}" 2> /dev/null
|
|
76
77
|
${getRegistryParameter(registry, getForceParameter(force, 'npm i'))}
|
|
77
78
|
`)
|
|
78
79
|
|
|
79
80
|
const getDepsCommands = PLATFORM === 'win32'
|
|
80
|
-
? (directory = DIRECTORY, registry = REGISTRY, force = false) => tidy(
|
|
81
|
-
cd "${normalize(directory)}"
|
|
82
|
-
${getRegistryParameter(registry, getForceParameter(force, 'deps'))}
|
|
83
|
-
`)
|
|
81
|
+
? (directory = DIRECTORY, registry = REGISTRY, force = false) => tidy(getRegistryParameter(registry, getForceParameter(force, 'deps')))
|
|
84
82
|
: (directory = DIRECTORY, registry = REGISTRY, force = false) => tidy(`
|
|
85
83
|
export PATH=/usr/local/bin:$PATH &> /dev/null
|
|
86
|
-
|
|
87
|
-
. "${normalize(NVM)}" 2> /dev/null
|
|
84
|
+
. "${NVM}" 2> /dev/null
|
|
88
85
|
${getRegistryParameter(registry, getForceParameter(force, 'deps'))}
|
|
89
86
|
`)
|
|
90
87
|
|
|
@@ -243,7 +240,7 @@ function rmrf (directory = DIRECTORY) {
|
|
|
243
240
|
const {
|
|
244
241
|
stdout,
|
|
245
242
|
stderr
|
|
246
|
-
} = exec(commands, { cwd: directory }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
243
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
247
244
|
|
|
248
245
|
stdout.on('data', log)
|
|
249
246
|
stderr.on('data', log)
|
|
@@ -264,7 +261,7 @@ function npmi (directory = DIRECTORY, registry = REGISTRY, force = false) {
|
|
|
264
261
|
const {
|
|
265
262
|
stdout,
|
|
266
263
|
stderr
|
|
267
|
-
} = exec(commands, { cwd: directory }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
264
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
268
265
|
|
|
269
266
|
stdout.on('data', log)
|
|
270
267
|
stderr.on('data', log)
|
|
@@ -285,7 +282,7 @@ function deps (directory = DIRECTORY, registry = REGISTRY, force = false) {
|
|
|
285
282
|
const {
|
|
286
283
|
stdout,
|
|
287
284
|
stderr
|
|
288
|
-
} = exec(commands, { cwd: directory }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
285
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
289
286
|
|
|
290
287
|
stdout.on('data', log)
|
|
291
288
|
stderr.on('data', log)
|
package/lib/common/git/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.catGitRefsRemotesOriginHead=catGitRefsRemotesOriginHead;exports.gitAdd=gitAdd;exports.gitCheckout=gitCheckout;exports.gitCommit=gitCommit;exports.gitPull=gitPull;exports.gitPush=gitPush;exports.gitPushTags=gitPushTags;exports.gitRevParse=gitRevParse;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _child_process=require("child_process");var _env=require("../env");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const DIRECTORY='.';const BRANCH='master';const ADD='package.json package-lock.json';const COMMIT=_env.PLATFORM==='win32'?'Updated `package.json` &/ `package-lock.json`':'Updated \\`package.json\\` &/ \\`package-lock.json\\`';const OPTIONS={maxBuffer:1024*2000};const log=(0,_debug.default)('@modernpoacher/deps');log(`\`git\` (${_env.PLATFORM}) is awake`);const trim=v=>v.split('\n').map(v=>v.trimEnd()).join('\n').trim();function use(key){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function use(v){if(v.trim()==='')return;return log(trim(v));};}function out(key,directory){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function out(v){const s=v.trim();if(s===''||directory===s)return;return log(trim(s));};}function err(key,directory){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function err(v){const s=v.trim();if(s===''||directory===s||s.toLowerCase().startsWith('fatal: not a git repository'))return;return log(trim(s));};}const getErrorCode=({code=0}={})=>code;const getErrorMessage=({message=''}={})=>message;function getCatGitRefsRemotesOriginHeadCommands(directory=DIRECTORY){log('getCatGitRefsRemotesOriginHeadCommands');return`
|
|
2
|
-
DIR=$(echo "
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.catGitRefsRemotesOriginHead=catGitRefsRemotesOriginHead;exports.gitAdd=gitAdd;exports.gitCheckout=gitCheckout;exports.gitCommit=gitCommit;exports.gitPull=gitPull;exports.gitPush=gitPush;exports.gitPushTags=gitPushTags;exports.gitRevParse=gitRevParse;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _child_process=require("child_process");var _env=require("../env");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const DIRECTORY='.';const BRANCH='master';const ADD='package.json package-lock.json';const COMMIT=_env.PLATFORM==='win32'?'Updated `package.json` &/ `package-lock.json`':'Updated \\`package.json\\` &/ \\`package-lock.json\\`';const OPTIONS={maxBuffer:1024*2000,shell:true,stdio:'inherit'};const log=(0,_debug.default)('@modernpoacher/deps');log(`\`git\` (${_env.PLATFORM}) is awake`);const trim=v=>v.split('\n').map(v=>v.trimEnd()).join('\n').trim();function use(key){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function use(v){if(v.trim()==='')return;return log(trim(v));};}function out(key,directory){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function out(v){const s=v.trim();if(s===''||directory===s)return;return log(trim(s));};}function err(key,directory){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function err(v){const s=v.trim();if(s===''||directory===s||s.toLowerCase().startsWith('fatal: not a git repository'))return;return log(trim(s));};}const getErrorCode=({code=0}={})=>code;const getErrorMessage=({message=''}={})=>message;function getCatGitRefsRemotesOriginHeadCommands(directory=DIRECTORY){log('getCatGitRefsRemotesOriginHeadCommands');return`
|
|
2
|
+
DIR=$(echo "./.git/refs/remotes/origin/HEAD'" | sed -e "s/\\//\\\\\\/g" -e "s/://" | cat 2> /dev/null)
|
|
3
3
|
[[ $DIR =~ "[-0-9a-zA-Z]*$" ]]
|
|
4
4
|
echo "$\{BASH_REMATCH[0]}"
|
|
5
|
-
`;}function isCommandError(e){log('isCommandError');return getErrorCode(e)===1&&getErrorMessage(e).toLowerCase().startsWith('command failed:');}function catGitRefsRemotesOriginHead(directory=DIRECTORY){log('catGitRefsRemotesOriginHead');return new Promise((resolve,reject)=>{const commands=getCatGitRefsRemotesOriginHeadCommands(directory);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:directory},(e,v='')=>!e?resolve(trim(v)):reject(e));stdout.on('data',out('cat-git-refs-remotes-origin-head',directory.trim()));stderr.on('data',err('cat-git-refs-remotes-origin-head',directory.trim()));});}function gitRevParse(directory=DIRECTORY){log('gitRevParse');return new Promise((resolve,reject)=>{const commands='git rev-parse --show-toplevel';const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:directory},(e,v='')=>!e?resolve(trim(v)):reject(e));stdout.on('data',out('git-rev-parse',directory.trim()));stderr.on('data',err('git-rev-parse',directory.trim()));});}function gitCheckout(directory=DIRECTORY,branch=BRANCH){log('gitCheckout');return new Promise((resolve,reject)=>{const log=use('git-checkout');const commands=`
|
|
5
|
+
`;}function isCommandError(e){log('isCommandError');return getErrorCode(e)===1&&getErrorMessage(e).toLowerCase().startsWith('command failed:');}function catGitRefsRemotesOriginHead(directory=DIRECTORY){log('catGitRefsRemotesOriginHead');return new Promise((resolve,reject)=>{const commands=getCatGitRefsRemotesOriginHeadCommands(directory);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v='')=>!e?resolve(trim(v)):reject(e));stdout.on('data',out('cat-git-refs-remotes-origin-head',directory.trim()));stderr.on('data',err('cat-git-refs-remotes-origin-head',directory.trim()));});}function gitRevParse(directory=DIRECTORY){log('gitRevParse');return new Promise((resolve,reject)=>{const commands='git rev-parse --show-toplevel';const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v='')=>!e?resolve(trim(v)):reject(e));stdout.on('data',out('git-rev-parse',directory.trim()));stderr.on('data',err('git-rev-parse',directory.trim()));});}function gitCheckout(directory=DIRECTORY,branch=BRANCH){log('gitCheckout');return new Promise((resolve,reject)=>{const log=use('git-checkout');const commands=`git checkout ${branch}`;const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v)=>e?isCommandError(e)?resolve(v):reject(e):resolve(v));stdout.on('data',log);stderr.on('data',log);});}function gitPull(directory=DIRECTORY){log('gitPull');return new Promise((resolve,reject)=>{const log=use('git-pull');const commands='git pull';const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v)=>e?isCommandError(e)?resolve(v):reject(e):resolve(v));stdout.on('data',log);stderr.on('data',log);});}function gitPush(directory=DIRECTORY){log('gitPush');return new Promise((resolve,reject)=>{const log=use('git-push');const commands='git push';const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v)=>e?isCommandError(e)?resolve(v):reject(e):resolve(v));stdout.on('data',log);stderr.on('data',log);});}function gitPushTags(directory=DIRECTORY){log('gitPushTags');return new Promise((resolve,reject)=>{const log=use('git-push-tags');const commands='git push --tags';const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v)=>e?isCommandError(e)?resolve(v):reject(e):resolve(v));stdout.on('data',log);stderr.on('data',log);});}function gitAdd(directory=DIRECTORY,add=ADD){log('gitAdd');return new Promise((resolve,reject)=>{const log=use('git-add');const commands=`git add ${add}`;const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v)=>e?isCommandError(e)?resolve(v):reject(e):resolve(v));stdout.on('data',log);stderr.on('data',log);});}function gitCommit(directory=DIRECTORY,commit=COMMIT){log('gitCommit');return new Promise((resolve,reject)=>{const log=use('git-commit');const commands=`git commit -m "${commit}"`;const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(directory)},(e,v)=>e?isCommandError(e)?resolve(v):reject(e):resolve(v));stdout.on('data',log);stderr.on('data',log);});}
|
package/lib/common/index.js
CHANGED
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.getCommands=exports.getBundleDependencies=exports.REGISTRY=exports.NVM=exports.DIRECTORY=void 0;exports.getDeps=getDeps;exports.getDepsExact=getDepsExact;exports.isPreRelease=exports.isExact=exports.getSaveProdParameter=exports.getSaveOptionalParameter=exports.getSaveExactParameter=exports.getSaveDevParameter=exports.getSaveBundleParameter=exports.getRegistryParameter=exports.getProdDependencies=exports.getPeerDependencies=exports.getOptionalDependencies=exports.getNoSaveParameter=exports.getForceParameter=exports.getDevDependencies=void 0;exports.
|
|
2
|
-
cd "${(0,_path.normalize)(directory)}"
|
|
3
|
-
${commands}
|
|
4
|
-
`):(directory=DIRECTORY,commands='npm i')=>tidy(`
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.getCommands=exports.getBundleDependencies=exports.REGISTRY=exports.NVM=exports.DIRECTORY=void 0;exports.getDeps=getDeps;exports.getDepsExact=getDepsExact;exports.isPreRelease=exports.isExact=exports.getSaveProdParameter=exports.getSaveOptionalParameter=exports.getSaveExactParameter=exports.getSaveDevParameter=exports.getSaveBundleParameter=exports.getRegistryParameter=exports.getProdDependencies=exports.getPeerDependencies=exports.getOptionalDependencies=exports.getNoSaveParameter=exports.getForceParameter=exports.getDevDependencies=void 0;exports.normalizeCommands=normalizeCommands;exports.transform=transform;exports.transformDependency=void 0;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _env=require("./env");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const{path:MODULE_PATH}=module;const DIRECTORY='.';exports.DIRECTORY=DIRECTORY;const REGISTRY='https://registry.npmjs.org';exports.REGISTRY=REGISTRY;const NVM=(0,_path.resolve)(MODULE_PATH,'../../nvm.sh');exports.NVM=NVM;const log=(0,_debug.default)('@modernpoacher/deps');log(`\`common\` (${_env.PLATFORM}) is awake`);const tidy=v=>v.replace(/\n\n/gm,String.fromCharCode(10)).trim();const getSaveProdParameter=commands=>commands.concat(' --save-prod');exports.getSaveProdParameter=getSaveProdParameter;const getSaveDevParameter=commands=>commands.concat(' --save-dev');exports.getSaveDevParameter=getSaveDevParameter;const getSaveBundleParameter=commands=>commands.concat(' --save-bundle');exports.getSaveBundleParameter=getSaveBundleParameter;const getSaveOptionalParameter=commands=>commands.concat(' --save-optional');exports.getSaveOptionalParameter=getSaveOptionalParameter;const getRegistryParameter=(r,commands)=>r?commands.concat(` --registry ${r}`):commands;exports.getRegistryParameter=getRegistryParameter;const getForceParameter=(f,commands)=>f?commands.concat(' --force'):commands;exports.getForceParameter=getForceParameter;const getNoSaveParameter=(s,commands)=>s?commands:commands.concat(' --no-save');exports.getNoSaveParameter=getNoSaveParameter;const getSaveExactParameter=commands=>commands.concat(' --save-exact');exports.getSaveExactParameter=getSaveExactParameter;const getCommands=_env.PLATFORM==='win32'?(directory=DIRECTORY,commands='npm i')=>tidy(commands):(directory=DIRECTORY,commands='npm i')=>tidy(`
|
|
5
2
|
export PATH=/usr/local/bin:$PATH &> /dev/null
|
|
6
|
-
|
|
7
|
-
. "${(0,_path.normalize)(NVM)}" 2> /dev/null
|
|
3
|
+
. "${NVM}" 2> /dev/null
|
|
8
4
|
${commands}
|
|
9
|
-
`);exports.getCommands=getCommands;const getProdDependencies=({dependencies={}}={})=>dependencies;exports.getProdDependencies=getProdDependencies;const getDevDependencies=({devDependencies={}}={})=>devDependencies;exports.getDevDependencies=getDevDependencies;const getOptionalDependencies=({optionalDependencies={}}={})=>optionalDependencies;exports.getOptionalDependencies=getOptionalDependencies;const getBundleDependencies=({bundleDependencies=[]}={})=>bundleDependencies;exports.getBundleDependencies=getBundleDependencies;const getPeerDependencies=({peerDependencies}={})=>peerDependencies;exports.getPeerDependencies=getPeerDependencies;const isPreRelease=v=>/-/.test(v);exports.isPreRelease=isPreRelease;const isExact=v=>/^\d/.test(v);exports.isExact=isExact;function getDepsExact(values,configuration){log('getDepsExact');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator.concat({name,version:Reflect.has(configuration,name)?Reflect.get(configuration,name):version}):accumulator,[]);}function getDeps(values){log('getDeps');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator:isPreRelease(version)?accumulator.concat({name,version}):accumulator.concat({name,version:'latest'}),[]);}function
|
|
5
|
+
`);exports.getCommands=getCommands;const getProdDependencies=({dependencies={}}={})=>dependencies;exports.getProdDependencies=getProdDependencies;const getDevDependencies=({devDependencies={}}={})=>devDependencies;exports.getDevDependencies=getDevDependencies;const getOptionalDependencies=({optionalDependencies={}}={})=>optionalDependencies;exports.getOptionalDependencies=getOptionalDependencies;const getBundleDependencies=({bundleDependencies=[]}={})=>bundleDependencies;exports.getBundleDependencies=getBundleDependencies;const getPeerDependencies=({peerDependencies}={})=>peerDependencies;exports.getPeerDependencies=getPeerDependencies;const isPreRelease=v=>/-/.test(v);exports.isPreRelease=isPreRelease;const isExact=v=>/^\d/.test(v);exports.isExact=isExact;function getDepsExact(values,configuration){log('getDepsExact');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator.concat({name,version:Reflect.has(configuration,name)?Reflect.get(configuration,name):version}):accumulator,[]);}function getDeps(values){log('getDeps');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator:isPreRelease(version)?accumulator.concat({name,version}):accumulator.concat({name,version:'latest'}),[]);}function normalizeCommands(value){while(/\s\s|\n/.test(value)){value=value.replace(/\s\s/gm,String.fromCharCode(32)).replace(/\n/gm,String.fromCharCode(32));}return value.trim();}const transformDependency=({name='@modernpoacher/deps',version='latest'}={})=>`${name}@${version}`;exports.transformDependency=transformDependency;function transform(value){log('transform');return Array.isArray(value)?value.map(transformDependency).join(String.fromCharCode(32)).trim():transformDependency(value);}
|
package/lib/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.executeBundle=executeBundle;exports.executeDev=executeDev;exports.executeOptional=executeOptional;exports.executeProd=executeProd;exports.getInstallCommands=void 0;exports.getInstallSaveBundleCommands=getInstallSaveBundleCommands;exports.getInstallSaveBundleSaveExactCommands=getInstallSaveBundleSaveExactCommands;exports.getInstallSaveDevCommands=getInstallSaveDevCommands;exports.getInstallSaveDevSaveExactCommands=getInstallSaveDevSaveExactCommands;exports.getInstallSaveExactCommands=void 0;exports.getInstallSaveOptionalCommands=getInstallSaveOptionalCommands;exports.getInstallSaveOptionalSaveExactCommands=getInstallSaveOptionalSaveExactCommands;exports.getInstallSaveProdCommands=getInstallSaveProdCommands;exports.getInstallSaveProdSaveExactCommands=getInstallSaveProdSaveExactCommands;exports.installSaveBundle=installSaveBundle;exports.installSaveBundleSaveExact=installSaveBundleSaveExact;exports.installSaveDev=installSaveDev;exports.installSaveDevSaveExact=installSaveDevSaveExact;exports.installSaveOptional=installSaveOptional;exports.installSaveOptionalSaveExact=installSaveOptionalSaveExact;exports.installSaveProd=installSaveProd;exports.installSaveProdSaveExact=installSaveProdSaveExact;var _debug=_interopRequireDefault(require("debug"));var _child_process=require("child_process");var _env=require("./common/env");var _common=require("./common");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const log=(0,_debug.default)('@modernpoacher/deps');log(`\`deps\` (${_env.PLATFORM}) is awake`);const OPTIONS={maxBuffer:1024*2000};function use(key){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function use(v){const s=v.trim();if(s==='')return;return log(s);};}const getInstallSaveExactCommands=(p,r,f)=>{log('getInstallSaveExactCommands');const c=(0,_common.transform)(p);const commands=`npm i ${c}`;return(0,_common.
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.executeBundle=executeBundle;exports.executeDev=executeDev;exports.executeOptional=executeOptional;exports.executeProd=executeProd;exports.getInstallCommands=void 0;exports.getInstallSaveBundleCommands=getInstallSaveBundleCommands;exports.getInstallSaveBundleSaveExactCommands=getInstallSaveBundleSaveExactCommands;exports.getInstallSaveDevCommands=getInstallSaveDevCommands;exports.getInstallSaveDevSaveExactCommands=getInstallSaveDevSaveExactCommands;exports.getInstallSaveExactCommands=void 0;exports.getInstallSaveOptionalCommands=getInstallSaveOptionalCommands;exports.getInstallSaveOptionalSaveExactCommands=getInstallSaveOptionalSaveExactCommands;exports.getInstallSaveProdCommands=getInstallSaveProdCommands;exports.getInstallSaveProdSaveExactCommands=getInstallSaveProdSaveExactCommands;exports.installSaveBundle=installSaveBundle;exports.installSaveBundleSaveExact=installSaveBundleSaveExact;exports.installSaveDev=installSaveDev;exports.installSaveDevSaveExact=installSaveDevSaveExact;exports.installSaveOptional=installSaveOptional;exports.installSaveOptionalSaveExact=installSaveOptionalSaveExact;exports.installSaveProd=installSaveProd;exports.installSaveProdSaveExact=installSaveProdSaveExact;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _child_process=require("child_process");var _env=require("./common/env");var _common=require("./common");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const log=(0,_debug.default)('@modernpoacher/deps');log(`\`deps\` (${_env.PLATFORM}) is awake`);const OPTIONS={maxBuffer:1024*2000,shell:true,stdio:'inherit'};function use(key){const log=(0,_debug.default)(`@modernpoacher/deps:${key}`);return function use(v){const s=v.trim();if(s==='')return;return log(s);};}const getInstallSaveExactCommands=(p,r,f)=>{log('getInstallSaveExactCommands');const c=(0,_common.transform)(p);const commands=`npm i ${c}`;return(0,_common.normalizeCommands)((0,_common.getRegistryParameter)(r,(0,_common.getForceParameter)(f,(0,_common.getSaveExactParameter)(commands))));};exports.getInstallSaveExactCommands=getInstallSaveExactCommands;const getInstallCommands=(p,r,f)=>{log('getInstallCommands');const c=(0,_common.transform)(p);const commands=`npm i ${c}`;return(0,_common.normalizeCommands)((0,_common.getRegistryParameter)(r,(0,_common.getForceParameter)(f,commands)));};exports.getInstallCommands=getInstallCommands;function getInstallSaveBundleSaveExactCommands(p,r,f){log('getInstallSaveBundleSaveExactCommands');const commands=getInstallSaveExactCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveBundleParameter)(commands));}function getInstallSaveBundleCommands(p,r,f){log('getInstallSaveBundleCommands');const commands=getInstallCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveBundleParameter)(commands));}function getInstallSaveOptionalSaveExactCommands(p,r,f){log('getInstallSaveOptionalSaveExactCommands');const commands=getInstallSaveExactCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveOptionalParameter)(commands));}function getInstallSaveOptionalCommands(p,r,f){log('getInstallSaveOptionalCommands');const commands=getInstallCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveOptionalParameter)(commands));}function getInstallSaveDevSaveExactCommands(p,r,f){log('getInstallSaveDevSaveExactCommands');const commands=getInstallSaveExactCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveDevParameter)(commands));}function getInstallSaveDevCommands(p,r,f){log('getInstallSaveDevCommands');const commands=getInstallCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveDevParameter)(commands));}function getInstallSaveProdSaveExactCommands(p,r,f){log('getInstallSaveProdSaveExactCommands');const commands=getInstallSaveExactCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveProdParameter)(commands));}function getInstallSaveProdCommands(p,r,f){log('getInstallSaveProdCommands');const commands=getInstallCommands(p,r,f);return(0,_common.normalizeCommands)((0,_common.getSaveProdParameter)(commands));}function installSaveBundleSaveExact(d,p,r,f){log('installSaveBundleSaveExact');return new Promise((resolve,reject)=>{const log=use('install-save-bundle-save-exact');const commands=(0,_common.getCommands)(d,getInstallSaveBundleSaveExactCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function installSaveBundle(d,p,r,f){log('installSaveBundle');return new Promise((resolve,reject)=>{const log=use('install-save-bundle');const commands=(0,_common.getCommands)(d,getInstallSaveBundleCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function installSaveOptionalSaveExact(d,p,r,f){log('installSaveOptionalSaveExact');return new Promise((resolve,reject)=>{const log=use('install-save-otional-save-exact');const commands=(0,_common.getCommands)(d,getInstallSaveOptionalSaveExactCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function installSaveOptional(d,p,r,f){log('installSaveOptional');return new Promise((resolve,reject)=>{const log=use('install-save-otional');const commands=(0,_common.getCommands)(d,getInstallSaveOptionalCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function installSaveDevSaveExact(d,p,r,f){log('installSaveDevSaveExact');return new Promise((resolve,reject)=>{const log=use('install-save-dev-save-exact');const commands=(0,_common.getCommands)(d,getInstallSaveDevSaveExactCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function installSaveDev(d,p,r,f){log('installSaveDev');return new Promise((resolve,reject)=>{const log=use('install-save-dev');const commands=(0,_common.getCommands)(d,getInstallSaveDevCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function installSaveProdSaveExact(d,p,r,f){log('installSaveProdSaveExact');return new Promise((resolve,reject)=>{const log=use('install-save-prod-save-exact');const commands=(0,_common.getCommands)(d,getInstallSaveProdSaveExactCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function installSaveProd(d,p,r,f){log('installSaveProd');return new Promise((resolve,reject)=>{const log=use('install-save-prod');const commands=(0,_common.getCommands)(d,getInstallSaveProdCommands(p,r,f));log(commands);const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}async function executeBundle(directory=_common.DIRECTORY,packages={},configuration={},registry=_common.REGISTRY,force=false){log('executeBundle');const depsExact=(0,_common.getDepsExact)(packages,configuration);if(depsExact.length)await installSaveBundleSaveExact(directory,depsExact,registry,force);const deps=(0,_common.getDeps)(packages);if(deps.length)await installSaveBundle(directory,deps,registry,force);}async function executeOptional(directory=_common.DIRECTORY,packages={},configuration={},registry=_common.REGISTRY,force=false){log('executeOptional');const depsExact=(0,_common.getDepsExact)(packages,configuration);if(depsExact.length)await installSaveOptionalSaveExact(directory,depsExact,registry);const deps=(0,_common.getDeps)(packages);if(deps.length)await installSaveOptional(directory,deps,registry);}async function executeDev(directory=_common.DIRECTORY,packages={},configuration={},registry=_common.REGISTRY,force=false){log('executeDev');const depsExact=(0,_common.getDepsExact)(packages,configuration);if(depsExact.length)await installSaveDevSaveExact(directory,depsExact,registry,force);const deps=(0,_common.getDeps)(packages);if(deps.length)await installSaveDev(directory,deps,registry,force);}async function executeProd(directory=_common.DIRECTORY,packages={},configuration={},registry=_common.REGISTRY,force=false){log('executeProd');const depsExact=(0,_common.getDepsExact)(packages,configuration);if(depsExact.length)await installSaveProdSaveExact(directory,depsExact,registry,force);const deps=(0,_common.getDeps)(packages);if(deps.length)await installSaveProd(directory,deps,registry,force);}
|
package/lib/install/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.execute=execute;exports.getInstallSaveExactCommands=exports.getInstallCommands=void 0;exports.install=install;exports.installSaveExact=installSaveExact;var _debug=_interopRequireDefault(require("debug"));var _os=require("os");var _child_process=require("child_process");var _common=require("../common");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const log=(0,_debug.default)('@modernpoacher/deps:install');log(`\`install\` (${_os.platform}) is awake`);const OPTIONS={maxBuffer:1024*2000};const getInstallSaveExactCommands=(p,s,r,f)=>{log('getInstallSaveExactCommands');const c=(0,_common.transform)(p);const commands=`npm i ${c}`;return(0,_common.
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.execute=execute;exports.getInstallSaveExactCommands=exports.getInstallCommands=void 0;exports.install=install;exports.installSaveExact=installSaveExact;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _os=require("os");var _child_process=require("child_process");var _common=require("../common");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const log=(0,_debug.default)('@modernpoacher/deps:install');log(`\`install\` (${_os.platform}) is awake`);const OPTIONS={maxBuffer:1024*2000};const getInstallSaveExactCommands=(p,s,r,f)=>{log('getInstallSaveExactCommands');const c=(0,_common.transform)(p);const commands=`npm i ${c}`;return(0,_common.normalizeCommands)((0,_common.getNoSaveParameter)(s,(0,_common.getRegistryParameter)(r,(0,_common.getForceParameter)(f,(0,_common.getSaveExactParameter)(commands)))));};exports.getInstallSaveExactCommands=getInstallSaveExactCommands;const getInstallCommands=(p,s,r,f)=>{log('getInstallCommands');const c=(0,_common.transform)(p);const commands=`npm i ${c}`;return(0,_common.normalizeCommands)((0,_common.getNoSaveParameter)(s,(0,_common.getRegistryParameter)(r,(0,_common.getForceParameter)(f,commands))));};exports.getInstallCommands=getInstallCommands;function installSaveExact(d,p,s,r,f){log('installSaveExact');return new Promise((resolve,reject)=>{const commands=(0,_common.getCommands)(d,getInstallSaveExactCommands(p,s,r,f));const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}function install(d,p,s,r,f){log('install');return new Promise((resolve,reject)=>{const commands=(0,_common.getCommands)(d,getInstallCommands(p,s,r,f));const{stdout,stderr}=(0,_child_process.exec)(commands,{...OPTIONS,cwd:(0,_path.normalize)(d)},(e,v)=>!e?resolve(v):reject(e));stdout.on('data',log);stderr.on('data',log);});}async function execute(directory=_common.DIRECTORY,packages={},configuration={},save=false,registry=_common.REGISTRY,force=false){log('execute');const depsExact=(0,_common.getDepsExact)(packages,configuration);if(depsExact.length)await installSaveExact(directory,depsExact,save,registry,force);const deps=(0,_common.getDeps)(packages);if(deps.length)await install(directory,deps,save,registry,force);}
|
package/package.json
CHANGED
package/src/common/git/index.js
CHANGED
|
@@ -23,7 +23,9 @@ const COMMIT = PLATFORM === 'win32'
|
|
|
23
23
|
: 'Updated \\`package.json\\` &/ \\`package-lock.json\\`' /* eslint-disable-line no-useless-escape */
|
|
24
24
|
|
|
25
25
|
const OPTIONS = {
|
|
26
|
-
maxBuffer: 1024 * 2000
|
|
26
|
+
maxBuffer: 1024 * 2000,
|
|
27
|
+
shell: true,
|
|
28
|
+
stdio: 'inherit'
|
|
27
29
|
}
|
|
28
30
|
|
|
29
31
|
const log = debug('@modernpoacher/deps')
|
|
@@ -107,7 +109,7 @@ function getCatGitRefsRemotesOriginHeadCommands (directory = DIRECTORY) { /* esl
|
|
|
107
109
|
log('getCatGitRefsRemotesOriginHeadCommands')
|
|
108
110
|
|
|
109
111
|
return `
|
|
110
|
-
DIR=$(echo "
|
|
112
|
+
DIR=$(echo "./.git/refs/remotes/origin/HEAD'" | sed -e "s/\\//\\\\\\/g" -e "s/://" | cat 2> /dev/null)
|
|
111
113
|
[[ $DIR =~ "[-0-9a-zA-Z]*$" ]]
|
|
112
114
|
echo "$\{BASH_REMATCH[0]}"
|
|
113
115
|
` /* eslint-enable no-useless-escape */
|
|
@@ -155,7 +157,7 @@ export function catGitRefsRemotesOriginHead (directory = DIRECTORY) {
|
|
|
155
157
|
const {
|
|
156
158
|
stdout,
|
|
157
159
|
stderr
|
|
158
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v = '') => (!e) ? resolve(trim(v)) : reject(e))
|
|
160
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v = '') => (!e) ? resolve(trim(v)) : reject(e))
|
|
159
161
|
|
|
160
162
|
stdout.on('data', out('cat-git-refs-remotes-origin-head', directory.trim()))
|
|
161
163
|
stderr.on('data', err('cat-git-refs-remotes-origin-head', directory.trim()))
|
|
@@ -187,7 +189,7 @@ export function gitRevParse (directory = DIRECTORY) {
|
|
|
187
189
|
const {
|
|
188
190
|
stdout,
|
|
189
191
|
stderr
|
|
190
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v = '') => (!e) ? resolve(trim(v)) : reject(e))
|
|
192
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v = '') => (!e) ? resolve(trim(v)) : reject(e))
|
|
191
193
|
|
|
192
194
|
stdout.on('data', out('git-rev-parse', directory.trim()))
|
|
193
195
|
stderr.on('data', err('git-rev-parse', directory.trim()))
|
|
@@ -211,7 +213,7 @@ export function gitCheckout (directory = DIRECTORY, branch = BRANCH) {
|
|
|
211
213
|
return (
|
|
212
214
|
new Promise((resolve, reject) => {
|
|
213
215
|
const log = use('git-checkout')
|
|
214
|
-
const commands = `
|
|
216
|
+
const commands = `git checkout ${branch}`
|
|
215
217
|
|
|
216
218
|
/**
|
|
217
219
|
* log(commands)
|
|
@@ -220,7 +222,7 @@ export function gitCheckout (directory = DIRECTORY, branch = BRANCH) {
|
|
|
220
222
|
const {
|
|
221
223
|
stdout,
|
|
222
224
|
stderr
|
|
223
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
225
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
224
226
|
|
|
225
227
|
stdout.on('data', log)
|
|
226
228
|
stderr.on('data', log)
|
|
@@ -243,7 +245,7 @@ export function gitPull (directory = DIRECTORY) {
|
|
|
243
245
|
return (
|
|
244
246
|
new Promise((resolve, reject) => {
|
|
245
247
|
const log = use('git-pull')
|
|
246
|
-
const commands =
|
|
248
|
+
const commands = 'git pull'
|
|
247
249
|
|
|
248
250
|
/**
|
|
249
251
|
* log(commands)
|
|
@@ -252,7 +254,7 @@ export function gitPull (directory = DIRECTORY) {
|
|
|
252
254
|
const {
|
|
253
255
|
stdout,
|
|
254
256
|
stderr
|
|
255
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
257
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
256
258
|
|
|
257
259
|
stdout.on('data', log)
|
|
258
260
|
stderr.on('data', log)
|
|
@@ -275,7 +277,7 @@ export function gitPush (directory = DIRECTORY) {
|
|
|
275
277
|
return (
|
|
276
278
|
new Promise((resolve, reject) => {
|
|
277
279
|
const log = use('git-push')
|
|
278
|
-
const commands =
|
|
280
|
+
const commands = 'git push'
|
|
279
281
|
|
|
280
282
|
/**
|
|
281
283
|
* log(commands)
|
|
@@ -284,7 +286,7 @@ export function gitPush (directory = DIRECTORY) {
|
|
|
284
286
|
const {
|
|
285
287
|
stdout,
|
|
286
288
|
stderr
|
|
287
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
289
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
288
290
|
|
|
289
291
|
stdout.on('data', log)
|
|
290
292
|
stderr.on('data', log)
|
|
@@ -307,7 +309,7 @@ export function gitPushTags (directory = DIRECTORY) {
|
|
|
307
309
|
return (
|
|
308
310
|
new Promise((resolve, reject) => {
|
|
309
311
|
const log = use('git-push-tags')
|
|
310
|
-
const commands =
|
|
312
|
+
const commands = 'git push --tags'
|
|
311
313
|
|
|
312
314
|
/**
|
|
313
315
|
* log(commands)
|
|
@@ -316,7 +318,7 @@ export function gitPushTags (directory = DIRECTORY) {
|
|
|
316
318
|
const {
|
|
317
319
|
stdout,
|
|
318
320
|
stderr
|
|
319
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
321
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
320
322
|
|
|
321
323
|
stdout.on('data', log)
|
|
322
324
|
stderr.on('data', log)
|
|
@@ -340,7 +342,7 @@ export function gitAdd (directory = DIRECTORY, add = ADD) {
|
|
|
340
342
|
return (
|
|
341
343
|
new Promise((resolve, reject) => {
|
|
342
344
|
const log = use('git-add')
|
|
343
|
-
const commands = `
|
|
345
|
+
const commands = `git add ${add}`
|
|
344
346
|
|
|
345
347
|
/**
|
|
346
348
|
* log(commands)
|
|
@@ -349,7 +351,7 @@ export function gitAdd (directory = DIRECTORY, add = ADD) {
|
|
|
349
351
|
const {
|
|
350
352
|
stdout,
|
|
351
353
|
stderr
|
|
352
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
354
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
353
355
|
|
|
354
356
|
stdout.on('data', log)
|
|
355
357
|
stderr.on('data', log)
|
|
@@ -373,7 +375,7 @@ export function gitCommit (directory = DIRECTORY, commit = COMMIT) {
|
|
|
373
375
|
return (
|
|
374
376
|
new Promise((resolve, reject) => {
|
|
375
377
|
const log = use('git-commit')
|
|
376
|
-
const commands = `
|
|
378
|
+
const commands = `git commit -m "${commit}"`
|
|
377
379
|
|
|
378
380
|
/**
|
|
379
381
|
* log(commands)
|
|
@@ -382,7 +384,7 @@ export function gitCommit (directory = DIRECTORY, commit = COMMIT) {
|
|
|
382
384
|
const {
|
|
383
385
|
stdout,
|
|
384
386
|
stderr
|
|
385
|
-
} = exec(commands, { ...OPTIONS, cwd: directory }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
387
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(directory) }, (e, v) => (e) ? isCommandError(e) ? resolve(v) : reject(e) : resolve(v))
|
|
386
388
|
|
|
387
389
|
stdout.on('data', log)
|
|
388
390
|
stderr.on('data', log)
|
package/src/common/index.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import debug from 'debug'
|
|
2
2
|
|
|
3
3
|
import {
|
|
4
|
-
resolve
|
|
5
|
-
normalize
|
|
4
|
+
resolve
|
|
6
5
|
} from 'path'
|
|
7
6
|
|
|
8
7
|
import {
|
|
@@ -129,14 +128,10 @@ export const getSaveExactParameter = (commands) => commands.concat(' --save-exac
|
|
|
129
128
|
*/
|
|
130
129
|
|
|
131
130
|
export const getCommands = PLATFORM === 'win32'
|
|
132
|
-
? (directory = DIRECTORY, commands = 'npm i') => tidy(
|
|
133
|
-
cd "${normalize(directory)}"
|
|
134
|
-
${commands}
|
|
135
|
-
`)
|
|
131
|
+
? (directory = DIRECTORY, commands = 'npm i') => tidy(commands)
|
|
136
132
|
: (directory = DIRECTORY, commands = 'npm i') => tidy(`
|
|
137
133
|
export PATH=/usr/local/bin:$PATH &> /dev/null
|
|
138
|
-
|
|
139
|
-
. "${normalize(NVM)}" 2> /dev/null
|
|
134
|
+
. "${NVM}" 2> /dev/null
|
|
140
135
|
${commands}
|
|
141
136
|
`)
|
|
142
137
|
|
|
@@ -265,7 +260,7 @@ export function getDeps (values) {
|
|
|
265
260
|
}
|
|
266
261
|
|
|
267
262
|
/**
|
|
268
|
-
* @function
|
|
263
|
+
* @function normalizeCommands
|
|
269
264
|
*
|
|
270
265
|
* Normalise the commands string
|
|
271
266
|
*
|
|
@@ -273,7 +268,7 @@ export function getDeps (values) {
|
|
|
273
268
|
*
|
|
274
269
|
* @return {String}
|
|
275
270
|
*/
|
|
276
|
-
export function
|
|
271
|
+
export function normalizeCommands (value) {
|
|
277
272
|
while (/\s\s|\n/.test(value)) {
|
|
278
273
|
value = value.replace(/\s\s/gm, String.fromCharCode(32)).replace(/\n/gm, String.fromCharCode(32))
|
|
279
274
|
}
|
package/src/index.js
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import debug from 'debug'
|
|
2
2
|
|
|
3
|
+
import {
|
|
4
|
+
normalize
|
|
5
|
+
} from 'path'
|
|
6
|
+
|
|
3
7
|
import {
|
|
4
8
|
exec
|
|
5
9
|
} from 'child_process'
|
|
@@ -19,7 +23,7 @@ import {
|
|
|
19
23
|
getSaveDevParameter,
|
|
20
24
|
getSaveProdParameter,
|
|
21
25
|
getCommands,
|
|
22
|
-
|
|
26
|
+
normalizeCommands,
|
|
23
27
|
transform,
|
|
24
28
|
getDepsExact,
|
|
25
29
|
getDeps
|
|
@@ -30,7 +34,9 @@ const log = debug('@modernpoacher/deps')
|
|
|
30
34
|
log(`\`deps\` (${PLATFORM}) is awake`)
|
|
31
35
|
|
|
32
36
|
const OPTIONS = {
|
|
33
|
-
maxBuffer: 1024 * 2000
|
|
37
|
+
maxBuffer: 1024 * 2000,
|
|
38
|
+
shell: true,
|
|
39
|
+
stdio: 'inherit'
|
|
34
40
|
}
|
|
35
41
|
|
|
36
42
|
function use (key) {
|
|
@@ -64,7 +70,7 @@ export const getInstallSaveExactCommands = (p, r, f) => {
|
|
|
64
70
|
const c = transform(p)
|
|
65
71
|
const commands = `npm i ${c}`
|
|
66
72
|
|
|
67
|
-
return
|
|
73
|
+
return normalizeCommands(
|
|
68
74
|
getRegistryParameter(r, getForceParameter(f, getSaveExactParameter(commands)))
|
|
69
75
|
)
|
|
70
76
|
}
|
|
@@ -86,7 +92,7 @@ export const getInstallCommands = (p, r, f) => {
|
|
|
86
92
|
const c = transform(p)
|
|
87
93
|
const commands = `npm i ${c}`
|
|
88
94
|
|
|
89
|
-
return
|
|
95
|
+
return normalizeCommands(
|
|
90
96
|
getRegistryParameter(r, getForceParameter(f, commands))
|
|
91
97
|
)
|
|
92
98
|
}
|
|
@@ -107,7 +113,7 @@ export function getInstallSaveBundleSaveExactCommands (p, r, f) {
|
|
|
107
113
|
|
|
108
114
|
const commands = getInstallSaveExactCommands(p, r, f)
|
|
109
115
|
|
|
110
|
-
return
|
|
116
|
+
return normalizeCommands(
|
|
111
117
|
getSaveBundleParameter(commands)
|
|
112
118
|
)
|
|
113
119
|
}
|
|
@@ -128,7 +134,7 @@ export function getInstallSaveBundleCommands (p, r, f) {
|
|
|
128
134
|
|
|
129
135
|
const commands = getInstallCommands(p, r, f)
|
|
130
136
|
|
|
131
|
-
return
|
|
137
|
+
return normalizeCommands(
|
|
132
138
|
getSaveBundleParameter(commands)
|
|
133
139
|
)
|
|
134
140
|
}
|
|
@@ -149,7 +155,7 @@ export function getInstallSaveOptionalSaveExactCommands (p, r, f) {
|
|
|
149
155
|
|
|
150
156
|
const commands = getInstallSaveExactCommands(p, r, f)
|
|
151
157
|
|
|
152
|
-
return
|
|
158
|
+
return normalizeCommands(
|
|
153
159
|
getSaveOptionalParameter(commands)
|
|
154
160
|
)
|
|
155
161
|
}
|
|
@@ -170,7 +176,7 @@ export function getInstallSaveOptionalCommands (p, r, f) {
|
|
|
170
176
|
|
|
171
177
|
const commands = getInstallCommands(p, r, f)
|
|
172
178
|
|
|
173
|
-
return
|
|
179
|
+
return normalizeCommands(
|
|
174
180
|
getSaveOptionalParameter(commands)
|
|
175
181
|
)
|
|
176
182
|
}
|
|
@@ -191,7 +197,7 @@ export function getInstallSaveDevSaveExactCommands (p, r, f) {
|
|
|
191
197
|
|
|
192
198
|
const commands = getInstallSaveExactCommands(p, r, f)
|
|
193
199
|
|
|
194
|
-
return
|
|
200
|
+
return normalizeCommands(
|
|
195
201
|
getSaveDevParameter(commands)
|
|
196
202
|
)
|
|
197
203
|
}
|
|
@@ -212,7 +218,7 @@ export function getInstallSaveDevCommands (p, r, f) {
|
|
|
212
218
|
|
|
213
219
|
const commands = getInstallCommands(p, r, f)
|
|
214
220
|
|
|
215
|
-
return
|
|
221
|
+
return normalizeCommands(
|
|
216
222
|
getSaveDevParameter(commands)
|
|
217
223
|
)
|
|
218
224
|
}
|
|
@@ -233,7 +239,7 @@ export function getInstallSaveProdSaveExactCommands (p, r, f) {
|
|
|
233
239
|
|
|
234
240
|
const commands = getInstallSaveExactCommands(p, r, f)
|
|
235
241
|
|
|
236
|
-
return
|
|
242
|
+
return normalizeCommands(
|
|
237
243
|
getSaveProdParameter(commands)
|
|
238
244
|
)
|
|
239
245
|
}
|
|
@@ -254,7 +260,7 @@ export function getInstallSaveProdCommands (p, r, f) {
|
|
|
254
260
|
|
|
255
261
|
const commands = getInstallCommands(p, r, f)
|
|
256
262
|
|
|
257
|
-
return
|
|
263
|
+
return normalizeCommands(
|
|
258
264
|
getSaveProdParameter(commands)
|
|
259
265
|
)
|
|
260
266
|
}
|
|
@@ -284,7 +290,7 @@ export function installSaveBundleSaveExact (d, p, r, f) {
|
|
|
284
290
|
const {
|
|
285
291
|
stdout,
|
|
286
292
|
stderr
|
|
287
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
293
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
288
294
|
|
|
289
295
|
stdout.on('data', log)
|
|
290
296
|
stderr.on('data', log)
|
|
@@ -317,7 +323,7 @@ export function installSaveBundle (d, p, r, f) {
|
|
|
317
323
|
const {
|
|
318
324
|
stdout,
|
|
319
325
|
stderr
|
|
320
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
326
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
321
327
|
|
|
322
328
|
stdout.on('data', log)
|
|
323
329
|
stderr.on('data', log)
|
|
@@ -350,7 +356,7 @@ export function installSaveOptionalSaveExact (d, p, r, f) {
|
|
|
350
356
|
const {
|
|
351
357
|
stdout,
|
|
352
358
|
stderr
|
|
353
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
359
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
354
360
|
|
|
355
361
|
stdout.on('data', log)
|
|
356
362
|
stderr.on('data', log)
|
|
@@ -383,7 +389,7 @@ export function installSaveOptional (d, p, r, f) {
|
|
|
383
389
|
const {
|
|
384
390
|
stdout,
|
|
385
391
|
stderr
|
|
386
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
392
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
387
393
|
|
|
388
394
|
stdout.on('data', log)
|
|
389
395
|
stderr.on('data', log)
|
|
@@ -416,7 +422,7 @@ export function installSaveDevSaveExact (d, p, r, f) {
|
|
|
416
422
|
const {
|
|
417
423
|
stdout,
|
|
418
424
|
stderr
|
|
419
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
425
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
420
426
|
|
|
421
427
|
stdout.on('data', log)
|
|
422
428
|
stderr.on('data', log)
|
|
@@ -449,7 +455,7 @@ export function installSaveDev (d, p, r, f) {
|
|
|
449
455
|
const {
|
|
450
456
|
stdout,
|
|
451
457
|
stderr
|
|
452
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
458
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
453
459
|
|
|
454
460
|
stdout.on('data', log)
|
|
455
461
|
stderr.on('data', log)
|
|
@@ -482,7 +488,7 @@ export function installSaveProdSaveExact (d, p, r, f) {
|
|
|
482
488
|
const {
|
|
483
489
|
stdout,
|
|
484
490
|
stderr
|
|
485
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
491
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
486
492
|
|
|
487
493
|
stdout.on('data', log)
|
|
488
494
|
stderr.on('data', log)
|
|
@@ -515,7 +521,7 @@ export function installSaveProd (d, p, r, f) {
|
|
|
515
521
|
const {
|
|
516
522
|
stdout,
|
|
517
523
|
stderr
|
|
518
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
524
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
519
525
|
|
|
520
526
|
stdout.on('data', log)
|
|
521
527
|
stderr.on('data', log)
|
package/src/install/index.js
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import debug from 'debug'
|
|
2
2
|
|
|
3
|
+
import {
|
|
4
|
+
normalize
|
|
5
|
+
} from 'path'
|
|
6
|
+
|
|
3
7
|
import {
|
|
4
8
|
platform
|
|
5
9
|
} from 'os'
|
|
@@ -16,7 +20,7 @@ import {
|
|
|
16
20
|
getForceParameter,
|
|
17
21
|
getSaveExactParameter,
|
|
18
22
|
getCommands,
|
|
19
|
-
|
|
23
|
+
normalizeCommands,
|
|
20
24
|
transform,
|
|
21
25
|
getDepsExact,
|
|
22
26
|
getDeps
|
|
@@ -48,7 +52,7 @@ export const getInstallSaveExactCommands = (p, s, r, f) => {
|
|
|
48
52
|
const c = transform(p)
|
|
49
53
|
const commands = `npm i ${c}`
|
|
50
54
|
|
|
51
|
-
return
|
|
55
|
+
return normalizeCommands(
|
|
52
56
|
getNoSaveParameter(s, getRegistryParameter(r, getForceParameter(f, getSaveExactParameter(commands))))
|
|
53
57
|
)
|
|
54
58
|
}
|
|
@@ -71,7 +75,7 @@ export const getInstallCommands = (p, s, r, f) => {
|
|
|
71
75
|
const c = transform(p)
|
|
72
76
|
const commands = `npm i ${c}`
|
|
73
77
|
|
|
74
|
-
return
|
|
78
|
+
return normalizeCommands(
|
|
75
79
|
getNoSaveParameter(s, getRegistryParameter(r, getForceParameter(f, commands)))
|
|
76
80
|
)
|
|
77
81
|
}
|
|
@@ -99,7 +103,7 @@ export function installSaveExact (d, p, s, r, f) {
|
|
|
99
103
|
const {
|
|
100
104
|
stdout,
|
|
101
105
|
stderr
|
|
102
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
106
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
103
107
|
|
|
104
108
|
stdout.on('data', log)
|
|
105
109
|
stderr.on('data', log)
|
|
@@ -130,7 +134,7 @@ export function install (d, p, s, r, f) {
|
|
|
130
134
|
const {
|
|
131
135
|
stdout,
|
|
132
136
|
stderr
|
|
133
|
-
} = exec(commands, { ...OPTIONS, cwd: d }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
137
|
+
} = exec(commands, { ...OPTIONS, cwd: normalize(d) }, (e, v) => (!e) ? resolve(v) : reject(e))
|
|
134
138
|
|
|
135
139
|
stdout.on('data', log)
|
|
136
140
|
stderr.on('data', log)
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
isExact,
|
|
15
15
|
getDepsExact,
|
|
16
16
|
getDeps,
|
|
17
|
-
|
|
17
|
+
normalizeCommands,
|
|
18
18
|
transformDependency,
|
|
19
19
|
transform,
|
|
20
20
|
getProdDependencies,
|
|
@@ -147,9 +147,9 @@ describe('@modernpoacher/deps/common', () => {
|
|
|
147
147
|
})
|
|
148
148
|
})
|
|
149
149
|
|
|
150
|
-
describe('`
|
|
150
|
+
describe('`normalizeCommands`', () => {
|
|
151
151
|
it('is a function', () => {
|
|
152
|
-
return expect(
|
|
152
|
+
return expect(normalizeCommands)
|
|
153
153
|
.to.be.a('function')
|
|
154
154
|
})
|
|
155
155
|
})
|