@mschauer5/spfx-toolkit 1.0.18 → 1.0.20

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 (6) hide show
  1. package/lib/commands/installer.command.js +7 -5
  2. package/lib/commands/installer.command.js.map +1 -1
  3. package/lib/index.js +2 -2
  4. package/package.json +1 -1
  5. package/src/commands/installer.command.ts +9 -5
  6. package/src/index.ts +2 -2
package/lib/commands/installer.command.js CHANGED
@@ -15,13 +15,13 @@ const scripts_command_1 = require("./scripts.command");
15
15
  const logger_1 = require("../common/logger");
16
16
  const install = (name, fromScripts) => __awaiter(void 0, void 0, void 0, function* () {
17
17
  const usercommand = yield (0, detect_package_manager_1.detect)();
18
- if (!fromScripts) {
18
+ const spawn = require('cross-spawn');
19
+ if (fromScripts) {
19
20
  const getScriptByNameValue = yield (0, scripts_command_1.getScriptByName)(`install:${name}`);
20
21
  if (getScriptByNameValue !== undefined) {
21
22
  const args = getScriptByNameValue.split(' ');
22
23
  // add install to the command
23
24
  args.unshift('install');
24
- const spawn = require('cross-spawn');
25
25
  spawn.sync(usercommand, args, { stdio: 'inherit' });
26
26
  return;
27
27
  }
@@ -30,21 +30,24 @@ const install = (name, fromScripts) => __awaiter(void 0, void 0, void 0, functio
30
30
  }
31
31
  return;
32
32
  }
33
+ if (name === undefined) {
34
+ spawn.sync(usercommand, 'install', { stdio: 'inherit' });
35
+ return;
36
+ }
33
37
  const args = name.split(' ');
34
38
  args.unshift('install');
35
- const spawn = require('cross-spawn');
36
39
  spawn.sync(usercommand, args, { stdio: 'inherit' });
37
40
  return;
38
41
  });
39
42
  exports.install = install;
40
43
  const uninstall = (name, fromScripts) => __awaiter(void 0, void 0, void 0, function* () {
41
44
  const usercommand = yield (0, detect_package_manager_1.detect)();
45
+ const spawn = require('cross-spawn');
42
46
  if (!fromScripts) {
43
47
  const getScriptByNameValue = yield (0, scripts_command_1.getScriptByName)(`install:${name}`);
44
48
  if (getScriptByNameValue !== undefined) {
45
49
  const args = getScriptByNameValue.split(' ');
46
50
  args.unshift('uninstall');
47
- const spawn = require('cross-spawn');
48
51
  spawn.sync(usercommand, args, { stdio: 'inherit' });
49
52
  return;
50
53
  }
@@ -55,7 +58,6 @@ const uninstall = (name, fromScripts) => __awaiter(void 0, void 0, void 0, funct
55
58
  }
56
59
  const args = name.split(' ');
57
60
  args.unshift('uninstall');
58
- const spawn = require('cross-spawn');
59
61
  spawn.sync(usercommand, args, { stdio: 'inherit' });
60
62
  return;
61
63
  });
package/lib/commands/installer.command.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"installer.command.js","sourceRoot":"","sources":["../../src/commands/installer.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAgD;AAChD,uDAAoD;AACpD,6CAA0C;AAEnC,MAAM,OAAO,GAAG,CAAO,IAAY,EAAE,WAAoB,EAAE,EAAE;IAClE,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAM,GAAE,CAAC;IAEnC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,oBAAoB,GAAG,MAAM,IAAA,iCAAe,EAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACtE,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7C,6BAA6B;YAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAExB,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;aAAM,CAAC;YACN,eAAM,CAAC,KAAK,CAAC,qCAAqC,IAAI,kCAAkC,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxB,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACpD,OAAO;AACT,CAAC,CAAA,CAAC;AAxBW,QAAA,OAAO,WAwBlB;AAEK,MAAM,SAAS,GAAG,CAAO,IAAY,EAAE,WAAoB,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAM,GAAE,CAAC;IAEnC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,oBAAoB,GAAG,MAAM,IAAA,iCAAe,EAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACtE,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE7C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE1B,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;aAAM,CAAC;YACN,eAAM,CAAC,KAAK,CAAC,qCAAqC,IAAI,qDAAqD,CAAC,CAAC;QAC/G,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACpD,OAAO;AACT,CAAC,CAAA,CAAC;AAxBW,QAAA,SAAS,aAwBpB"}
1
+ {"version":3,"file":"installer.command.js","sourceRoot":"","sources":["../../src/commands/installer.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAgD;AAChD,uDAAoD;AACpD,6CAA0C;AAEnC,MAAM,OAAO,GAAG,CAAO,IAAY,EAAE,WAAoB,EAAE,EAAE;IAClE,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAM,GAAE,CAAC;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAErC,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,oBAAoB,GAAG,MAAM,IAAA,iCAAe,EAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACtE,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7C,6BAA6B;YAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAExB,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;aAAM,CAAC;YACN,eAAM,CAAC,KAAK,CAAC,qCAAqC,IAAI,kCAAkC,CAAC,CAAC;QAC5F,CAAC;QACD,OAAO;IACT,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAExB,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACpD,OAAO;AACT,CAAC,CAAA,CAAC;AA5BW,QAAA,OAAO,WA4BlB;AAEK,MAAM,SAAS,GAAG,CAAO,IAAY,EAAE,WAAoB,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAM,GAAE,CAAC;IACnC,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAErC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,oBAAoB,GAAG,MAAM,IAAA,iCAAe,EAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACtE,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE7C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE1B,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;aAAM,CAAC;YACN,eAAM,CAAC,KAAK,CAAC,qCAAqC,IAAI,qDAAqD,CAAC,CAAC;QAC/G,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1B,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACpD,OAAO;AACT,CAAC,CAAA,CAAC;AAxBW,QAAA,SAAS,aAwBpB"}
package/lib/index.js CHANGED
@@ -48,7 +48,7 @@ program
48
48
  .name('Matt Schauer SPFx Toolkit')
49
49
  .description('CLI to help with SPFx development')
50
50
  .addHelpText('beforeAll', chalk_1.default.blueBright('Developed by Matt Schauer'))
51
- .version('1.0.18');
51
+ .version('1.0.20');
52
52
  program
53
53
  .command('add-alias')
54
54
  .description('add alias')
@@ -101,7 +101,7 @@ program
101
101
  .command('install')
102
102
  .alias('i')
103
103
  .description('Run an install')
104
- .addArgument(new commander.Argument('<packages>', 'script name in global config or local OR package(s) to install'))
104
+ .addArgument(new commander.Argument('[packages]', 'script name in global config or local OR package(s) to install'))
105
105
  .action((packages) => {
106
106
  commands.installer.install(packages, false);
107
107
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mschauer5/spfx-toolkit",
3
- "version": "1.0.18",
3
+ "version": "1.0.20",
4
4
  "description": "Toolkit for SPFx projects",
5
5
  "main": "index.js",
6
6
  "bin": {
package/src/commands/installer.command.ts CHANGED
@@ -4,15 +4,15 @@ import { logger } from '../common/logger';
4
4
 
5
5
  export const install = async (name: string, fromScripts: boolean) => {
6
6
  const usercommand = await detect();
7
+ const spawn = require('cross-spawn');
7
8
 
8
- if (!fromScripts) {
9
+ if (fromScripts) {
9
10
  const getScriptByNameValue = await getScriptByName(`install:${name}`);
10
11
  if (getScriptByNameValue !== undefined) {
11
12
  const args = getScriptByNameValue.split(' ');
12
13
  // add install to the command
13
14
  args.unshift('install');
14
15
 
15
- const spawn = require('cross-spawn');
16
16
  spawn.sync(usercommand, args, { stdio: 'inherit' });
17
17
  return;
18
18
  } else {
@@ -20,16 +20,21 @@ export const install = async (name: string, fromScripts: boolean) => {
20
20
  }
21
21
  return;
22
22
  }
23
+ if (name === undefined) {
24
+ spawn.sync(usercommand, 'install', { stdio: 'inherit' });
25
+ return;
26
+ }
23
27
 
24
28
  const args = name.split(' ');
25
29
  args.unshift('install');
26
- const spawn = require('cross-spawn');
30
+
27
31
  spawn.sync(usercommand, args, { stdio: 'inherit' });
28
32
  return;
29
33
  };
30
34
 
31
35
  export const uninstall = async (name: string, fromScripts: boolean) => {
32
36
  const usercommand = await detect();
37
+ const spawn = require('cross-spawn');
33
38
 
34
39
  if (!fromScripts) {
35
40
  const getScriptByNameValue = await getScriptByName(`install:${name}`);
@@ -38,7 +43,6 @@ export const uninstall = async (name: string, fromScripts: boolean) => {
38
43
 
39
44
  args.unshift('uninstall');
40
45
 
41
- const spawn = require('cross-spawn');
42
46
  spawn.sync(usercommand, args, { stdio: 'inherit' });
43
47
  return;
44
48
  } else {
@@ -49,7 +53,7 @@ export const uninstall = async (name: string, fromScripts: boolean) => {
49
53
 
50
54
  const args = name.split(' ');
51
55
  args.unshift('uninstall');
52
- const spawn = require('cross-spawn');
56
+
53
57
  spawn.sync(usercommand, args, { stdio: 'inherit' });
54
58
  return;
55
59
  };
package/src/index.ts CHANGED
@@ -12,7 +12,7 @@ program
12
12
  .name('Matt Schauer SPFx Toolkit')
13
13
  .description('CLI to help with SPFx development')
14
14
  .addHelpText('beforeAll', chalk.blueBright('Developed by Matt Schauer'))
15
- .version('1.0.18');
15
+ .version('1.0.20');
16
16
 
17
17
  program
18
18
  .command('add-alias')
@@ -72,7 +72,7 @@ program
72
72
  .command('install')
73
73
  .alias('i')
74
74
  .description('Run an install')
75
- .addArgument(new commander.Argument('<packages>', 'script name in global config or local OR package(s) to install'))
75
+ .addArgument(new commander.Argument('[packages]', 'script name in global config or local OR package(s) to install'))
76
76
  .action((packages) => {
77
77
  commands.installer.install(packages, false);
78
78
  });