@mschauer5/spfx-toolkit 1.0.15 → 1.0.16

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 (11) hide show
  1. package/lib/commands/index.js +3 -3
  2. package/lib/commands/index.js.map +1 -1
  3. package/lib/commands/installer.command.js +64 -0
  4. package/lib/commands/installer.command.js.map +1 -0
  5. package/lib/index.js +30 -3
  6. package/lib/index.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/commands/index.ts +2 -2
  9. package/src/commands/installer.command.ts +55 -0
  10. package/src/index.ts +35 -3
  11. package/src/commands/install.command.ts +0 -17
package/lib/commands/index.js CHANGED
@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
33
33
  };
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
- exports.install = exports.openSolution = exports.scripts = exports.version = exports.eslint = exports.alias = void 0;
36
+ exports.installer = exports.openSolution = exports.scripts = exports.version = exports.eslint = exports.alias = void 0;
37
37
  const alias = __importStar(require("./alias.command"));
38
38
  exports.alias = alias;
39
39
  const eslint = __importStar(require("./eslint.command"));
@@ -44,6 +44,6 @@ const scripts = __importStar(require("./scripts.command"));
44
44
  exports.scripts = scripts;
45
45
  const open_solution_command_1 = require("./open-solution.command");
46
46
  Object.defineProperty(exports, "openSolution", { enumerable: true, get: function () { return open_solution_command_1.openSolution; } });
47
- const install = __importStar(require("./install.command"));
48
- exports.install = install;
47
+ const installer = __importStar(require("./installer.command"));
48
+ exports.installer = installer;
49
49
  //# sourceMappingURL=index.js.map
package/lib/commands/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AAMhC,sBAAK;AALd,yDAA2C;AAK3B,wBAAM;AAJtB,2DAA6C;AAIrB,0BAAO;AAH/B,2DAA6C;AAGZ,0BAAO;AAFxC,mEAAuD;AAEb,6FAFjC,oCAAY,OAEiC;AADtD,2DAA6C;AACW,0BAAO"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AAMhC,sBAAK;AALd,yDAA2C;AAK3B,wBAAM;AAJtB,2DAA6C;AAIrB,0BAAO;AAH/B,2DAA6C;AAGZ,0BAAO;AAFxC,mEAAuD;AAEb,6FAFjC,oCAAY,OAEiC;AADtD,+DAAiD;AACO,8BAAS"}
package/lib/commands/installer.command.js ADDED
@@ -0,0 +1,64 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.uninstall = exports.install = void 0;
13
+ const detect_package_manager_1 = require("detect-package-manager");
14
+ const scripts_command_1 = require("./scripts.command");
15
+ const logger_1 = require("../common/logger");
16
+ const install = (name, fromScripts) => __awaiter(void 0, void 0, void 0, function* () {
17
+ const usercommand = yield (0, detect_package_manager_1.detect)();
18
+ if (!fromScripts) {
19
+ const getScriptByNameValue = yield (0, scripts_command_1.getScriptByName)(`install:${name}`);
20
+ if (getScriptByNameValue !== undefined) {
21
+ const args = getScriptByNameValue.split(' ');
22
+ // add install to the command
23
+ args.unshift('install');
24
+ const spawn = require('cross-spawn');
25
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
26
+ return;
27
+ }
28
+ else {
29
+ logger_1.logger.error(`No install script found with name ${name} in global or local package.json`);
30
+ }
31
+ return;
32
+ }
33
+ const args = name.split(' ');
34
+ args.unshift('install');
35
+ const spawn = require('cross-spawn');
36
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
37
+ return;
38
+ });
39
+ exports.install = install;
40
+ const uninstall = (name, fromScripts) => __awaiter(void 0, void 0, void 0, function* () {
41
+ const usercommand = yield (0, detect_package_manager_1.detect)();
42
+ if (!fromScripts) {
43
+ const getScriptByNameValue = yield (0, scripts_command_1.getScriptByName)(`install:${name}`);
44
+ if (getScriptByNameValue !== undefined) {
45
+ const args = getScriptByNameValue.split(' ');
46
+ // add install to the command
47
+ args.unshift('uninstall');
48
+ const spawn = require('cross-spawn');
49
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
50
+ return;
51
+ }
52
+ else {
53
+ logger_1.logger.error(`No install script found with name ${name} in global or local package.json so can't uninstall`);
54
+ }
55
+ return;
56
+ }
57
+ const args = name.split(' ');
58
+ args.unshift('uninstall');
59
+ const spawn = require('cross-spawn');
60
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
61
+ return;
62
+ });
63
+ exports.uninstall = uninstall;
64
+ //# sourceMappingURL=installer.command.js.map
package/lib/commands/installer.command.js.map ADDED
@@ -0,0 +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;YAC7C,6BAA6B;YAC7B,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"}
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.15');
51
+ .version('1.0.16');
52
52
  program
