just-scripts 1.8.0 → 1.8.1

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/CHANGELOG.json CHANGED
@@ -2,7 +2,22 @@
2
2
  "name": "just-scripts",
3
3
  "entries": [
4
4
  {
5
- "date": "Mon, 07 Feb 2022 19:43:38 GMT",
5
+ "date": "Thu, 31 Mar 2022 17:04:25 GMT",
6
+ "tag": "just-scripts_v1.8.1",
7
+ "version": "1.8.1",
8
+ "comments": {
9
+ "patch": [
10
+ {
11
+ "author": "dzearing@microsoft.com",
12
+ "package": "just-scripts",
13
+ "commit": "0c2e911432d9c09a7b3396d40c811260d84749ac",
14
+ "comment": "Bump just-scripts to v1.8.1"
15
+ }
16
+ ]
17
+ }
18
+ },
19
+ {
20
+ "date": "Mon, 07 Feb 2022 19:43:53 GMT",
6
21
  "tag": "just-scripts_v1.8.0",
7
22
  "version": "1.8.0",
8
23
  "comments": {
package/CHANGELOG.md CHANGED
@@ -1,12 +1,20 @@
1
1
  # Change Log - just-scripts
2
2
 
3
- This log was last generated on Mon, 07 Feb 2022 19:43:38 GMT and should not be manually modified.
3
+ This log was last generated on Thu, 31 Mar 2022 17:04:25 GMT and should not be manually modified.
4
4
 
5
5
  <!-- Start content -->
6
6
 
7
+ ## 1.8.1
8
+
9
+ Thu, 31 Mar 2022 17:04:25 GMT
10
+
11
+ ### Patches
12
+
13
+ - Bump just-scripts to v1.8.1 (dzearing@microsoft.com)
14
+
7
15
  ## 1.8.0
8
16
 
9
- Mon, 07 Feb 2022 19:43:38 GMT
17
+ Mon, 07 Feb 2022 19:43:53 GMT
10
18
 
11
19
  ### Minor changes
12
20
 
@@ -1,13 +1,4 @@
1
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
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.executeCopyInstructions = void 0;
13
4
  const path_1 = require("path");
@@ -17,13 +8,11 @@ const uniqueValues_1 = require("../arrayUtils/uniqueValues");
17
8
  /**
18
9
  * Function containing the core code for the copy task with a given config.
19
10
  */
20
- function executeCopyInstructions(config) {
21
- return __awaiter(this, void 0, void 0, function* () {
22
- if (config && config.copyInstructions) {
23
- yield createDirectories(config.copyInstructions);
24
- yield Promise.all(config.copyInstructions.map(executeSingleCopyInstruction));
25
- }
26
- });
11
+ async function executeCopyInstructions(config) {
12
+ if (config && config.copyInstructions) {
13
+ await createDirectories(config.copyInstructions);
14
+ await Promise.all(config.copyInstructions.map(executeSingleCopyInstruction));
15
+ }
27
16
  }
28
17
  exports.executeCopyInstructions = executeCopyInstructions;
29
18
  function createDirectories(copyInstructions) {
@@ -1 +1 @@
1
- {"version":3,"file":"executeCopyInstructions.js","sourceRoot":"","sources":["../../src/copy/executeCopyInstructions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,uCAAgE;AAEhE,qDAAkD;AAClD,6DAA0D;AAE1D;;GAEG;AACH,SAAsB,uBAAuB,CAAC,MAA8B;;QAC1E,IAAI,MAAM,IAAI,MAAM,CAAC,gBAAgB,EAAE;YACrC,MAAM,iBAAiB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACjD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC;SAC9E;IACH,CAAC;CAAA;AALD,0DAKC;AAED,SAAS,iBAAiB,CAAC,gBAAmC;IAC5D,OAAO,OAAO,CAAC,GAAG,CAChB,2BAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,cAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,oBAAS,CAAC,OAAO,CAAC,CAAC,CAC/H,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CAAC,eAAgC;IACpE,MAAM,eAAe,GAAG,mBAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;IAEjE,oDAAoD;IACpD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,OAAO,eAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;KACtE;IAED,gCAAgC;IAChC,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,mBAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;QAC1F,OAAO,oBAAS,CAAC,eAAe,CAAC,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"executeCopyInstructions.js","sourceRoot":"","sources":["../../src/copy/executeCopyInstructions.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,uCAAgE;AAEhE,qDAAkD;AAClD,6DAA0D;AAE1D;;GAEG;AACI,KAAK,UAAU,uBAAuB,CAAC,MAA8B;IAC1E,IAAI,MAAM,IAAI,MAAM,CAAC,gBAAgB,EAAE;QACrC,MAAM,iBAAiB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC;KAC9E;AACH,CAAC;AALD,0DAKC;AAED,SAAS,iBAAiB,CAAC,gBAAmC;IAC5D,OAAO,OAAO,CAAC,GAAG,CAChB,2BAAY,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,cAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,oBAAS,CAAC,OAAO,CAAC,CAAC,CAC/H,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CAAC,eAAgC;IACpE,MAAM,eAAe,GAAG,mBAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;IAEjE,oDAAoD;IACpD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,OAAO,eAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;KACtE;IAED,gCAAgC;IAChC,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,mBAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;QAC1F,OAAO,oBAAS,CAAC,eAAe,CAAC,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
- var __rest = (this && this.__rest) || function (s, e) {
3
- var t = {};
4
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
- t[p] = s[p];
6
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
- t[p[i]] = s[p[i]];
10
- }
11
- return t;
12
- };
13
2
  Object.defineProperty(exports, "__esModule", { value: true });
14
3
  exports.fixApiFileNewlines = exports.apiExtractorUpdateTask = exports.apiExtractorVerifyTask = void 0;
15
4
  const just_task_1 = require("just-task");
@@ -18,7 +7,8 @@ const path = require("path");
18
7
  const tryRequire_1 = require("../tryRequire");
19
8
  function apiExtractorVerifyTask(configJsonFilePathOrOption = {}, extractorOptions = {}) {
20
9
  const options = typeof configJsonFilePathOrOption === 'string'
21
- ? Object.assign(Object.assign({}, extractorOptions), { configJsonFilePath: configJsonFilePathOrOption }) : Object.assign({}, configJsonFilePathOrOption);
10
+ ? { ...extractorOptions, configJsonFilePath: configJsonFilePathOrOption }
11
+ : { ...configJsonFilePathOrOption };
22
12
  return function apiExtractorVerify() {
23
13
  const context = initApiExtractor(options);
24
14
  if (context) {
@@ -32,7 +22,8 @@ function apiExtractorVerifyTask(configJsonFilePathOrOption = {}, extractorOption
32
22
  exports.apiExtractorVerifyTask = apiExtractorVerifyTask;
33
23
  function apiExtractorUpdateTask(configJsonFilePathOrOption = {}, extractorOptions = {}) {
34
24
  const options = typeof configJsonFilePathOrOption === 'string'
35
- ? Object.assign(Object.assign({}, extractorOptions), { configJsonFilePath: configJsonFilePathOrOption }) : Object.assign({}, configJsonFilePathOrOption);
25
+ ? { ...extractorOptions, configJsonFilePath: configJsonFilePathOrOption }
26
+ : { ...configJsonFilePathOrOption };
36
27
  return function apiExtractorUpdate() {
37
28
  const context = initApiExtractor(options);
38
29
  if (context) {
@@ -75,7 +66,7 @@ function initApiExtractor(options) {
75
66
  return;
76
67
  }
77
68
  const { ExtractorConfig } = apiExtractorModule;
78
- const { configJsonFilePath = ExtractorConfig.FILENAME, fixNewlines, onResult } = options, extractorOptions = __rest(options, ["configJsonFilePath", "fixNewlines", "onResult"]);
69
+ const { configJsonFilePath = ExtractorConfig.FILENAME, fixNewlines, onResult, ...extractorOptions } = options;
79
70
  if (!fs.existsSync(configJsonFilePath)) {
80
71
  const defaultConfig = path.resolve(__dirname, '../../config/apiExtractor/api-extractor.json');
81
72
  just_task_1.logger.warn(`Config file not found for api-extractor! Please copy ${defaultConfig} to project root folder to try again`);
@@ -1 +1 @@
1
- {"version":3,"file":"apiExtractorTask.js","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apiExtractorTask.js","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,4 @@
1
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
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.esbuildTask = void 0;
13
4
  const just_task_1 = require("just-task");
@@ -20,11 +11,9 @@ function esbuildTask(options = {}) {
20
11
  if (!esbuildModuleResolution) {
21
12
  throw new Error('cannot find esbuild, please add it to your devDependencies');
22
13
  }
23
- return function esbuild() {
24
- return __awaiter(this, void 0, void 0, function* () {
25
- const esbuildModule = require(esbuildModuleResolution);
26
- return esbuildModule.build(options);
27
- });
14
+ return async function esbuild() {
15
+ const esbuildModule = require(esbuildModuleResolution);
16
+ return esbuildModule.build(options);
28
17
  };
29
18
  }
30
19
  exports.esbuildTask = esbuildTask;
@@ -1 +1 @@
1
- {"version":3,"file":"esbuildTask.js","sourceRoot":"","sources":["../../src/tasks/esbuildTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,yCAAkD;AAQlD;;GAEG;AACH,SAAgB,WAAW,CAAC,UAA+B,EAAE;IAC3D,wDAAwD;IACxD,MAAM,uBAAuB,GAAG,mBAAO,CAAC,SAAS,CAAC,CAAC;IAEnD,IAAI,CAAC,uBAAuB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IAED,OAAO,SAAe,OAAO;;YAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAA6B,CAAC;YACnF,OAAO,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;KAAA,CAAC;AACJ,CAAC;AAZD,kCAYC"}
1
+ {"version":3,"file":"esbuildTask.js","sourceRoot":"","sources":["../../src/tasks/esbuildTask.ts"],"names":[],"mappings":";;;AACA,yCAAkD;AAQlD;;GAEG;AACH,SAAgB,WAAW,CAAC,UAA+B,EAAE;IAC3D,wDAAwD;IACxD,MAAM,uBAAuB,GAAG,mBAAO,CAAC,SAAS,CAAC,CAAC;IAEnD,IAAI,CAAC,uBAAuB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;IAED,OAAO,KAAK,UAAU,OAAO;QAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAA6B,CAAC;QACnF,OAAO,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC,CAAC;AACJ,CAAC;AAZD,kCAYC"}
@@ -27,7 +27,7 @@ function eslintTask(options = {}) {
27
27
  '--color',
28
28
  ];
29
29
  just_task_1.logger.info(just_scripts_utils_1.encodeArgs(eslintArgs).join(' '));
30
- return just_scripts_utils_1.spawn(process.execPath, eslintArgs, Object.assign({ stdio: 'inherit' }, (timing && { env: { TIMING: '1' } })));
30
+ return just_scripts_utils_1.spawn(process.execPath, eslintArgs, { stdio: 'inherit', ...(timing && { env: { TIMING: '1' } }) });
31
31
  }
32
32
  else {
33
33
  return Promise.resolve();
@@ -1 +1 @@
1
- {"version":3,"file":"eslintTask.js","sourceRoot":"","sources":["../../src/tasks/eslintTask.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,2DAAuD;AACvD,yBAAyB;AAwBzB,SAAgB,UAAU,CAAC,UAA6B,EAAE;IACxD,OAAO,SAAS,MAAM;QACpB,MAAM,EACJ,KAAK,EACL,UAAU,EACV,UAAU,EACV,GAAG,EACH,UAAU,EACV,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,aAAa,EACb,MAAM,GACP,GAAG,OAAO,CAAC;QACZ,MAAM,SAAS,GAAG,mBAAO,CAAC,sBAAsB,CAAC,CAAC;QAClD,kIAAkI;QAClI,MAAM,gBAAgB,GAAG,UAAU,IAAI,sBAAU,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAE1H,IAAI,SAAS,IAAI,gBAAgB,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YACpE,MAAM,gBAAgB,GAAG,UAAU,IAAI,sBAAU,CAAC,eAAe,CAAC,CAAC;YAEnE,MAAM,UAAU,GAAG;gBACjB,SAAS;gBACT,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1B,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC;gBAC3D,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3D,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,+BAA+B,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpF,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzB,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1E,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7B,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7D,SAAS;aACV,CAAC;YAEF,kBAAM,CAAC,IAAI,CAAC,+BAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9C,OAAO,0BAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,kBAAI,KAAK,EAAE,SAAS,IAAK,CAAC,MAAM,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,EAAG,CAAC;SAC3G;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;IACH,CAAC,CAAC;AACJ,CAAC;AA3CD,gCA2CC"}
1
+ {"version":3,"file":"eslintTask.js","sourceRoot":"","sources":["../../src/tasks/eslintTask.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,2DAAuD;AACvD,yBAAyB;AAwBzB,SAAgB,UAAU,CAAC,UAA6B,EAAE;IACxD,OAAO,SAAS,MAAM;QACpB,MAAM,EACJ,KAAK,EACL,UAAU,EACV,UAAU,EACV,GAAG,EACH,UAAU,EACV,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,aAAa,EACb,MAAM,GACP,GAAG,OAAO,CAAC;QACZ,MAAM,SAAS,GAAG,mBAAO,CAAC,sBAAsB,CAAC,CAAC;QAClD,kIAAkI;QAClI,MAAM,gBAAgB,GAAG,UAAU,IAAI,sBAAU,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAE1H,IAAI,SAAS,IAAI,gBAAgB,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;YACpE,MAAM,gBAAgB,GAAG,UAAU,IAAI,sBAAU,CAAC,eAAe,CAAC,CAAC;YAEnE,MAAM,UAAU,GAAG;gBACjB,SAAS;gBACT,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1B,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC;gBAC3D,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3D,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,+BAA+B,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpF,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzB,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,gBAAgB,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1E,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7B,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7D,SAAS;aACV,CAAC;YAEF,kBAAM,CAAC,IAAI,CAAC,+BAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9C,OAAO,0BAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;SAC3G;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;IACH,CAAC,CAAC;AACJ,CAAC;AA3CD,gCA2CC"}
@@ -14,13 +14,13 @@ function nodeExecTask(options) {
14
14
  options.args = options.args || [];
15
15
  options.args.unshift(tsNodeRegister);
16
16
  options.args.unshift('-r');
17
- options.env = Object.assign(Object.assign({}, options.env), getTsNodeEnv_1.getTsNodeEnv(tsconfig, transpileOnly));
17
+ options.env = { ...options.env, ...getTsNodeEnv_1.getTsNodeEnv(tsconfig, transpileOnly) };
18
18
  just_task_1.logger.info('Executing [TS]: ' + [nodeExecPath, ...(options.args || [])].join(' '));
19
19
  }
20
20
  else {
21
21
  just_task_1.logger.info('Executing: ' + [nodeExecPath, ...(options.args || [])].join(' '));
22
22
  }
23
- return just_scripts_utils_1.spawn(nodeExecPath, options.args, Object.assign({ stdio: 'inherit', env: options.env }, spawnOptions));
23
+ return just_scripts_utils_1.spawn(nodeExecPath, options.args, { stdio: 'inherit', env: options.env, ...spawnOptions });
24
24
  };
25
25
  }
26
26
  exports.nodeExecTask = nodeExecTask;
@@ -1 +1 @@
1
- {"version":3,"file":"nodeExecTask.js","sourceRoot":"","sources":["../../src/tasks/nodeExecTask.ts"],"names":[],"mappings":";;;AACA,2DAA2C;AAC3C,yCAAiD;AACjD,mDAAgE;AAChE,6DAA0D;AAmC1D,SAAgB,YAAY,CAAC,OAA4B;IACvD,OAAO;QACL,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;QAE5E,MAAM,cAAc,GAAG,oBAAU,CAAC,kBAAkB,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;QAEtC,IAAI,gBAAgB,IAAI,cAAc,EAAE;YACtC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE3B,OAAO,CAAC,GAAG,mCAAQ,OAAO,CAAC,GAAG,GAAK,2BAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAE,CAAC;YAC3E,kBAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACrF;aAAM;YACL,kBAAM,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAChF;QAED,OAAO,0BAAK,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,kBAAI,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,IAAK,YAAY,EAAG,CAAC;IACpG,CAAC,CAAC;AACJ,CAAC;AApBD,oCAoBC"}
1
+ {"version":3,"file":"nodeExecTask.js","sourceRoot":"","sources":["../../src/tasks/nodeExecTask.ts"],"names":[],"mappings":";;;AACA,2DAA2C;AAC3C,yCAAiD;AACjD,mDAAgE;AAChE,6DAA0D;AAmC1D,SAAgB,YAAY,CAAC,OAA4B;IACvD,OAAO;QACL,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;QAE5E,MAAM,cAAc,GAAG,oBAAU,CAAC,kBAAkB,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;QAEtC,IAAI,gBAAgB,IAAI,cAAc,EAAE;YACtC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACrC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE3B,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,2BAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC;YAC3E,kBAAM,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACrF;aAAM;YACL,kBAAM,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAChF;QAED,OAAO,0BAAK,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC;IACpG,CAAC,CAAC;AACJ,CAAC;AApBD,oCAoBC"}
@@ -10,7 +10,13 @@ function prettierTask(options = {}) {
10
10
  const prettierBin = just_task_1.resolve('prettier/bin-prettier.js');
11
11
  if (prettierBin) {
12
12
  return function prettier() {
13
- return runPrettierAsync(Object.assign(Object.assign(Object.assign(Object.assign({ prettierBin }, { configPath: options.configPath || undefined }), { ignorePath: options.ignorePath || undefined }), { files: arrayify_1.arrayify(options.files || path.resolve(process.cwd(), '**', '*.{ts,tsx,js,jsx,json,scss,html,yml,md}')) }), { check: false }));
13
+ return runPrettierAsync({
14
+ prettierBin,
15
+ ...{ configPath: options.configPath || undefined },
16
+ ...{ ignorePath: options.ignorePath || undefined },
17
+ ...{ files: arrayify_1.arrayify(options.files || path.resolve(process.cwd(), '**', '*.{ts,tsx,js,jsx,json,scss,html,yml,md}')) },
18
+ check: false,
19
+ });
14
20
  };
15
21
  }
16
22
  return function () {
@@ -22,7 +28,13 @@ function prettierCheckTask(options = {}) {
22
28
  const prettierBin = just_task_1.resolve('prettier/bin-prettier.js');
23
29
  if (prettierBin) {
24
30
  return function prettierCheck() {
25
- return runPrettierAsync(Object.assign(Object.assign(Object.assign(Object.assign({ prettierBin }, { configPath: options.configPath || undefined }), { ignorePath: options.ignorePath || undefined }), { files: arrayify_1.arrayify(options.files || path.resolve(process.cwd(), '**', '*.{ts,tsx,js,jsx,json,scss,html,yml,md}')) }), { check: true }));
31
+ return runPrettierAsync({
32
+ prettierBin,
33
+ ...{ configPath: options.configPath || undefined },
34
+ ...{ ignorePath: options.ignorePath || undefined },
35
+ ...{ files: arrayify_1.arrayify(options.files || path.resolve(process.cwd(), '**', '*.{ts,tsx,js,jsx,json,scss,html,yml,md}')) },
36
+ check: true,
37
+ });
26
38
  };
27
39
  }
28
40
  return function () {
@@ -1 +1 @@
1
- {"version":3,"file":"prettierTask.js","sourceRoot":"","sources":["../../src/tasks/prettierTask.ts"],"names":[],"mappings":";;;AAAA,yCAA0D;AAC1D,2DAA2C;AAC3C,6EAA0E;AAC1E,6BAA6B;AAC7B,qDAAkD;AAgBlD,SAAgB,YAAY,CAAC,UAA+B,EAAE;IAC5D,MAAM,WAAW,GAAG,mBAAO,CAAC,0BAA0B,CAAC,CAAC;IAExD,IAAI,WAAW,EAAE;QACf,OAAO,SAAS,QAAQ;YACtB,OAAO,gBAAgB,2DACrB,WAAW,IACR,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE,GAC/C,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE,GAC/C,EAAE,KAAK,EAAE,mBAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,yCAAyC,CAAC,CAAC,EAAE,KACrH,KAAK,EAAE,KAAK,IACZ,CAAC;QACL,CAAC,CAAC;KACH;IAED,OAAO;QACL,kBAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAC/D,CAAC,CAAC;AACJ,CAAC;AAlBD,oCAkBC;AAED,SAAgB,iBAAiB,CAAC,UAA+B,EAAE;IACjE,MAAM,WAAW,GAAG,mBAAO,CAAC,0BAA0B,CAAC,CAAC;IAExD,IAAI,WAAW,EAAE;QACf,OAAO,SAAS,aAAa;YAC3B,OAAO,gBAAgB,2DACrB,WAAW,IACR,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE,GAC/C,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE,GAC/C,EAAE,KAAK,EAAE,mBAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,yCAAyC,CAAC,CAAC,EAAE,KACrH,KAAK,EAAE,IAAI,IACX,CAAC;QACL,CAAC,CAAC;KACH;IAED,OAAO;QACL,kBAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAC/D,CAAC,CAAC;AACJ,CAAC;AAlBD,8CAkBC;AAED,SAAS,gBAAgB,CAAC,OAAwB;IAChD,MAAM,sBAAsB,GAAG,EAAE,CAAC;IAClC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAEtE,MAAM,MAAM,GAAG,2CAAoB,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;IAEnE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE;QAC5C,MAAM,YAAY,GAAG;YACnB,WAAW;YACX,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACtC,GAAG,KAAK;SACT,CAAC;QAEF,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAE7D,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,0BAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC/F,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AACxB,CAAC"}
1
+ {"version":3,"file":"prettierTask.js","sourceRoot":"","sources":["../../src/tasks/prettierTask.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
- var __rest = (this && this.__rest) || function (s, e) {
3
- var t = {};
4
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
- t[p] = s[p];
6
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
- t[p[i]] = s[p[i]];
10
- }
11
- return t;
12
- };
13
2
  Object.defineProperty(exports, "__esModule", { value: true });
14
3
  exports.extractTarTask = exports.createTarTask = void 0;
15
4
  const just_task_1 = require("just-task");
@@ -22,18 +11,23 @@ const zlib_1 = require("zlib");
22
11
  function createTarTask(options = { file: 'archive.tar.gz' }) {
23
12
  const resolvedTar = just_task_1.resolve('tar-fs');
24
13
  // Inject default options
25
- options = Object.assign({ cwd: process.cwd(), gzip: true }, options);
14
+ options = { cwd: process.cwd(), gzip: true, ...options };
26
15
  // Validate whether tar-fs is installed
27
16
  if (!resolvedTar) {
28
17
  just_task_1.logger.error('Please make sure to have "tar-fs" as a dependency in your package.json');
29
18
  throw new Error('Required dependency "tar-fs" is not installed!');
30
19
  }
31
20
  const tar = require(resolvedTar);
32
- const { entries, file, cwd } = options, restOptions = __rest(options, ["entries", "file", "cwd"]);
21
+ const { entries, file, cwd, ...restOptions } = options;
33
22
  return function archive(done) {
34
- let tarStream = tar.pack(cwd, Object.assign({ entries, finalize: true, finish: () => {
23
+ let tarStream = tar.pack(cwd, {
24
+ entries,
25
+ finalize: true,
26
+ finish: () => {
35
27
  done();
36
- } }, restOptions));
28
+ },
29
+ ...restOptions,
30
+ });
37
31
  if (options.gzip) {
38
32
  const gzip = typeof options.gzip === 'boolean' ? zlib_1.createGzip() : zlib_1.createGzip(options.gzip);
39
33
  tarStream = tarStream.pipe(gzip);
@@ -49,23 +43,27 @@ exports.createTarTask = createTarTask;
49
43
  function extractTarTask(options = { file: 'archive.tar.gz' }) {
50
44
  const resolvedTar = just_task_1.resolve('tar-fs');
51
45
  // Inject default options
52
- options = Object.assign({ cwd: process.cwd(), gzip: true }, options);
46
+ options = { cwd: process.cwd(), gzip: true, ...options };
53
47
  // Validate whether tar-fs is installed
54
48
  if (!resolvedTar) {
55
49
  just_task_1.logger.error('Please make sure to have "tar-fs" as a dependency in your package.json');
56
50
  throw new Error('Required dependency "tar-fs" is not installed!');
57
51
  }
58
52
  const tar = require(resolvedTar);
59
- const { cwd, file } = options, restOptions = __rest(options, ["cwd", "file"]);
53
+ const { cwd, file, ...restOptions } = options;
60
54
  return function extract(done) {
61
55
  let tarStream = fs_1.createReadStream(file);
62
56
  if (options.gzip) {
63
57
  const gunzip = zlib_1.createGunzip();
64
58
  tarStream = tarStream.pipe(gunzip);
65
59
  }
66
- tarStream = tarStream.pipe(tar.extract(cwd, Object.assign({ finalize: true, finish: () => {
60
+ tarStream = tarStream.pipe(tar.extract(cwd, {
61
+ finalize: true,
62
+ finish: () => {
67
63
  done();
68
- } }, restOptions)));
64
+ },
65
+ ...restOptions,
66
+ }));
69
67
  };
70
68
  }
71
69
  exports.extractTarTask = extractTarTask;
@@ -1 +1 @@
1
- {"version":3,"file":"tarTask.js","sourceRoot":"","sources":["../../src/tasks/tarTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,yCAA0D;AAC1D,2BAAyD;AACzD,+BAAgD;AAuDhD;;;GAGG;AACH,SAAgB,aAAa,CAAC,UAAyB,EAAE,IAAI,EAAE,gBAAgB,EAAE;IAC/E,MAAM,WAAW,GAAG,mBAAO,CAAC,QAAQ,CAAC,CAAC;IAEtC,yBAAyB;IACzB,OAAO,mBAAK,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,IAAK,OAAO,CAAE,CAAC;IAEzD,uCAAuC;IACvC,IAAI,CAAC,WAAW,EAAE;QAChB,kBAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACvF,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAqB,OAAO,EAAvB,WAAW,UAAK,OAAO,EAAhD,0BAAsC,CAAU,CAAC;IAEvD,OAAO,SAAS,OAAO,CAAC,IAAI;QAC1B,IAAI,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,kBAC1B,OAAO,EACP,QAAQ,EAAE,IAAI,EACd,MAAM,EAAE,GAAG,EAAE;gBACX,IAAI,EAAE,CAAC;YACT,CAAC,IACE,WAAW,EACd,CAAC;QAEH,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAU,EAAE,CAAC,CAAC,CAAC,iBAAU,CAAC,OAAO,CAAC,IAAW,CAAC,CAAC;YAChG,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClC;QAED,SAAS,CAAC,IAAI,CAAC,sBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC;AAjCD,sCAiCC;AAkCD;;;GAGG;AACH,SAAgB,cAAc,CAAC,UAA0B,EAAE,IAAI,EAAE,gBAAgB,EAAE;IACjF,MAAM,WAAW,GAAG,mBAAO,CAAC,QAAQ,CAAC,CAAC;IAEtC,yBAAyB;IACzB,OAAO,mBAAK,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,IAAK,OAAO,CAAE,CAAC;IAEzD,uCAAuC;IACvC,IAAI,CAAC,WAAW,EAAE;QAChB,kBAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACvF,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjC,MAAM,EAAE,GAAG,EAAE,IAAI,KAAqB,OAAO,EAAvB,WAAW,UAAK,OAAO,EAAvC,eAA6B,CAAU,CAAC;IAE9C,OAAO,SAAS,OAAO,CAAC,IAAI;QAC1B,IAAI,SAAS,GAAW,qBAAgB,CAAC,IAAI,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,MAAM,MAAM,GAAG,mBAAY,EAAE,CAAC;YAC9B,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpC;QAED,SAAS,GAAG,SAAS,CAAC,IAAI,CACxB,GAAG,CAAC,OAAO,CAAC,GAAG,kBACb,QAAQ,EAAE,IAAI,EACd,MAAM,EAAE,GAAG,EAAE;gBACX,IAAI,EAAE,CAAC;YACT,CAAC,IACE,WAAW,EACd,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAlCD,wCAkCC"}
1
+ {"version":3,"file":"tarTask.js","sourceRoot":"","sources":["../../src/tasks/tarTask.ts"],"names":[],"mappings":";;;AAAA,yCAA0D;AAC1D,2BAAyD;AACzD,+BAAgD;AAuDhD;;;GAGG;AACH,SAAgB,aAAa,CAAC,UAAyB,EAAE,IAAI,EAAE,gBAAgB,EAAE;IAC/E,MAAM,WAAW,GAAG,mBAAO,CAAC,QAAQ,CAAC,CAAC;IAEtC,yBAAyB;IACzB,OAAO,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAEzD,uCAAuC;IACvC,IAAI,CAAC,WAAW,EAAE;QAChB,kBAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACvF,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC;IAEvD,OAAO,SAAS,OAAO,CAAC,IAAI;QAC1B,IAAI,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;YAC5B,OAAO;YACP,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,GAAG,EAAE;gBACX,IAAI,EAAE,CAAC;YACT,CAAC;YACD,GAAG,WAAW;SACf,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,MAAM,IAAI,GAAG,OAAO,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,iBAAU,EAAE,CAAC,CAAC,CAAC,iBAAU,CAAC,OAAO,CAAC,IAAW,CAAC,CAAC;YAChG,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClC;QAED,SAAS,CAAC,IAAI,CAAC,sBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC;AAjCD,sCAiCC;AAkCD;;;GAGG;AACH,SAAgB,cAAc,CAAC,UAA0B,EAAE,IAAI,EAAE,gBAAgB,EAAE;IACjF,MAAM,WAAW,GAAG,mBAAO,CAAC,QAAQ,CAAC,CAAC;IAEtC,yBAAyB;IACzB,OAAO,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAEzD,uCAAuC;IACvC,IAAI,CAAC,WAAW,EAAE;QAChB,kBAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACvF,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAEjC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC;IAE9C,OAAO,SAAS,OAAO,CAAC,IAAI;QAC1B,IAAI,SAAS,GAAW,qBAAgB,CAAC,IAAI,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,MAAM,MAAM,GAAG,mBAAY,EAAE,CAAC;YAC9B,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpC;QAED,SAAS,GAAG,SAAS,CAAC,IAAI,CACxB,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE;YACf,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,GAAG,EAAE;gBACX,IAAI,EAAE,CAAC;YACT,CAAC;YACD,GAAG,WAAW;SACf,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAlCD,wCAkCC"}
@@ -1,15 +1,4 @@
1
1
  "use strict";
2
- var __rest = (this && this.__rest) || function (s, e) {
3
- var t = {};
4
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
- t[p] = s[p];
6
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
- t[p[i]] = s[p[i]];
10
- }
11
- return t;
12
- };
13
2
  Object.defineProperty(exports, "__esModule", { value: true });
14
3
  exports.tscWatchTask = exports.tscTask = void 0;
15
4
  const just_task_1 = require("just-task");
@@ -25,7 +14,7 @@ function tscTask(options = {}) {
25
14
  }
26
15
  return function tsc() {
27
16
  // Read from options argument, if not there try the tsConfigFile found in root, if not then skip and use no config
28
- options = Object.assign(Object.assign({}, options), getProjectOrBuildOptions(options));
17
+ options = { ...options, ...getProjectOrBuildOptions(options) };
29
18
  if (isValidProject(options)) {
30
19
  just_task_1.logger.info(`Running ${tscCmd} with ${options.project || options.build}`);
31
20
  const args = argsFromOptions(tscCmd, options);
@@ -46,7 +35,7 @@ function tscWatchTask(options = {}) {
46
35
  throw new Error('cannot find tsc');
47
36
  }
48
37
  return function tscWatch() {
49
- options = Object.assign(Object.assign({}, options), getProjectOrBuildOptions(options));
38
+ options = { ...options, ...getProjectOrBuildOptions(options) };
50
39
  if (isValidProject(options)) {
51
40
  just_task_1.logger.info(`Running ${tscCmd} with ${options.project || options.build} in watch mode`);
52
41
  const args = argsFromOptions(tscCmd, options);
@@ -87,7 +76,7 @@ function isValidProject(options) {
87
76
  * Returns an array of CLI arguments for TSC given the `options`.
88
77
  */
89
78
  function argsFromOptions(tscCmd, options) {
90
- const { nodeArgs } = options, rest = __rest(options, ["nodeArgs"]);
79
+ const { nodeArgs, ...rest } = options;
91
80
  return [
92
81
  ...(nodeArgs ? nodeArgs : []),
93
82
  ...Object.keys(rest).reduce((currentArgs, option) => {
@@ -1 +1 @@
1
- {"version":3,"file":"tscTask.js","sourceRoot":"","sources":["../../src/tasks/tscTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tscTask.js","sourceRoot":"","sources":["../../src/tasks/tscTask.ts"],"names":[],"mappings":"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"}
@@ -22,7 +22,7 @@ function webpackCliTask(options = {}) {
22
22
  ];
23
23
  let configPath = findWebpackConfig_1.findWebpackConfig('webpack.config.js');
24
24
  if (configPath) {
25
- options.env = Object.assign(Object.assign({}, options.env), (configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)));
25
+ options.env = { ...options.env, ...(configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)) };
26
26
  }
27
27
  if (options.webpackCliArgs) {
28
28
  const configIndex = options.webpackCliArgs.indexOf('--config');
@@ -1 +1 @@
1
- {"version":3,"file":"webpackCliTask.js","sourceRoot":"","sources":["../../src/tasks/webpackCliTask.ts"],"names":[],"mappings":";;;AAAA,yCAA0D;AAC1D,2DAA2C;AAC3C,6DAA0D;AAC1D,oEAAiE;AA8BjE;;GAEG;AACH,SAAgB,cAAc,CAAC,UAAiC,EAAE;IAChE,MAAM,aAAa,GAAG,mBAAO,CAAC,wBAAwB,CAAC,CAAC;IAExD,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,OAAO,SAAS,UAAU;QACxB,kBAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QAErD,MAAM,IAAI,GAAG;YACX,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,aAAa;YACb,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;SACrE,CAAC;QAEF,IAAI,UAAU,GAAG,qCAAiB,CAAC,mBAAmB,CAAC,CAAC;QAExD,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,GAAG,mCAAQ,OAAO,CAAC,GAAG,GAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,2BAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAE,CAAC;SAC5H;QAED,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC/D,MAAM,mBAAmB,GAAG,WAAW,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,WAAW,GAAG,CAAC,CAAC;YAChG,IAAI,mBAAmB,EAAE;gBACvB,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;aACtD;SACF;QAED,kBAAM,CAAC,IAAI,CAAC,0BAA0B,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE5E,OAAO,0BAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC;AACJ,CAAC;AAlCD,wCAkCC"}
1
+ {"version":3,"file":"webpackCliTask.js","sourceRoot":"","sources":["../../src/tasks/webpackCliTask.ts"],"names":[],"mappings":";;;AAAA,yCAA0D;AAC1D,2DAA2C;AAC3C,6DAA0D;AAC1D,oEAAiE;AA8BjE;;GAEG;AACH,SAAgB,cAAc,CAAC,UAAiC,EAAE;IAChE,MAAM,aAAa,GAAG,mBAAO,CAAC,wBAAwB,CAAC,CAAC;IAExD,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;KAC/D;IAED,OAAO,SAAS,UAAU;QACxB,kBAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QAErD,MAAM,IAAI,GAAG;YACX,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,aAAa;YACb,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;SACrE,CAAC;QAEF,IAAI,UAAU,GAAG,qCAAiB,CAAC,mBAAmB,CAAC,CAAC;QAExD,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,2BAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;SAC5H;QAED,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC/D,MAAM,mBAAmB,GAAG,WAAW,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,WAAW,GAAG,CAAC,CAAC;YAChG,IAAI,mBAAmB,EAAE;gBACvB,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;aACtD;SACF;QAED,kBAAM,CAAC,IAAI,CAAC,0BAA0B,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE5E,OAAO,0BAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC;AACJ,CAAC;AAlCD,wCAkCC"}
@@ -28,7 +28,7 @@ function webpackDevServerTask(options = {}) {
28
28
  let args = [...(options.nodeArgs || []), ...devServerCmd];
29
29
  if (configPath && fs.existsSync(configPath)) {
30
30
  args = [...args, '--config', configPath];
31
- options.env = Object.assign(Object.assign({}, options.env), (configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)));
31
+ options.env = { ...options.env, ...(configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)) };
32
32
  }
33
33
  if (options.open) {
34
34
  args.push('--open');
@@ -1 +1 @@
1
- {"version":3,"file":"webpackDevServerTask.js","sourceRoot":"","sources":["../../src/tasks/webpackDevServerTask.ts"],"names":[],"mappings":";;;AAEA,2DAAuD;AACvD,yCAAsE;AACtE,yBAAyB;AACzB,6BAA6B;AAE7B,6DAA0D;AAC1D,oEAAiE;AACjE,iCAAiC;AAwCjC,SAAgB,oBAAoB,CAAC,UAAuC,EAAE;IAC5E,MAAM,UAAU,GACd,OAAO,IAAI,OAAO,CAAC,MAAM;QACvB,CAAC,CAAC,sBAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,qCAAiB,CAAC,yBAAyB,EAAE,mBAAmB,CAAC,CAAC;IAExE,kGAAkG;IAClG,MAAM,cAAc,GAAG,mBAAO,CAAC,0BAA0B,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;KAChG;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAEvF,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,eAAe;QAClC,CAAC,CAAC,oEAAoE;YACpE,CAAC,mBAAO,CAAC,wBAAwB,CAAE,EAAE,OAAO,CAAC;QAC/C,CAAC,CAAC,oEAAoE;YACpE,CAAC,mBAAO,CAAC,8CAA8C,CAAE,CAAC,CAAC;IAE/D,OAAO,SAAS,gBAAgB;QAC9B,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC,CAAC;QAE1D,IAAI,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC3C,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACzC,OAAO,CAAC,GAAG,mCAAQ,OAAO,CAAC,GAAG,GAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,2BAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAE,CAAC;SAC5H;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;SAC7C;QAED,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,+BAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,OAAO,0BAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC;AACJ,CAAC;AA9CD,oDA8CC"}
1
+ {"version":3,"file":"webpackDevServerTask.js","sourceRoot":"","sources":["../../src/tasks/webpackDevServerTask.ts"],"names":[],"mappings":";;;AAEA,2DAAuD;AACvD,yCAAsE;AACtE,yBAAyB;AACzB,6BAA6B;AAE7B,6DAA0D;AAC1D,oEAAiE;AACjE,iCAAiC;AAwCjC,SAAgB,oBAAoB,CAAC,UAAuC,EAAE;IAC5E,MAAM,UAAU,GACd,OAAO,IAAI,OAAO,CAAC,MAAM;QACvB,CAAC,CAAC,sBAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,qCAAiB,CAAC,yBAAyB,EAAE,mBAAmB,CAAC,CAAC;IAExE,kGAAkG;IAClG,MAAM,cAAc,GAAG,mBAAO,CAAC,0BAA0B,CAAC,CAAC;IAE3D,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;KAChG;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAEvF,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,eAAe;QAClC,CAAC,CAAC,oEAAoE;YACpE,CAAC,mBAAO,CAAC,wBAAwB,CAAE,EAAE,OAAO,CAAC;QAC/C,CAAC,CAAC,oEAAoE;YACpE,CAAC,mBAAO,CAAC,8CAA8C,CAAE,CAAC,CAAC;IAE/D,OAAO,SAAS,gBAAgB;QAC9B,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC,CAAC;QAE1D,IAAI,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC3C,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACzC,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,2BAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;SAC5H;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrB;QAED,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;SAC7C;QAED,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,+BAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,OAAO,0BAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC;AACJ,CAAC;AA9CD,oDA8CC"}
@@ -1,24 +1,4 @@
1
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
- var __rest = (this && this.__rest) || function (s, e) {
12
- var t = {};
13
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
14
- t[p] = s[p];
15
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
16
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
17
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
18
- t[p[i]] = s[p[i]];
19
- }
20
- return t;
21
- };
22
2
  Object.defineProperty(exports, "__esModule", { value: true });
23
3
  exports.webpackTask = void 0;
24
4
  const just_task_1 = require("just-task");
@@ -29,67 +9,65 @@ const webpack_merge_1 = require("webpack-merge");
29
9
  const findWebpackConfig_1 = require("../webpack/findWebpackConfig");
30
10
  const enableTypeScript_1 = require("just-task/lib/enableTypeScript");
31
11
  function webpackTask(options) {
32
- return function webpack() {
33
- return __awaiter(this, void 0, void 0, function* () {
34
- const wp = tryRequire_1.tryRequire('webpack');
35
- if (!wp) {
36
- just_task_1.logger.warn('webpack is not installed, this task no effect');
37
- return;
38
- }
39
- just_task_1.logger.info(`Running Webpack`);
40
- const webpackConfigPath = options && options.config ? just_task_1.resolveCwd(path.join('.', options.config)) : findWebpackConfig_1.findWebpackConfig('webpack.config.js');
41
- just_task_1.logger.info(`Webpack Config Path: ${webpackConfigPath}`);
42
- if (webpackConfigPath && fs.existsSync(webpackConfigPath) && webpackConfigPath.endsWith('.ts')) {
43
- const transpileOnly = options ? options.transpileOnly !== false : true;
44
- enableTypeScript_1.enableTypeScript({ transpileOnly });
45
- }
46
- const configLoader = webpackConfigPath ? require(path.resolve(webpackConfigPath)) : {};
47
- let webpackConfigs;
48
- // If the loaded webpack config is a function
49
- // call it with the original process.argv arguments from build.js.
50
- if (typeof configLoader == 'function') {
51
- webpackConfigs = configLoader(just_task_1.argv().env, just_task_1.argv());
52
- }
53
- else {
54
- webpackConfigs = configLoader;
55
- }
56
- if (!Array.isArray(webpackConfigs)) {
57
- webpackConfigs = [webpackConfigs];
58
- }
59
- // Convert everything to promises first to make sure we resolve all promises
60
- const webpackConfigPromises = yield Promise.all(webpackConfigs.map(webpackConfig => Promise.resolve(webpackConfig)));
61
- // We support passing in arbitrary webpack config options that we need to merge with any read configs.
62
- // To do this, we need to filter out the properties that aren't valid config options and then run webpack merge.
63
- // A better long term solution here would be to have an option called webpackConfigOverrides instead of extending the configuration object.
64
- const _a = options || {}, { config, outputStats } = _a, restConfig = __rest(_a, ["config", "outputStats"]);
65
- webpackConfigs = webpackConfigPromises.map(webpackConfig => webpack_merge_1.merge(webpackConfig, restConfig));
66
- return new Promise((resolve, reject) => {
67
- wp(webpackConfigs, (err, stats) => __awaiter(this, void 0, void 0, function* () {
68
- if (options && options.onCompile) {
69
- const results = options.onCompile(err, stats);
70
- if (typeof results === 'object' && results.then) {
71
- yield results;
72
- }
73
- }
74
- if (options && options.outputStats) {
75
- const statsFile = options.outputStats === true ? 'stats.json' : options.outputStats;
76
- fs.writeFileSync(statsFile, JSON.stringify(stats.toJson(), null, 2));
12
+ return async function webpack() {
13
+ const wp = tryRequire_1.tryRequire('webpack');
14
+ if (!wp) {
15
+ just_task_1.logger.warn('webpack is not installed, this task no effect');
16
+ return;
17
+ }
18
+ just_task_1.logger.info(`Running Webpack`);
19
+ const webpackConfigPath = options && options.config ? just_task_1.resolveCwd(path.join('.', options.config)) : findWebpackConfig_1.findWebpackConfig('webpack.config.js');
20
+ just_task_1.logger.info(`Webpack Config Path: ${webpackConfigPath}`);
21
+ if (webpackConfigPath && fs.existsSync(webpackConfigPath) && webpackConfigPath.endsWith('.ts')) {
22
+ const transpileOnly = options ? options.transpileOnly !== false : true;
23
+ enableTypeScript_1.enableTypeScript({ transpileOnly });
24
+ }
25
+ const configLoader = webpackConfigPath ? require(path.resolve(webpackConfigPath)) : {};
26
+ let webpackConfigs;
27
+ // If the loaded webpack config is a function
28
+ // call it with the original process.argv arguments from build.js.
29
+ if (typeof configLoader == 'function') {
30
+ webpackConfigs = configLoader(just_task_1.argv().env, just_task_1.argv());
31
+ }
32
+ else {
33
+ webpackConfigs = configLoader;
34
+ }
35
+ if (!Array.isArray(webpackConfigs)) {
36
+ webpackConfigs = [webpackConfigs];
37
+ }
38
+ // Convert everything to promises first to make sure we resolve all promises
39
+ const webpackConfigPromises = await Promise.all(webpackConfigs.map(webpackConfig => Promise.resolve(webpackConfig)));
40
+ // We support passing in arbitrary webpack config options that we need to merge with any read configs.
41
+ // To do this, we need to filter out the properties that aren't valid config options and then run webpack merge.
42
+ // A better long term solution here would be to have an option called webpackConfigOverrides instead of extending the configuration object.
43
+ const { config, outputStats, ...restConfig } = options || {};
44
+ webpackConfigs = webpackConfigPromises.map(webpackConfig => webpack_merge_1.merge(webpackConfig, restConfig));
45
+ return new Promise((resolve, reject) => {
46
+ wp(webpackConfigs, async (err, stats) => {
47
+ if (options && options.onCompile) {
48
+ const results = options.onCompile(err, stats);
49
+ if (typeof results === 'object' && results.then) {
50
+ await results;
77
51
  }
78
- if (err || stats.hasErrors()) {
79
- // Stats may be undefined the the case of an error in Webpack 5
80
- if (stats) {
81
- just_task_1.logger.error(stats.toString({ children: webpackConfigs.map(c => c.stats) }));
82
- reject(`Webpack failed with ${stats.toJson('errors-only').errors.length} error(s).`);
83
- }
84
- else {
85
- just_task_1.logger.error(err.toString());
86
- reject(`Webpack failed with error(s).`);
87
- }
52
+ }
53
+ if (options && options.outputStats) {
54
+ const statsFile = options.outputStats === true ? 'stats.json' : options.outputStats;
55
+ fs.writeFileSync(statsFile, JSON.stringify(stats.toJson(), null, 2));
56
+ }
57
+ if (err || stats.hasErrors()) {
58
+ // Stats may be undefined the the case of an error in Webpack 5
59
+ if (stats) {
60
+ just_task_1.logger.error(stats.toString({ children: webpackConfigs.map(c => c.stats) }));
61
+ reject(`Webpack failed with ${stats.toJson('errors-only').errors.length} error(s).`);
88
62
  }
89
63
  else {
90
- resolve();
64
+ just_task_1.logger.error(err.toString());
65
+ reject(`Webpack failed with error(s).`);
91
66
  }
92
- }));
67
+ }
68
+ else {
69
+ resolve();
70
+ }
93
71
  });
94
72
  });
95
73
  };
@@ -1 +1 @@
1
- {"version":3,"file":"webpackTask.js","sourceRoot":"","sources":["../../src/tasks/webpackTask.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webpackTask.js","sourceRoot":"","sources":["../../src/tasks/webpackTask.ts"],"names":[],"mappings":"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"}
@@ -42,7 +42,10 @@ function createStyleLoaderRule(cssOptions, preprocessor = null) {
42
42
  },
43
43
  {
44
44
  loader: 'css-loader',
45
- options: Object.assign(Object.assign({}, moduleOptions), { importLoaders: preloaders.length }),
45
+ options: {
46
+ ...moduleOptions,
47
+ importLoaders: preloaders.length,
48
+ },
46
49
  },
47
50
  ...preloaders,
48
51
  ];
@@ -1 +1 @@
1
- {"version":3,"file":"stylesOverlay.js","sourceRoot":"","sources":["../../../src/webpack/overlays/stylesOverlay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stylesOverlay.js","sourceRoot":"","sources":["../../../src/webpack/overlays/stylesOverlay.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "just-scripts",
3
- "version": "1.8.0",
3
+ "version": "1.8.1",
4
4
  "description": "Just Stack Scripts",
5
5
  "keywords": [],
6
6
  "repository": {
@@ -27,7 +27,7 @@
27
27
  "fs-extra": "^8.0.0",
28
28
  "glob": "^7.1.3",
29
29
  "just-scripts-utils": ">=1.1.5 <2.0.0",
30
- "just-task": ">=1.4.2 <2.0.0",
30
+ "just-task": ">=1.5.0 <2.0.0",
31
31
  "prompts": "^2.4.0",
32
32
  "run-parallel-limit": "^1.0.6",
33
33
  "semver": "^7.0.0",