just-scripts 1.8.0 → 2.0.0

package/CHANGELOG.json

@@ -2,7 +2,52 @@
   "name": "just-scripts",
   "entries": [
     {
-      "date": "Mon, 07 Feb 2022 19:43:38 GMT",
+      "date": "Mon, 16 May 2022 20:50:31 GMT",
+      "tag": "just-scripts_v2.0.0",
+      "version": "2.0.0",
+      "comments": {
+        "major": [
+          {
+            "author": "benw@microsoft.com",
+            "package": "just-scripts",
+            "comment": "Add support for symlink creation in the copy task",
+            "commit": "02e45b2c092548c4ac43e142aaa510a7ad95ec49"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 05 Apr 2022 20:55:43 GMT",
+      "tag": "just-scripts_v1.8.2",
+      "version": "1.8.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "tristan.watanabe@gmail.com",
+            "package": "just-scripts",
+            "comment": "Add support for dart-sass",
+            "commit": "365c671c3228d59c8861fe249cc132e4b51faf57"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 31 Mar 2022 17:04:30 GMT",
+      "tag": "just-scripts_v1.8.1",
+      "version": "1.8.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "just-scripts",
+            "commit": "0c2e911432d9c09a7b3396d40c811260d84749ac",
+            "comment": "Bump just-scripts to v1.8.1"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 07 Feb 2022 19:43:53 GMT",
       "tag": "just-scripts_v1.8.0",
       "version": "1.8.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,36 @@
 # Change Log - just-scripts
 
-This log was last generated on Mon, 07 Feb 2022 19:43:38 GMT and should not be manually modified.
+This log was last generated on Mon, 16 May 2022 20:50:31 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 2.0.0
+
+Mon, 16 May 2022 20:50:31 GMT
+
+### Major changes
+
+- Add support for symlink creation in the copy task (benw@microsoft.com)
+
+## 1.8.2
+
+Tue, 05 Apr 2022 20:55:43 GMT
+
+### Patches
+
+- Add support for dart-sass (tristan.watanabe@gmail.com)
+
+## 1.8.1
+
+Thu, 31 Mar 2022 17:04:30 GMT
+
+### Patches
+
+- Bump just-scripts to v1.8.1 (dzearing@microsoft.com)
+
 ## 1.8.0
 
-Mon, 07 Feb 2022 19:43:38 GMT
+Mon, 07 Feb 2022 19:43:53 GMT
 
 ### Minor changes
 

package/lib/copy/CopyInstruction.d.ts

@@ -8,6 +8,12 @@ export interface CopyInstruction {
      * The path+filename of the destination file.
      */
     destinationFilePath: string;
+    /**
+     * Set to true if a copy or merge should be performed, false if a symlink should be created.
+     * If multiple source files are specified (i.e. a merge), this must be true or undefined.
+     * The default value of undefined is equivalent to true for a merge, false in all other cases.
+     */
+    noSymlink?: boolean;
 }
 export interface CopyConfig {
     copyInstructions: CopyInstruction[];
@@ -17,13 +23,13 @@ export interface CopyConfig {
  * For example copyFilesToDestinationDirectory(['some/path/foo.js', 'bar.js'], 'dest/target') would result in the creation of
  * files 'dest/target/foo.js' and 'dest/target/bar.js'.
  */
-export declare function copyFilesToDestinationDirectory(sourceFilePaths: string | string[], destinationDirectory: string): CopyInstruction[];
+export declare function copyFilesToDestinationDirectory(sourceFilePaths: string | string[], destinationDirectory: string, noSymlinks?: boolean): CopyInstruction[];
 /**
  * Copies a file into a destination directory with a different name.
  * For example copyFileToDestinationDirectoryWithRename('some/path/foo.js', 'bar.js', 'dest/target') would result in the creation of
  * the file 'dest/target/bar.js'.
  */
-export declare function copyFileToDestinationDirectoryWithRename(sourceFilePath: string, destinationName: string, destinationDirectory: string): CopyInstruction[];
+export declare function copyFileToDestinationDirectoryWithRename(sourceFilePath: string, destinationName: string, destinationDirectory: string, noSymlink?: boolean): CopyInstruction[];
 /**
  * Copies files into a destination directory with different names.
  * For example copyFilesToDestinationDirectoryWithRename([{sourceFilePath:'some/path/foo.js', destinationName:'bar.js'}], 'dest/target')
@@ -32,12 +38,12 @@ export declare function copyFileToDestinationDirectoryWithRename(sourceFilePath:
 export declare function copyFilesToDestinationDirectoryWithRename(instrs: {
     sourceFilePath: string;
     destinationName: string;
-}[], destinationDirectory: string): CopyInstruction[];
+}[], destinationDirectory: string, noSymlinks?: boolean): CopyInstruction[];
 /**
  * Copies all the files in a directory to the output folder.
  * You can optionally provide a filter function that determines which files to copy.
  */
-export declare function copyFilesInDirectory(sourceDirectoryPath: string, outputDirectoryPath: string, filterFunction?: (file: string) => boolean): CopyInstruction[];
+export declare function copyFilesInDirectory(sourceDirectoryPath: string, outputDirectoryPath: string, filterFunction?: (file: string) => boolean, noSymlinks?: boolean): CopyInstruction[];
 /**
  * Merges the contents of multiple files and places them in the output folder.
  * This should only be used for text files and it should not be used for JavaScript

package/lib/copy/CopyInstruction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CopyInstruction.d.ts","sourceRoot":"","sources":["../../src/copy/CopyInstruction.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,UAAU;IACzB,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,oBAAoB,EAAE,MAAM,GAAG,eAAe,EAAE,CAKnI;AAED;;;;GAIG;AACH,wBAAgB,wCAAwC,CACtD,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,oBAAoB,EAAE,MAAM,GAC3B,eAAe,EAAE,CAEnB;AAED;;;;GAIG;AACH,wBAAgB,yCAAyC,CACvD,MAAM,EAAE;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,EAAE,EAC7D,oBAAoB,EAAE,MAAM,GAC3B,eAAe,EAAE,CAKnB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,MAAM,EAC3B,mBAAmB,EAAE,MAAM,EAC3B,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GACzC,eAAe,EAAE,CAUnB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,mBAAmB,EAAE,MAAM,GAAG,eAAe,CAKlG"}
+{"version":3,"file":"CopyInstruction.d.ts","sourceRoot":"","sources":["../../src/copy/CopyInstruction.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAElC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,eAAe,EAAE,MAAM,GAAG,MAAM,EAAE,EAClC,oBAAoB,EAAE,MAAM,EAC5B,UAAU,CAAC,EAAE,OAAO,GACnB,eAAe,EAAE,CAMnB;AAED;;;;GAIG;AACH,wBAAgB,wCAAwC,CACtD,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,oBAAoB,EAAE,MAAM,EAC5B,SAAS,CAAC,EAAE,OAAO,GAClB,eAAe,EAAE,CAEnB;AAED;;;;GAIG;AACH,wBAAgB,yCAAyC,CACvD,MAAM,EAAE;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,EAAE,EAC7D,oBAAoB,EAAE,MAAM,EAC5B,UAAU,CAAC,EAAE,OAAO,GACnB,eAAe,EAAE,CAMnB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,mBAAmB,EAAE,MAAM,EAC3B,mBAAmB,EAAE,MAAM,EAC3B,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EAC1C,UAAU,CAAC,EAAE,OAAO,GACnB,eAAe,EAAE,CAWnB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,mBAAmB,EAAE,MAAM,GAAG,eAAe,CAKlG"}

package/lib/copy/CopyInstruction.js

@@ -9,10 +9,11 @@ const arrayify_1 = require("../arrayUtils/arrayify");
  * For example copyFilesToDestinationDirectory(['some/path/foo.js', 'bar.js'], 'dest/target') would result in the creation of
  * files 'dest/target/foo.js' and 'dest/target/bar.js'.
  */
-function copyFilesToDestinationDirectory(sourceFilePaths, destinationDirectory) {
+function copyFilesToDestinationDirectory(sourceFilePaths, destinationDirectory, noSymlinks) {
     return arrayify_1.arrayify(sourceFilePaths).map(sourceName => ({
         sourceFilePath: path_1.normalize(sourceName),
         destinationFilePath: path_1.join(destinationDirectory, path_1.basename(sourceName)),
+        noSymlink: noSymlinks,
     }));
 }
 exports.copyFilesToDestinationDirectory = copyFilesToDestinationDirectory;
@@ -21,8 +22,8 @@ exports.copyFilesToDestinationDirectory = copyFilesToDestinationDirectory;
  * For example copyFileToDestinationDirectoryWithRename('some/path/foo.js', 'bar.js', 'dest/target') would result in the creation of
  * the file 'dest/target/bar.js'.
  */
-function copyFileToDestinationDirectoryWithRename(sourceFilePath, destinationName, destinationDirectory) {
-    return [{ sourceFilePath, destinationFilePath: path_1.join(destinationDirectory, destinationName) }];
+function copyFileToDestinationDirectoryWithRename(sourceFilePath, destinationName, destinationDirectory, noSymlink) {
+    return [{ sourceFilePath, destinationFilePath: path_1.join(destinationDirectory, destinationName), noSymlink }];
 }
 exports.copyFileToDestinationDirectoryWithRename = copyFileToDestinationDirectoryWithRename;
 /**
@@ -30,10 +31,11 @@ exports.copyFileToDestinationDirectoryWithRename = copyFileToDestinationDirector
  * For example copyFilesToDestinationDirectoryWithRename([{sourceFilePath:'some/path/foo.js', destinationName:'bar.js'}], 'dest/target')
  * would result in the creation of the file 'dest/target/bar.js'.
  */
-function copyFilesToDestinationDirectoryWithRename(instrs, destinationDirectory) {
+function copyFilesToDestinationDirectoryWithRename(instrs, destinationDirectory, noSymlinks) {
     return instrs.map(instr => ({
         sourceFilePath: instr.sourceFilePath,
         destinationFilePath: path_1.join(destinationDirectory, instr.destinationName),
+        noSymlink: noSymlinks,
     }));
 }
 exports.copyFilesToDestinationDirectoryWithRename = copyFilesToDestinationDirectoryWithRename;
@@ -41,7 +43,7 @@ exports.copyFilesToDestinationDirectoryWithRename = copyFilesToDestinationDirect
  * Copies all the files in a directory to the output folder.
  * You can optionally provide a filter function that determines which files to copy.
  */
-function copyFilesInDirectory(sourceDirectoryPath, outputDirectoryPath, filterFunction) {
+function copyFilesInDirectory(sourceDirectoryPath, outputDirectoryPath, filterFunction, noSymlinks) {
     let files = fs_1.readdirSync(sourceDirectoryPath);
     if (filterFunction) {
         files = files.filter(filterFunction);
@@ -49,6 +51,7 @@ function copyFilesInDirectory(sourceDirectoryPath, outputDirectoryPath, filterFu
     return files.map(file => ({
         sourceFilePath: path_1.join(sourceDirectoryPath, file),
         destinationFilePath: path_1.join(outputDirectoryPath, file),
+        noSymlink: noSymlinks,
     }));
 }
 exports.copyFilesInDirectory = copyFilesInDirectory;

package/lib/copy/CopyInstruction.js.map

@@ -1 +1 @@
-{"version":3,"file":"CopyInstruction.js","sourceRoot":"","sources":["../../src/copy/CopyInstruction.ts"],"names":[],"mappings":";;;AAAA,+BAAiD;AACjD,2BAAiC;AACjC,qDAAkD;AAmBlD;;;;GAIG;AACH,SAAgB,+BAA+B,CAAC,eAAkC,EAAE,oBAA4B;IAC9G,OAAO,mBAAQ,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAClD,cAAc,EAAE,gBAAS,CAAC,UAAU,CAAC;QACrC,mBAAmB,EAAE,WAAI,CAAC,oBAAoB,EAAE,eAAQ,CAAC,UAAU,CAAC,CAAC;KACtE,CAAC,CAAC,CAAC;AACN,CAAC;AALD,0EAKC;AAED;;;;GAIG;AACH,SAAgB,wCAAwC,CACtD,cAAsB,EACtB,eAAuB,EACvB,oBAA4B;IAE5B,OAAO,CAAC,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC;AAChG,CAAC;AAND,4FAMC;AAED;;;;GAIG;AACH,SAAgB,yCAAyC,CACvD,MAA6D,EAC7D,oBAA4B;IAE5B,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,mBAAmB,EAAE,WAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,eAAe,CAAC;KACvE,CAAC,CAAC,CAAC;AACN,CAAC;AARD,8FAQC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAClC,mBAA2B,EAC3B,mBAA2B,EAC3B,cAA0C;IAE1C,IAAI,KAAK,GAAG,gBAAW,CAAC,mBAAmB,CAAC,CAAC;IAE7C,IAAI,cAAc,EAAE;QAClB,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;KACtC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,cAAc,EAAE,WAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;QAC/C,mBAAmB,EAAE,WAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;KACrD,CAAC,CAAC,CAAC;AACN,CAAC;AAdD,oDAcC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,eAAyB,EAAE,mBAA2B;IAC/E,OAAO;QACL,cAAc,EAAE,eAAe;QAC/B,mBAAmB;KACpB,CAAC;AACJ,CAAC;AALD,gCAKC"}
+{"version":3,"file":"CopyInstruction.js","sourceRoot":"","sources":["../../src/copy/CopyInstruction.ts"],"names":[],"mappings":";;;AAAA,+BAAiD;AACjD,2BAAiC;AACjC,qDAAkD;AA0BlD;;;;GAIG;AACH,SAAgB,+BAA+B,CAC7C,eAAkC,EAClC,oBAA4B,EAC5B,UAAoB;IAEpB,OAAO,mBAAQ,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAClD,cAAc,EAAE,gBAAS,CAAC,UAAU,CAAC;QACrC,mBAAmB,EAAE,WAAI,CAAC,oBAAoB,EAAE,eAAQ,CAAC,UAAU,CAAC,CAAC;QACrE,SAAS,EAAE,UAAU;KACtB,CAAC,CAAC,CAAC;AACN,CAAC;AAVD,0EAUC;AAED;;;;GAIG;AACH,SAAgB,wCAAwC,CACtD,cAAsB,EACtB,eAAuB,EACvB,oBAA4B,EAC5B,SAAmB;IAEnB,OAAO,CAAC,EAAE,cAAc,EAAE,mBAAmB,EAAE,WAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AAC3G,CAAC;AAPD,4FAOC;AAED;;;;GAIG;AACH,SAAgB,yCAAyC,CACvD,MAA6D,EAC7D,oBAA4B,EAC5B,UAAoB;IAEpB,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,mBAAmB,EAAE,WAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,eAAe,CAAC;QACtE,SAAS,EAAE,UAAU;KACtB,CAAC,CAAC,CAAC;AACN,CAAC;AAVD,8FAUC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAClC,mBAA2B,EAC3B,mBAA2B,EAC3B,cAA0C,EAC1C,UAAoB;IAEpB,IAAI,KAAK,GAAG,gBAAW,CAAC,mBAAmB,CAAC,CAAC;IAE7C,IAAI,cAAc,EAAE;QAClB,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;KACtC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,cAAc,EAAE,WAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;QAC/C,mBAAmB,EAAE,WAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;QACpD,SAAS,EAAE,UAAU;KACtB,CAAC,CAAC,CAAC;AACN,CAAC;AAhBD,oDAgBC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,eAAyB,EAAE,mBAA2B;IAC/E,OAAO;QACL,cAAc,EAAE,eAAe;QAC/B,mBAAmB;KACpB,CAAC;AACJ,CAAC;AALD,gCAKC"}

package/lib/copy/executeCopyInstructions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeCopyInstructions.d.ts","sourceRoot":"","sources":["../../src/copy/executeCopyInstructions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIhE;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAK3F"}
+{"version":3,"file":"executeCopyInstructions.d.ts","sourceRoot":"","sources":["../../src/copy/executeCopyInstructions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIhE;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAM3F"}

package/lib/copy/executeCopyInstructions.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCopyInstructions = void 0;
 const path_1 = require("path");
@@ -17,23 +8,34 @@ const uniqueValues_1 = require("../arrayUtils/uniqueValues");
 /**
  * Function containing the core code for the copy task with a given config.
  */
-function executeCopyInstructions(config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (config && config.copyInstructions) {
-            yield createDirectories(config.copyInstructions);
-            yield Promise.all(config.copyInstructions.map(executeSingleCopyInstruction));
+async function executeCopyInstructions(config) {
+    if (config && config.copyInstructions) {
+        validateConfig(config.copyInstructions);
+        await createDirectories(config.copyInstructions);
+        await Promise.all(config.copyInstructions.map(executeSingleCopyInstruction));
+    }
+}
+exports.executeCopyInstructions = executeCopyInstructions;
+function validateConfig(copyInstructions) {
+    copyInstructions.forEach(instr => {
+        if (instr.noSymlink === false && Array.isArray(instr.sourceFilePath) && instr.sourceFilePath.length > 1) {
+            throw new Error('Multiple source files cannot be specified when making a symlink');
         }
     });
 }
-exports.executeCopyInstructions = executeCopyInstructions;
 function createDirectories(copyInstructions) {
     return Promise.all(uniqueValues_1.uniqueValues(copyInstructions.map(instruction => path_1.dirname(instruction.destinationFilePath))).map(dirname => fs_extra_1.ensureDir(dirname)));
 }
 function executeSingleCopyInstruction(copyInstruction) {
     const sourceFileNames = arrayify_1.arrayify(copyInstruction.sourceFilePath);
-    // source and dest are 1-to-1?  perform binary copy.
+    // source and dest are 1-to-1?  perform binary copy or symlink as desired.
     if (sourceFileNames.length === 1) {
-        return fs_extra_1.copy(sourceFileNames[0], copyInstruction.destinationFilePath);
+        if (copyInstruction.noSymlink) {
+            return fs_extra_1.copy(sourceFileNames[0], copyInstruction.destinationFilePath);
+        }
+        else {
+            return fs_extra_1.ensureSymlink(path_1.resolve(sourceFileNames[0]), copyInstruction.destinationFilePath);
+        }
     }
     // perform text merge operation.
     return Promise.all(sourceFileNames.map(fileName => fs_extra_1.readFile(fileName))).then(fileContents => {

package/lib/copy/executeCopyInstructions.js.map

@@ -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"}
+{"version":3,"file":"executeCopyInstructions.js","sourceRoot":"","sources":["../../src/copy/executeCopyInstructions.ts"],"names":[],"mappings":";;;AAAA,+BAAwC;AACxC,uCAA+E;AAE/E,qDAAkD;AAClD,6DAA0D;AAE1D;;GAEG;AACI,KAAK,UAAU,uBAAuB,CAAC,MAA8B;IAC1E,IAAI,MAAM,IAAI,MAAM,CAAC,gBAAgB,EAAE;QACrC,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACxC,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;AAND,0DAMC;AAED,SAAS,cAAc,CAAC,gBAAmC;IACzD,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC/B,IAAI,KAAK,CAAC,SAAS,KAAK,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YACvG,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;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,0EAA0E;IAC1E,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAChC,IAAI,eAAe,CAAC,SAAS,EAAE;YAC7B,OAAO,eAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;SACtE;aAAM;YACL,OAAO,wBAAa,CAAC,cAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;SACxF;KACF;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"}

package/lib/tasks/apiExtractorTask.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixApiFileNewlines = exports.apiExtractorUpdateTask = exports.apiExtractorVerifyTask = void 0;
 const just_task_1 = require("just-task");
@@ -18,7 +7,8 @@ const path = require("path");
 const tryRequire_1 = require("../tryRequire");
 function apiExtractorVerifyTask(configJsonFilePathOrOption = {}, extractorOptions = {}) {
     const options = typeof configJsonFilePathOrOption === 'string'
-        ? Object.assign(Object.assign({}, extractorOptions), { configJsonFilePath: configJsonFilePathOrOption }) : Object.assign({}, configJsonFilePathOrOption);
+        ? { ...extractorOptions, configJsonFilePath: configJsonFilePathOrOption }
+        : { ...configJsonFilePathOrOption };
     return function apiExtractorVerify() {
         const context = initApiExtractor(options);
         if (context) {
@@ -32,7 +22,8 @@ function apiExtractorVerifyTask(configJsonFilePathOrOption = {}, extractorOption
 exports.apiExtractorVerifyTask = apiExtractorVerifyTask;
 function apiExtractorUpdateTask(configJsonFilePathOrOption = {}, extractorOptions = {}) {
     const options = typeof configJsonFilePathOrOption === 'string'
-        ? Object.assign(Object.assign({}, extractorOptions), { configJsonFilePath: configJsonFilePathOrOption }) : Object.assign({}, configJsonFilePathOrOption);
+        ? { ...extractorOptions, configJsonFilePath: configJsonFilePathOrOption }
+        : { ...configJsonFilePathOrOption };
     return function apiExtractorUpdate() {
         const context = initApiExtractor(options);
         if (context) {
@@ -75,7 +66,7 @@ function initApiExtractor(options) {
         return;
     }
     const { ExtractorConfig } = apiExtractorModule;
-    const { configJsonFilePath = ExtractorConfig.FILENAME, fixNewlines, onResult } = options, extractorOptions = __rest(options, ["configJsonFilePath", "fixNewlines", "onResult"]);
+    const { configJsonFilePath = ExtractorConfig.FILENAME, fixNewlines, onResult, ...extractorOptions } = options;
     if (!fs.existsSync(configJsonFilePath)) {
         const defaultConfig = path.resolve(__dirname, '../../config/apiExtractor/api-extractor.json');
         just_task_1.logger.warn(`Config file not found for api-extractor! Please copy ${defaultConfig} to project root folder to try again`);

package/lib/tasks/apiExtractorTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiExtractorTask.js","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apiExtractorTask.js","sourceRoot":"","sources":["../../src/tasks/apiExtractorTask.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,+BAA+B;AAC/B,6BAA6B;AAC7B,8CAA2C;AAqD3C,SAAgB,sBAAsB,CACpC,6BAA2D,EAAE,EAC7D,mBAAoE,EAAE;IAEtE,MAAM,OAAO,GACX,OAAO,0BAA0B,KAAK,QAAQ;QAC5C,CAAC,CAAC,EAAE,GAAG,gBAAgB,EAAE,kBAAkB,EAAE,0BAA0B,EAAE;QACzE,CAAC,CAAC,EAAE,GAAG,0BAA0B,EAAE,CAAC;IAExC,OAAO,SAAS,kBAAkB;QAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,EAAE;YACX,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAExD,IAAI,kBAAkB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;gBACvD,MAAM,IAAI,KAAK,CAAC,kGAAkG,CAAC,CAAC;aACrH;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAnBD,wDAmBC;AA4BD,SAAgB,sBAAsB,CACpC,6BAA2D,EAAE,EAC7D,mBAAoE,EAAE;IAEtE,MAAM,OAAO,GACX,OAAO,0BAA0B,KAAK,QAAQ;QAC5C,CAAC,CAAC,EAAE,GAAG,gBAAgB,EAAE,kBAAkB,EAAE,0BAA0B,EAAE;QACzE,CAAC,CAAC,EAAE,GAAG,0BAA0B,EAAE,CAAC;IAExC,OAAO,SAAS,kBAAkB;QAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,EAAE;YACX,IAAI,kBAAkB,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAEtD,IAAI,kBAAkB,EAAE;gBACtB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;oBACjC,kBAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;oBAClE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,4BAA4B;oBACxF,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;oBAElF,kBAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;oBAErF,kBAAkB,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;oBAClD,IAAI,CAAC,kBAAkB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE;wBACxD,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;qBAChE;yBAAM;wBACL,kBAAM,CAAC,IAAI,CAAC,8FAA8F,CAAC,CAAC;qBAC7G;iBACF;qBAAM;oBACL,kBAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;iBAChF;aACF;SACF;IACH,CAAC,CAAC;AACJ,CAAC;AAlCD,wDAkCC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,OAA4B;;IACpD,MAAM,kBAAkB,GAA6B,uBAAU,CAAC,0BAA0B,CAAC,CAAC;IAE5F,IAAI,CAAC,kBAAkB,EAAE;QACvB,kBAAM,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;QAC7F,OAAO;KACR;IAED,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,MAAM,EAAE;QACxC,kBAAM,CAAC,IAAI,CAAC,qFAAqF,CAAC,CAAC;QACnG,OAAO;KACR;IAED,MAAM,EAAE,eAAe,EAAE,GAAG,kBAAkB,CAAC;IAC/C,MAAM,EAAE,kBAAkB,GAAG,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAE9G,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QACtC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;QAC9F,kBAAM,CAAC,IAAI,CAAC,wDAAwD,aAAa,sCAAsC,CAAC,CAAC;QACzH,OAAO;KACR;IAED,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAC/D,mCAAmC;IACnC,MAAA,OAAO,CAAC,cAAc,+CAAtB,OAAO,EAAkB,SAAS,EAAE;IACpC,iEAAiE;IACjE,0IAA0I;IAE1I,MAAM,aAAa,GAAG;QACpB,YAAY,EAAE,SAAS;QACvB,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACtD,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;KAClD,CAAC;IAEF,qCAAqC;IACrC,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,aAAa,CAAC,YAAY,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;KAClE;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,mBAAmB,CAAC,EAC3B,kBAAkB,EAClB,MAAM,EACN,gBAAgB,EAChB,OAAO,GACa;IACpB,MAAM,EAAE,SAAS,EAAE,GAAG,kBAAkB,CAAC;IAEzC,kBAAM,CAAC,IAAI,CAAC,uCAAuC,MAAM,CAAC,sBAAsB,GAAG,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC1D,IAAI,OAAO,CAAC,QAAQ,EAAE;QACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;KAC5C;IAED,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;KACxI;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,WAAmB,EAAE,cAA6D;IACnH,IAAI,OAAe,CAAC;IACpB,IAAI,cAAc,CAAC,OAAO,EAAE;QAC1B,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC;KAClC;SAAM,IAAI,cAAc,CAAC,cAAc,EAAE;QACxC,MAAM,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7E,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,OAAO,CAAE,CAAC,CAAC,CAAC,CAAC;KACzC;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,qGAAqG,CAAC,CAAC;KACxH;IACD,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;IACzD,2FAA2F;IAC3F,0BAA0B;IAC1B,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;AACzF,CAAC;AAdD,gDAcC"}

package/lib/tasks/esbuildTask.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.esbuildTask = void 0;
 const just_task_1 = require("just-task");
@@ -20,11 +11,9 @@ function esbuildTask(options = {}) {
     if (!esbuildModuleResolution) {
         throw new Error('cannot find esbuild, please add it to your devDependencies');
     }
-    return function esbuild() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const esbuildModule = require(esbuildModuleResolution);
-            return esbuildModule.build(options);
-        });
+    return async function esbuild() {
+        const esbuildModule = require(esbuildModuleResolution);
+        return esbuildModule.build(options);
     };
 }
 exports.esbuildTask = esbuildTask;

package/lib/tasks/esbuildTask.js.map

@@ -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"}
+{"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"}

package/lib/tasks/eslintTask.js

@@ -27,7 +27,7 @@ function eslintTask(options = {}) {
                 '--color',
             ];
             just_task_1.logger.info(just_scripts_utils_1.encodeArgs(eslintArgs).join(' '));
-            return just_scripts_utils_1.spawn(process.execPath, eslintArgs, Object.assign({ stdio: 'inherit' }, (timing && { env: { TIMING: '1' } })));
+            return just_scripts_utils_1.spawn(process.execPath, eslintArgs, { stdio: 'inherit', ...(timing && { env: { TIMING: '1' } }) });
         }
         else {
             return Promise.resolve();

package/lib/tasks/eslintTask.js.map

@@ -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"}
+{"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"}

package/lib/tasks/nodeExecTask.js

@@ -14,13 +14,13 @@ function nodeExecTask(options) {
             options.args = options.args || [];
             options.args.unshift(tsNodeRegister);
             options.args.unshift('-r');
-            options.env = Object.assign(Object.assign({}, options.env), getTsNodeEnv_1.getTsNodeEnv(tsconfig, transpileOnly));
+            options.env = { ...options.env, ...getTsNodeEnv_1.getTsNodeEnv(tsconfig, transpileOnly) };
             just_task_1.logger.info('Executing [TS]: ' + [nodeExecPath, ...(options.args || [])].join(' '));
         }
         else {
             just_task_1.logger.info('Executing: ' + [nodeExecPath, ...(options.args || [])].join(' '));
         }
-        return just_scripts_utils_1.spawn(nodeExecPath, options.args, Object.assign({ stdio: 'inherit', env: options.env }, spawnOptions));
+        return just_scripts_utils_1.spawn(nodeExecPath, options.args, { stdio: 'inherit', env: options.env, ...spawnOptions });
     };
 }
 exports.nodeExecTask = nodeExecTask;

package/lib/tasks/nodeExecTask.js.map

@@ -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"}
+{"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"}

package/lib/tasks/prettierTask.js

@@ -10,7 +10,13 @@ function prettierTask(options = {}) {
     const prettierBin = just_task_1.resolve('prettier/bin-prettier.js');
     if (prettierBin) {
         return function prettier() {
-            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 }));
+            return runPrettierAsync({
+                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,
+            });
         };
     }
     return function () {
@@ -22,7 +28,13 @@ function prettierCheckTask(options = {}) {
     const prettierBin = just_task_1.resolve('prettier/bin-prettier.js');
     if (prettierBin) {
         return function prettierCheck() {
-            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 }));
+            return runPrettierAsync({
+                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,
+            });
         };
     }
     return function () {

package/lib/tasks/prettierTask.js.map

@@ -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"}
+{"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,CAAC;gBACtB,WAAW;gBACX,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE;gBAClD,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE;gBAClD,GAAG,EAAE,KAAK,EAAE,mBAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,yCAAyC,CAAC,CAAC,EAAE;gBACrH,KAAK,EAAE,KAAK;aACb,CAAC,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,CAAC;gBACtB,WAAW;gBACX,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE;gBAClD,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS,EAAE;gBAClD,GAAG,EAAE,KAAK,EAAE,mBAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,yCAAyC,CAAC,CAAC,EAAE;gBACrH,KAAK,EAAE,IAAI;aACZ,CAAC,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"}

package/lib/tasks/sassTask.js

@@ -18,13 +18,13 @@ function sassTask(optionsOrCreateSourceModule, postcssPlugins) {
     }
     postcssPlugins = postcssPlugins || [];
     return function sass(done) {
-        const nodeSass = tryRequire_1.tryRequire('node-sass');
+        const sass = tryRequire_1.tryRequire('sass') || tryRequire_1.tryRequire('node-sass');
         const postcss = tryRequire_1.tryRequire('postcss');
         const autoprefixer = tryRequire_1.tryRequire('autoprefixer');
         const postcssRtl = tryRequire_1.tryRequire('postcss-rtl');
         const clean = tryRequire_1.tryRequire('postcss-clean');
-        if (!nodeSass || !postcss || !autoprefixer) {
-            just_task_1.logger.warn('One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect');
+        if (!sass || !postcss || !autoprefixer) {
+            just_task_1.logger.warn('One or more dependencies (sass or node-sass, postcss, autoprefixer) is not installed, so this task has no effect');
             done();
             return;
         }
@@ -33,7 +33,7 @@ function sassTask(optionsOrCreateSourceModule, postcssPlugins) {
         if (files.length) {
             const tasks = files.map((fileName) => function (cb) {
                 fileName = path.resolve(fileName);
-                nodeSass.render({
+                sass.render({
                     file: fileName,
                     importer: patchSassUrl,
                     includePaths: [path.resolve(process.cwd(), 'node_modules')],

package/lib/tasks/sassTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"sassTask.js","sourceRoot":"","sources":["../../src/tasks/sassTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sassTask.js","sourceRoot":"","sources":["../../src/tasks/sassTask.ts"],"names":[],"mappings":"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"}

package/lib/tasks/tarTask.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractTarTask = exports.createTarTask = void 0;
 const just_task_1 = require("just-task");
@@ -22,18 +11,23 @@ const zlib_1 = require("zlib");
 function createTarTask(options = { file: 'archive.tar.gz' }) {
     const resolvedTar = just_task_1.resolve('tar-fs');
     // Inject default options
-    options = Object.assign({ cwd: process.cwd(), gzip: true }, options);
+    options = { cwd: process.cwd(), gzip: true, ...options };
     // Validate whether tar-fs is installed
     if (!resolvedTar) {
         just_task_1.logger.error('Please make sure to have "tar-fs" as a dependency in your package.json');
         throw new Error('Required dependency "tar-fs" is not installed!');
     }
     const tar = require(resolvedTar);
-    const { entries, file, cwd } = options, restOptions = __rest(options, ["entries", "file", "cwd"]);
+    const { entries, file, cwd, ...restOptions } = options;
     return function archive(done) {
-        let tarStream = tar.pack(cwd, Object.assign({ entries, finalize: true, finish: () => {
+        let tarStream = tar.pack(cwd, {
+            entries,
+            finalize: true,
+            finish: () => {
                 done();
-            } }, restOptions));
+            },
+            ...restOptions,
+        });
         if (options.gzip) {
             const gzip = typeof options.gzip === 'boolean' ? zlib_1.createGzip() : zlib_1.createGzip(options.gzip);
             tarStream = tarStream.pipe(gzip);
@@ -49,23 +43,27 @@ exports.createTarTask = createTarTask;
 function extractTarTask(options = { file: 'archive.tar.gz' }) {
     const resolvedTar = just_task_1.resolve('tar-fs');
     // Inject default options
-    options = Object.assign({ cwd: process.cwd(), gzip: true }, options);
+    options = { cwd: process.cwd(), gzip: true, ...options };
     // Validate whether tar-fs is installed
     if (!resolvedTar) {
         just_task_1.logger.error('Please make sure to have "tar-fs" as a dependency in your package.json');
         throw new Error('Required dependency "tar-fs" is not installed!');
     }
     const tar = require(resolvedTar);
-    const { cwd, file } = options, restOptions = __rest(options, ["cwd", "file"]);
+    const { cwd, file, ...restOptions } = options;
     return function extract(done) {
         let tarStream = fs_1.createReadStream(file);
         if (options.gzip) {
             const gunzip = zlib_1.createGunzip();
             tarStream = tarStream.pipe(gunzip);
         }
-        tarStream = tarStream.pipe(tar.extract(cwd, Object.assign({ finalize: true, finish: () => {
+        tarStream = tarStream.pipe(tar.extract(cwd, {
+            finalize: true,
+            finish: () => {
                 done();
-            } }, restOptions)));
+            },
+            ...restOptions,
+        }));
     };
 }
 exports.extractTarTask = extractTarTask;

package/lib/tasks/tarTask.js.map

@@ -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"}
+{"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"}

package/lib/tasks/tscTask.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tscWatchTask = exports.tscTask = void 0;
 const just_task_1 = require("just-task");
@@ -25,7 +14,7 @@ function tscTask(options = {}) {
     }
     return function tsc() {
         // Read from options argument, if not there try the tsConfigFile found in root, if not then skip and use no config
-        options = Object.assign(Object.assign({}, options), getProjectOrBuildOptions(options));
+        options = { ...options, ...getProjectOrBuildOptions(options) };
         if (isValidProject(options)) {
             just_task_1.logger.info(`Running ${tscCmd} with ${options.project || options.build}`);
             const args = argsFromOptions(tscCmd, options);
@@ -46,7 +35,7 @@ function tscWatchTask(options = {}) {
         throw new Error('cannot find tsc');
     }
     return function tscWatch() {
-        options = Object.assign(Object.assign({}, options), getProjectOrBuildOptions(options));
+        options = { ...options, ...getProjectOrBuildOptions(options) };
         if (isValidProject(options)) {
             just_task_1.logger.info(`Running ${tscCmd} with ${options.project || options.build} in watch mode`);
             const args = argsFromOptions(tscCmd, options);
@@ -87,7 +76,7 @@ function isValidProject(options) {
  * Returns an array of CLI arguments for TSC given the `options`.
  */
 function argsFromOptions(tscCmd, options) {
-    const { nodeArgs } = options, rest = __rest(options, ["nodeArgs"]);
+    const { nodeArgs, ...rest } = options;
     return [
         ...(nodeArgs ? nodeArgs : []),
         ...Object.keys(rest).reduce((currentArgs, option) => {

package/lib/tasks/tscTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"tscTask.js","sourceRoot":"","sources":["../../src/tasks/tscTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tscTask.js","sourceRoot":"","sources":["../../src/tasks/tscTask.ts"],"names":[],"mappings":"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"}

package/lib/tasks/webpackCliTask.js

@@ -22,7 +22,7 @@ function webpackCliTask(options = {}) {
         ];
         let configPath = findWebpackConfig_1.findWebpackConfig('webpack.config.js');
         if (configPath) {
-            options.env = Object.assign(Object.assign({}, options.env), (configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)));
+            options.env = { ...options.env, ...(configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)) };
         }
         if (options.webpackCliArgs) {
             const configIndex = options.webpackCliArgs.indexOf('--config');

package/lib/tasks/webpackCliTask.js.map

@@ -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"}
+{"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"}

package/lib/tasks/webpackDevServerTask.js

@@ -28,7 +28,7 @@ function webpackDevServerTask(options = {}) {
         let args = [...(options.nodeArgs || []), ...devServerCmd];
         if (configPath && fs.existsSync(configPath)) {
             args = [...args, '--config', configPath];
-            options.env = Object.assign(Object.assign({}, options.env), (configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)));
+            options.env = { ...options.env, ...(configPath.endsWith('.ts') && getTsNodeEnv_1.getTsNodeEnv(options.tsconfig, options.transpileOnly)) };
         }
         if (options.open) {
             args.push('--open');

package/lib/tasks/webpackDevServerTask.js.map

@@ -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"}
+{"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"}

package/lib/tasks/webpackTask.js

@@ -1,24 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackTask = void 0;
 const just_task_1 = require("just-task");
@@ -29,67 +9,65 @@ const webpack_merge_1 = require("webpack-merge");
 const findWebpackConfig_1 = require("../webpack/findWebpackConfig");
 const enableTypeScript_1 = require("just-task/lib/enableTypeScript");
 function webpackTask(options) {
-    return function webpack() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wp = tryRequire_1.tryRequire('webpack');
-            if (!wp) {
-                just_task_1.logger.warn('webpack is not installed, this task no effect');
-                return;
-            }
-            just_task_1.logger.info(`Running Webpack`);
-            const webpackConfigPath = options && options.config ? just_task_1.resolveCwd(path.join('.', options.config)) : findWebpackConfig_1.findWebpackConfig('webpack.config.js');
-            just_task_1.logger.info(`Webpack Config Path: ${webpackConfigPath}`);
-            if (webpackConfigPath && fs.existsSync(webpackConfigPath) && webpackConfigPath.endsWith('.ts')) {
-                const transpileOnly = options ? options.transpileOnly !== false : true;
-                enableTypeScript_1.enableTypeScript({ transpileOnly });
-            }
-            const configLoader = webpackConfigPath ? require(path.resolve(webpackConfigPath)) : {};
-            let webpackConfigs;
-            // If the loaded webpack config is a function
-            // call it with the original process.argv arguments from build.js.
-            if (typeof configLoader == 'function') {
-                webpackConfigs = configLoader(just_task_1.argv().env, just_task_1.argv());
-            }
-            else {
-                webpackConfigs = configLoader;
-            }
-            if (!Array.isArray(webpackConfigs)) {
-                webpackConfigs = [webpackConfigs];
-            }
-            // Convert everything to promises first to make sure we resolve all promises
-            const webpackConfigPromises = yield Promise.all(webpackConfigs.map(webpackConfig => Promise.resolve(webpackConfig)));
-            // We support passing in arbitrary webpack config options that we need to merge with any read configs.
-            // To do this, we need to filter out the properties that aren't valid config options and then run webpack merge.
-            // A better long term solution here would be to have an option called webpackConfigOverrides instead of extending the configuration object.
-            const _a = options || {}, { config, outputStats } = _a, restConfig = __rest(_a, ["config", "outputStats"]);
-            webpackConfigs = webpackConfigPromises.map(webpackConfig => webpack_merge_1.merge(webpackConfig, restConfig));
-            return new Promise((resolve, reject) => {
-                wp(webpackConfigs, (err, stats) => __awaiter(this, void 0, void 0, function* () {
-                    if (options && options.onCompile) {
-                        const results = options.onCompile(err, stats);
-                        if (typeof results === 'object' && results.then) {
-                            yield results;
-                        }
-                    }
-                    if (options && options.outputStats) {
-                        const statsFile = options.outputStats === true ? 'stats.json' : options.outputStats;
-                        fs.writeFileSync(statsFile, JSON.stringify(stats.toJson(), null, 2));
+    return async function webpack() {
+        const wp = tryRequire_1.tryRequire('webpack');
+        if (!wp) {
+            just_task_1.logger.warn('webpack is not installed, this task no effect');
+            return;
+        }
+        just_task_1.logger.info(`Running Webpack`);
+        const webpackConfigPath = options && options.config ? just_task_1.resolveCwd(path.join('.', options.config)) : findWebpackConfig_1.findWebpackConfig('webpack.config.js');
+        just_task_1.logger.info(`Webpack Config Path: ${webpackConfigPath}`);
+        if (webpackConfigPath && fs.existsSync(webpackConfigPath) && webpackConfigPath.endsWith('.ts')) {
+            const transpileOnly = options ? options.transpileOnly !== false : true;
+            enableTypeScript_1.enableTypeScript({ transpileOnly });
+        }
+        const configLoader = webpackConfigPath ? require(path.resolve(webpackConfigPath)) : {};
+        let webpackConfigs;
+        // If the loaded webpack config is a function
+        // call it with the original process.argv arguments from build.js.
+        if (typeof configLoader == 'function') {
+            webpackConfigs = configLoader(just_task_1.argv().env, just_task_1.argv());
+        }
+        else {
+            webpackConfigs = configLoader;
+        }
+        if (!Array.isArray(webpackConfigs)) {
+            webpackConfigs = [webpackConfigs];
+        }
+        // Convert everything to promises first to make sure we resolve all promises
+        const webpackConfigPromises = await Promise.all(webpackConfigs.map(webpackConfig => Promise.resolve(webpackConfig)));
+        // We support passing in arbitrary webpack config options that we need to merge with any read configs.
+        // To do this, we need to filter out the properties that aren't valid config options and then run webpack merge.
+        // A better long term solution here would be to have an option called webpackConfigOverrides instead of extending the configuration object.
+        const { config, outputStats, ...restConfig } = options || {};
+        webpackConfigs = webpackConfigPromises.map(webpackConfig => webpack_merge_1.merge(webpackConfig, restConfig));
+        return new Promise((resolve, reject) => {
+            wp(webpackConfigs, async (err, stats) => {
+                if (options && options.onCompile) {
+                    const results = options.onCompile(err, stats);
+                    if (typeof results === 'object' && results.then) {
+                        await results;
                     }
-                    if (err || stats.hasErrors()) {
-                        // Stats may be undefined the the case of an error in Webpack 5
-                        if (stats) {
-                            just_task_1.logger.error(stats.toString({ children: webpackConfigs.map(c => c.stats) }));
-                            reject(`Webpack failed with ${stats.toJson('errors-only').errors.length} error(s).`);
-                        }
-                        else {
-                            just_task_1.logger.error(err.toString());
-                            reject(`Webpack failed with error(s).`);
-                        }
+                }
+                if (options && options.outputStats) {
+                    const statsFile = options.outputStats === true ? 'stats.json' : options.outputStats;
+                    fs.writeFileSync(statsFile, JSON.stringify(stats.toJson(), null, 2));
+                }
+                if (err || stats.hasErrors()) {
+                    // Stats may be undefined the the case of an error in Webpack 5
+                    if (stats) {
+                        just_task_1.logger.error(stats.toString({ children: webpackConfigs.map(c => c.stats) }));
+                        reject(`Webpack failed with ${stats.toJson('errors-only').errors.length} error(s).`);
                     }
                     else {
-                        resolve();
+                        just_task_1.logger.error(err.toString());
+                        reject(`Webpack failed with error(s).`);
                     }
-                }));
+                }
+                else {
+                    resolve();
+                }
             });
         });
     };

package/lib/tasks/webpackTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpackTask.js","sourceRoot":"","sources":["../../src/tasks/webpackTask.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpackTask.js","sourceRoot":"","sources":["../../src/tasks/webpackTask.ts"],"names":[],"mappings":"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"}

package/lib/webpack/overlays/stylesOverlay.js

@@ -42,7 +42,10 @@ function createStyleLoaderRule(cssOptions, preprocessor = null) {
         },
         {
             loader: 'css-loader',
-            options: Object.assign(Object.assign({}, moduleOptions), { importLoaders: preloaders.length }),
+            options: {
+                ...moduleOptions,
+                importLoaders: preloaders.length,
+            },
         },
         ...preloaders,
     ];

package/lib/webpack/overlays/stylesOverlay.js.map

@@ -1 +1 @@
-{"version":3,"file":"stylesOverlay.js","sourceRoot":"","sources":["../../../src/webpack/overlays/stylesOverlay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stylesOverlay.js","sourceRoot":"","sources":["../../../src/webpack/overlays/stylesOverlay.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,iDAA8C;AAE9C,MAAM,OAAO,GAAG,QAAQ,CAAC;AACzB,MAAM,aAAa,GAAG,gBAAgB,CAAC;AACvC,MAAM,QAAQ,GAAG,gBAAgB,CAAC;AAClC,MAAM,cAAc,GAAG,wBAAwB,CAAC;AAChD,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAO1D,SAAS,qBAAqB,CAAC,UAA4B,EAAE,eAAqC,IAAI;IACpG,MAAM,WAAW,GAAG,mBAAO,CAAC,sCAAsC,CAAC,IAAI,mBAAO,CAAC,cAAc,CAAC,CAAC;IAC/F,MAAM,aAAa,GAAG,mBAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG;QACjB,GAAG,CAAC,aAAa;YACf,CAAC,CAAC;gBACE;oBACE,MAAM,EAAE,gBAAgB;oBACxB,OAAO,EAAE;wBACP,OAAO,EAAE;4BACP,OAAO,CAAC,uBAAU,CAAC,cAAc,CAAC,CAAC,CAAC;wBACtC,CAAC;qBACF;iBACF;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACxC,CAAC;IAEF,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc;QAC7C,CAAC,CAAC;YACE,OAAO,EAAE;gBACP,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE,UAAU,CAAC,cAAc;aAC1C;SACF;QACH,CAAC,CAAC;YACE,OAAO,EAAE,UAAU,CAAC,OAAO;SAC5B,CAAC;IAEN,OAAO;QACL;YACE,MAAM,EAAE,WAAW;SACpB;QACD;YACE,MAAM,EAAE,YAAY;YACpB,OAAO,EAAE;gBACP,GAAG,aAAa;gBAChB,aAAa,EAAE,UAAU,CAAC,MAAM;aACjC;SACF;QACD,GAAG,UAAU;KACd,CAAC;AACJ,CAAC;AAEM,MAAM,mBAAmB,GAAG,UAAU,UAA4B,EAAE;IACzE,MAAM,UAAU,GAAG,mBAAO,CAAC,WAAW,CAAC,IAAI,mBAAO,CAAC,aAAa,CAAC,CAAC;IAClE,MAAM,SAAS,GAAG,mBAAO,CAAC,YAAY,CAAC,CAAC;IAExC,OAAO;QACL,MAAM,EAAE;YACN,KAAK,EAAE;gBACL,GAAG,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE;4BACE,IAAI,EAAE,OAAO;4BACb,OAAO,EAAE,CAAC,cAAc,EAAE,aAAa,CAAC;4BACxC,GAAG,EAAE,qBAAqB,CAAC;gCACzB,OAAO,EAAE,KAAK;gCACd,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,gBAAgB;6BAC3D,CAAC;4BACF,WAAW,EAAE,IAAI;yBAClB;wBACD;4BACE,IAAI,EAAE,aAAa;4BACnB,OAAO,EAAE,CAAC,cAAc,CAAC;4BACzB,GAAG,EAAE,qBAAqB,CAAC;gCACzB,OAAO,EAAE,IAAI;gCACb,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,gBAAgB;6BAC3D,CAAC;yBACH;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,UAAU,IAAI,SAAS;oBACzB,CAAC,CAAC;wBACE;4BACE,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;4BACzC,GAAG,EAAE,qBAAqB,CACxB;gCACE,OAAO,EAAE,KAAK;gCACd,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,gBAAgB;6BAC3D,EACD,aAAa,CACd;4BACD,WAAW,EAAE,IAAI;yBAClB;wBACD;4BACE,IAAI,EAAE,cAAc;4BACpB,OAAO,EAAE,CAAC,cAAc,CAAC;4BACzB,GAAG,EAAE,qBAAqB,CACxB;gCACE,OAAO,EAAE,IAAI;gCACb,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,gBAAgB;6BAC3D,EACD,aAAa,CACd;yBACF;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,mBAAmB,uBA0D9B;AAEK,MAAM,aAAa,GAAG,GAA2B,EAAE,CACxD,2BAAmB,CAAC;IAClB,cAAc,EAAE,gBAAgB;CACjC,CAAC,CAAC;AAHQ,QAAA,aAAa,iBAGrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "just-scripts",
-  "version": "1.8.0",
+  "version": "2.0.0",
   "description": "Just Stack Scripts",
   "keywords": [],
   "repository": {
@@ -27,7 +27,7 @@
     "fs-extra": "^8.0.0",
     "glob": "^7.1.3",
     "just-scripts-utils": ">=1.1.5 <2.0.0",
-    "just-task": ">=1.4.2 <2.0.0",
+    "just-task": ">=1.5.0 <2.0.0",
     "prompts": "^2.4.0",
     "run-parallel-limit": "^1.0.6",
     "semver": "^7.0.0",

package/src/copy/CopyInstruction.ts

@@ -13,6 +13,13 @@ export interface CopyInstruction {
    * The path+filename of the destination file.
    */
   destinationFilePath: string;
+
+  /**
+   * Set to true if a copy or merge should be performed, false if a symlink should be created.
+   * If multiple source files are specified (i.e. a merge), this must be true or undefined.
+   * The default value of undefined is equivalent to true for a merge, false in all other cases.
+   */
+  noSymlink?: boolean;
 }
 
 export interface CopyConfig {
@@ -24,10 +31,15 @@ export interface CopyConfig {
  * For example copyFilesToDestinationDirectory(['some/path/foo.js', 'bar.js'], 'dest/target') would result in the creation of
  * files 'dest/target/foo.js' and 'dest/target/bar.js'.
  */
-export function copyFilesToDestinationDirectory(sourceFilePaths: string | string[], destinationDirectory: string): CopyInstruction[] {
+export function copyFilesToDestinationDirectory(
+  sourceFilePaths: string | string[],
+  destinationDirectory: string,
+  noSymlinks?: boolean,
+): CopyInstruction[] {
   return arrayify(sourceFilePaths).map(sourceName => ({
     sourceFilePath: normalize(sourceName),
     destinationFilePath: join(destinationDirectory, basename(sourceName)),
+    noSymlink: noSymlinks,
   }));
 }
 
@@ -40,8 +52,9 @@ export function copyFileToDestinationDirectoryWithRename(
   sourceFilePath: string,
   destinationName: string,
   destinationDirectory: string,
+  noSymlink?: boolean,
 ): CopyInstruction[] {
-  return [{ sourceFilePath, destinationFilePath: join(destinationDirectory, destinationName) }];
+  return [{ sourceFilePath, destinationFilePath: join(destinationDirectory, destinationName), noSymlink }];
 }
 
 /**
@@ -52,10 +65,12 @@ export function copyFileToDestinationDirectoryWithRename(
 export function copyFilesToDestinationDirectoryWithRename(
   instrs: { sourceFilePath: string; destinationName: string }[],
   destinationDirectory: string,
+  noSymlinks?: boolean,
 ): CopyInstruction[] {
   return instrs.map(instr => ({
     sourceFilePath: instr.sourceFilePath,
     destinationFilePath: join(destinationDirectory, instr.destinationName),
+    noSymlink: noSymlinks,
   }));
 }
 
@@ -67,6 +82,7 @@ export function copyFilesInDirectory(
   sourceDirectoryPath: string,
   outputDirectoryPath: string,
   filterFunction?: (file: string) => boolean,
+  noSymlinks?: boolean,
 ): CopyInstruction[] {
   let files = readdirSync(sourceDirectoryPath);
 
@@ -76,6 +92,7 @@ export function copyFilesInDirectory(
   return files.map(file => ({
     sourceFilePath: join(sourceDirectoryPath, file),
     destinationFilePath: join(outputDirectoryPath, file),
+    noSymlink: noSymlinks,
   }));
 }
 

package/src/copy/__tests__/executeCopyInstructions.spec.ts

@@ -1,8 +1,9 @@
+import * as mockfs from 'mock-fs';
 import * as path from 'path';
 import * as fs from 'fs';
-import mockfs = require('mock-fs');
 // import { dirSync, fileSync, DirResult, FileResult } from 'tmp';
 import { executeCopyInstructions } from '../executeCopyInstructions';
+import { CopyInstruction } from '../CopyInstruction';
 
 describe('executeCopyInstructions functional tests', () => {
   const sourceDir = 'sourceDir';
@@ -30,8 +31,8 @@ describe('executeCopyInstructions functional tests', () => {
     mockfs.restore();
   });
 
-  it('executes single source copy instructions', async () => {
-    const copyInstruction = {
+  it('executes single source copy instructions (symlink)', async () => {
+    const copyInstruction: CopyInstruction = {
       sourceFilePath: sourceFilePath1,
       destinationFilePath: destFilePath,
     };
@@ -43,13 +44,15 @@ describe('executeCopyInstructions functional tests', () => {
     });
 
     expect(fs.existsSync(destFilePath)).toBeTruthy();
+    expect(fs.lstatSync(destFilePath).isSymbolicLink()).toBeTruthy();
     expect(fs.readFileSync(destFilePath).toString()).toEqual(sourceFileContents1);
   });
 
-  it('executes single source (arrayified) copy instructions', async () => {
-    const copyInstruction = {
+  it('executes single source (arrayified) copy instructions (copy)', async () => {
+    const copyInstruction: CopyInstruction = {
       sourceFilePath: [sourceFilePath1],
       destinationFilePath: destFilePath,
+      noSymlink: true,
     };
 
     expect(fs.existsSync(destFilePath)).toBeFalsy();
@@ -59,11 +62,12 @@ describe('executeCopyInstructions functional tests', () => {
     });
 
     expect(fs.existsSync(destFilePath)).toBeTruthy();
+    expect(fs.lstatSync(destFilePath).isSymbolicLink()).toBeFalsy();
     expect(fs.readFileSync(destFilePath).toString()).toEqual(sourceFileContents1);
   });
 
   it('merges output', async () => {
-    const copyInstruction = {
+    const copyInstruction: CopyInstruction = {
       sourceFilePath: [sourceFilePath1, sourceFilePath2],
       destinationFilePath: destFilePath,
     };
@@ -77,9 +81,24 @@ describe('executeCopyInstructions functional tests', () => {
     });
 
     expect(fs.existsSync(destFilePath)).toBeTruthy();
+    expect(fs.lstatSync(destFilePath).isSymbolicLink()).toBeFalsy();
     expect(fs.readFileSync(destFilePath).toString()).toEqual(expectedOutput);
   });
 
+  it('fails to validate merge + symlink copy instruction', async () => {
+    const copyInstruction: CopyInstruction = {
+      sourceFilePath: [sourceFilePath1, sourceFilePath2],
+      destinationFilePath: destFilePath,
+      noSymlink: false,
+    };
+
+    const promise = executeCopyInstructions({
+      copyInstructions: [copyInstruction],
+    });
+
+    await expect(promise).rejects.toThrow();
+  });
+
   /**
    * TODO:
    * Rationalize and document expected executeCopyInstructions behavior.

package/src/copy/executeCopyInstructions.ts

@@ -1,5 +1,5 @@
-import { dirname } from 'path';
-import { readFile, writeFile, copy, ensureDir } from 'fs-extra';
+import { dirname, resolve } from 'path';
+import { readFile, writeFile, copy, ensureDir, ensureSymlink } from 'fs-extra';
 import { CopyInstruction, CopyConfig } from './CopyInstruction';
 import { arrayify } from '../arrayUtils/arrayify';
 import { uniqueValues } from '../arrayUtils/uniqueValues';
@@ -9,11 +9,20 @@ import { uniqueValues } from '../arrayUtils/uniqueValues';
  */
 export async function executeCopyInstructions(config: CopyConfig | undefined): Promise<void> {
   if (config && config.copyInstructions) {
+    validateConfig(config.copyInstructions);
     await createDirectories(config.copyInstructions);
     await Promise.all(config.copyInstructions.map(executeSingleCopyInstruction));
   }
 }
 
+function validateConfig(copyInstructions: CopyInstruction[]) {
+  copyInstructions.forEach(instr => {
+    if (instr.noSymlink === false && Array.isArray(instr.sourceFilePath) && instr.sourceFilePath.length > 1) {
+      throw new Error('Multiple source files cannot be specified when making a symlink');
+    }
+  });
+}
+
 function createDirectories(copyInstructions: CopyInstruction[]) {
   return Promise.all(
     uniqueValues(copyInstructions.map(instruction => dirname(instruction.destinationFilePath))).map(dirname => ensureDir(dirname)),
@@ -23,9 +32,13 @@ function createDirectories(copyInstructions: CopyInstruction[]) {
 function executeSingleCopyInstruction(copyInstruction: CopyInstruction) {
   const sourceFileNames = arrayify(copyInstruction.sourceFilePath);
 
-  // source and dest are 1-to-1?  perform binary copy.
+  // source and dest are 1-to-1?  perform binary copy or symlink as desired.
   if (sourceFileNames.length === 1) {
-    return copy(sourceFileNames[0], copyInstruction.destinationFilePath);
+    if (copyInstruction.noSymlink) {
+      return copy(sourceFileNames[0], copyInstruction.destinationFilePath);
+    } else {
+      return ensureSymlink(resolve(sourceFileNames[0]), copyInstruction.destinationFilePath);
+    }
   }
 
   // perform text merge operation.

package/src/tasks/sassTask.ts

@@ -28,14 +28,14 @@ export function sassTask(
   postcssPlugins = postcssPlugins || [];
 
   return function sass(done: (err?: Error) => void) {
-    const nodeSass = tryRequire('node-sass');
+    const sass = tryRequire('sass') || tryRequire('node-sass');
     const postcss = tryRequire('postcss');
     const autoprefixer = tryRequire('autoprefixer');
     const postcssRtl = tryRequire('postcss-rtl');
     const clean = tryRequire('postcss-clean');
 
-    if (!nodeSass || !postcss || !autoprefixer) {
-      logger.warn('One of these [node-sass, postcss, autoprefixer] is not installed, so this task has no effect');
+    if (!sass || !postcss || !autoprefixer) {
+      logger.warn('One or more dependencies (sass or node-sass, postcss, autoprefixer) is not installed, so this task has no effect');
       done();
       return;
     }
@@ -48,7 +48,7 @@ export function sassTask(
         (fileName: string) =>
           function (cb: any) {
             fileName = path.resolve(fileName);
-            nodeSass.render(
+            sass.render(
               {
                 file: fileName,
                 importer: patchSassUrl,