53
53
  .command('add-alias')
54
54
  .description('add alias')
@@ -64,18 +64,21 @@ program
64
64
  });
65
65
  program
66
66
  .command('serve')
67
+ .alias('s')
67
68
  .description('Serve / Start the SPFx Project')
68
69
  .action(() => {
69
70
  commands.scripts.run('serve');
70
71
  });
71
72
  program
72
73
  .command('build')
74
+ .alias('bl')
73
75
  .description('Build Project')
74
76
  .action(() => {
75
77
  commands.scripts.run('build');
76
78
  });
77
79
  program
78
80
  .command('bundle')
81
+ .alias('bn')
79
82
  .description('Bundle Project')
80
83
  .option('-i, --increment <part>', 'Increment package version (major, minor, patch)', (value) => {
81
84
  if (!['major', 'minor', 'patch'].includes(value)) {
@@ -97,10 +100,34 @@ program
97
100
  program
98
101
  .command('install')
99
102
  .alias('i')
103
+ .description('Run an install')
104
+ .addArgument(new commander.Argument('<packages>', 'script name in global config or local OR package(s) to install'))
105
+ .action((packages) => {
106
+ commands.installer.install(packages, false);
107
+ });
108
+ program
109
+ .command('install-script')
110
+ .alias('is')
100
111
  .description('Run an install script from package.json by name')
101
- .addArgument(new commander.Argument('<name>', 'script name to run from package.json'))
112
+ .addArgument(new commander.Argument('<name>', 'script name in global config or local to install'))
113
+ .action((name) => {
114
+ commands.installer.install(name, true);
115
+ });
116
+ program
117
+ .command('uninstall')
118
+ .alias('un')
119
+ .description('Run an uninstall')
120
+ .addArgument(new commander.Argument('<packages>', 'script name in global config or local OR package(s) to uninstall'))
121
+ .action((packages) => {
122
+ commands.installer.uninstall(packages, false);
123
+ });
124
+ program
125
+ .command('uninstall-script')
126
+ .alias('uns')
127
+ .description('Run an uninstall script from package.json by name')
128
+ .addArgument(new commander.Argument('<name>', 'script name in global config or local to uninstall'))
102
129
  .action((name) => {
103
- commands.install.run(name);
130
+ commands.installer.uninstall(name, true);
104
131
  });
105
132
  program
106
133
  .command('open-global-config')
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mschauer5/spfx-toolkit",
3
- "version": "1.0.15",
3
+ "version": "1.0.16",
4
4
  "description": "Toolkit for SPFx projects",
5
5
  "main": "index.js",
6
6
  "bin": {
package/src/commands/index.ts CHANGED
@@ -3,5 +3,5 @@ import * as eslint from './eslint.command';
3
3
  import * as version from './version.command';
4
4
  import * as scripts from './scripts.command';
5
5
  import { openSolution } from './open-solution.command';
6
- import * as install from './install.command';
7
- export { alias, eslint, version, scripts, openSolution, install };
6
+ import * as installer from './installer.command';
7
+ export { alias, eslint, version, scripts, openSolution, installer };
package/src/commands/installer.command.ts ADDED
@@ -0,0 +1,55 @@
1
+ import { detect } from 'detect-package-manager';
2
+ import { getScriptByName } from './scripts.command';
3
+ import { logger } from '../common/logger';
4
+
5
+ export const install = async (name: string, fromScripts: boolean) => {
6
+ const usercommand = await detect();
7
+
8
+ if (!fromScripts) {
9
+ const getScriptByNameValue = await getScriptByName(`install:${name}`);
10
+ if (getScriptByNameValue !== undefined) {
11
+ const args = getScriptByNameValue.split(' ');
12
+ // add install to the command
13
+ args.unshift('install');
14
+
15
+ const spawn = require('cross-spawn');
16
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
17
+ return;
18
+ } else {
19
+ logger.error(`No install script found with name ${name} in global or local package.json`);
20
+ }
21
+ return;
22
+ }
23
+
24
+ const args = name.split(' ');
25
+ args.unshift('install');
26
+ const spawn = require('cross-spawn');
27
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
28
+ return;
29
+ };
30
+
31
+ export const uninstall = async (name: string, fromScripts: boolean) => {
32
+ const usercommand = await detect();
33
+
34
+ if (!fromScripts) {
35
+ const getScriptByNameValue = await getScriptByName(`install:${name}`);
36
+ if (getScriptByNameValue !== undefined) {
37
+ const args = getScriptByNameValue.split(' ');
38
+ // add install to the command
39
+ args.unshift('uninstall');
40
+
41
+ const spawn = require('cross-spawn');
42
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
43
+ return;
44
+ } else {
45
+ logger.error(`No install script found with name ${name} in global or local package.json so can't uninstall`);
46
+ }
47
+ return;
48
+ }
49
+
50
+ const args = name.split(' ');
51
+ args.unshift('uninstall');
52
+ const spawn = require('cross-spawn');
53
+ spawn.sync(usercommand, args, { stdio: 'inherit' });
54
+ return;
55
+ };
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.15');
15
+ .version('1.0.16');
16
16
 
17
17
  program
18
18
  .command('add-alias')
@@ -31,6 +31,7 @@ program
31
31
 
32
32
  program
33
33
  .command('serve')
34
+ .alias('s')
34
35
  .description('Serve / Start the SPFx Project')
35
36
  .action(() => {
36
37
  commands.scripts.run('serve');
@@ -38,6 +39,7 @@ program
38
39
 
39
40
  program
40
41
  .command('build')
42
+ .alias('bl')
41
43
  .description('Build Project')
42
44
  .action(() => {
43
45
  commands.scripts.run('build');
@@ -45,6 +47,7 @@ program
45
47
 
46
48
  program
47
49
  .command('bundle')
50
+ .alias('bn')
48
51
  .description('Bundle Project')
49
52
  .option('-i, --increment <part>', 'Increment package version (major, minor, patch)', (value: string) => {
50
53
  if (!['major', 'minor', 'patch'].includes(value)) {
@@ -68,10 +71,39 @@ program
68
71
  program
69
72
  .command('install')
70
73
  .alias('i')
74
+ .description('Run an install')
75
+ .addArgument(new commander.Argument('<packages>', 'script name in global config or local OR package(s) to install'))
76
+ .action((packages) => {
77
+ commands.installer.install(packages, false);
78
+ });
79
+
80
+ program
81
+ .command('install-script')
82
+ .alias('is')
71
83
  .description('Run an install script from package.json by name')
72
- .addArgument(new commander.Argument('<name>', 'script name to run from package.json'))
84
+ .addArgument(new commander.Argument('<name>', 'script name in global config or local to install'))
85
+
86
+ .action((name) => {
87
+ commands.installer.install(name, true);
88
+ });
89
+
90
+ program
91
+ .command('uninstall')
92
+ .alias('un')
93
+ .description('Run an uninstall')
94
+ .addArgument(new commander.Argument('<packages>', 'script name in global config or local OR package(s) to uninstall'))
95
+ .action((packages) => {
96
+ commands.installer.uninstall(packages, false);
97
+ });
98
+
99
+ program
100
+ .command('uninstall-script')
101
+ .alias('uns')
102
+ .description('Run an uninstall script from package.json by name')
103
+ .addArgument(new commander.Argument('<name>', 'script name in global config or local to uninstall'))
104
+
73
105
  .action((name) => {
74
- commands.install.run(name);
106
+ commands.installer.uninstall(name, true);
75
107
  });
76
108
 
77
109
  program
package/src/commands/install.command.ts DELETED
@@ -1,17 +0,0 @@
1
- import { detect } from 'detect-package-manager';
2
- import { getScriptByName } from './scripts.command';
3
-
4
- export const run = async (name: string) => {
5
- const usercommand = await detect();
6
-
7
- const getScriptByNameValue = await getScriptByName(`install:${name}`);
8
- if (getScriptByNameValue !== undefined) {
9
- const args = getScriptByNameValue.split(' ');
10
- // add install to the command
11
- args.unshift('install');
12
-
13
- const spawn = require('cross-spawn');
14
- spawn.sync(usercommand, args, { stdio: 'inherit' });
15
- return;
16
- }
17
- };