just-task 1.4.2 → 1.5.0

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "just-task",
   "entries": [
     {
-      "date": "Fri, 10 Sep 2021 23:58:37 GMT",
+      "date": "Thu, 31 Mar 2022 17:04:25 GMT",
+      "tag": "just-task_v1.5.0",
+      "version": "1.5.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "just-task",
+            "comment": "Upgrading package-deps-hash to latest major to remove transitive security vulnerability in validator package.",
+            "commit": "0c2e911432d9c09a7b3396d40c811260d84749ac"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 10 Sep 2021 23:58:46 GMT",
       "tag": "just-task_v1.4.2",
       "version": "1.4.2",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - just-task
 
-This log was last generated on Fri, 10 Sep 2021 23:58:37 GMT and should not be manually modified.
+This log was last generated on Thu, 31 Mar 2022 17:04:25 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.5.0
+
+Thu, 31 Mar 2022 17:04:25 GMT
+
+### Minor changes
+
+- Upgrading package-deps-hash to latest major to remove transitive security vulnerability in validator package. (dzearing@microsoft.com)
+
 ## 1.4.2
 
-Fri, 10 Sep 2021 23:58:37 GMT
+Fri, 10 Sep 2021 23:58:46 GMT
 
 ### Patches
 

package/README.md

@@ -5,9 +5,8 @@
 
 `Just` is a library that organizes build tasks for your JS projects. It consists of
 
-- a build task build definition library
+- a build task definition library
 - sane preset build flows for node and browser projects featuring TypeScript, Webpack and jest
-- project scaffold tool that generates no-ejection needed repos that tracks template changes
 
 # Documentation
 
@@ -41,11 +40,9 @@ yarn test
 
 | Package            | Description                                                                             |
 | ------------------ | --------------------------------------------------------------------------------------- |
-| create-just        | Invoked by `npm init just`, a tool that scaffolds project repos                         |
 | just-task          | The task definition library that wraps `undertaker` and `yargs` libraries               |
 | just-scripts       | A reusable preset of frequently used tasks in node and browser projects                 |
-| just-stack-\*      | A set of templates to be used by the scaffold tool `create-just`                        |
-| just-scripts-utils | A set of utilities that are shared between `just-scripts` and `create-just`             |
+| just-scripts-utils | A set of utilities for `just-scripts`                                                   |
 | just-task-logger   | A shared pretty logger used to display timestamps along with a message                  |
 | documentation      | The Docusaurus site content and styles which generates the Github page for this library |
 

package/lib/cache.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.saveCache = exports.isCached = exports.clearCache = exports.registerCachedTask = void 0;
 const package_deps_hash_1 = require("@rushstack/package-deps-hash");
@@ -107,11 +96,12 @@ function getLockFileHashes() {
 }
 function getHash(taskName) {
     just_task_logger_1.mark('cache:getHash');
-    const args = __rest(option_1.argv(), []);
+    const { ...args } = option_1.argv();
     const packageRootPath = getPackageRootPath();
-    const packageDeps = package_deps_hash_1.getPackageDeps(packageRootPath);
-    const lockFileHashes = getLockFileHashes();
-    packageDeps.files = Object.assign(Object.assign({}, packageDeps.files), lockFileHashes);
+    const packageDeps = {
+        ...Object.fromEntries(package_deps_hash_1.getPackageDeps(packageRootPath)),
+        ...getLockFileHashes()
+    };
     const hash = {
         args,
         taskName,

package/lib/resolve.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.resolveCwd = exports.resolve = exports._getResolvePaths = exports._tryResolve = exports._isFileNameLike = exports.resetResolvePaths = exports.addResolvePath = void 0;
 const resolve_1 = require("resolve");
@@ -45,9 +34,9 @@ exports._isFileNameLike = _isFileNameLike;
  */
 function _tryResolve(moduleName, options) {
     try {
-        const { cwd } = options, rest = __rest(options, ["cwd"]);
+        const { cwd, ...rest } = options;
         const nameToResolve = _isFileNameLike(moduleName) ? `./${moduleName}` : moduleName;
-        return resolve_1.sync(nameToResolve, Object.assign(Object.assign({ basedir: cwd }, rest), { preserveSymlinks: true }));
+        return resolve_1.sync(nameToResolve, { basedir: cwd, ...rest, preserveSymlinks: true });
     }
     catch (e) {
         return null;
@@ -78,7 +67,7 @@ function resolve(moduleName, cwdOrOptions) {
     const allResolvePaths = _getResolvePaths(options.cwd);
     let resolved = null;
     for (const tryPath of allResolvePaths) {
-        resolved = _tryResolve(moduleName, Object.assign(Object.assign({}, options), { cwd: tryPath }));
+        resolved = _tryResolve(moduleName, { ...options, cwd: tryPath });
         if (resolved) {
             return resolved;
         }

package/lib/watch.js

@@ -11,9 +11,9 @@ function watch(globs, optionsOrListener, listener) {
     else {
         options = optionsOrListener;
     }
-    options = Object.assign(Object.assign({}, options), { ignoreInitial: true });
+    options = { ...options, ignoreInitial: true };
     // Wrapping this function teaches the glob-watcher about how to deal with sync taskFunction
-    const innerListener = listener;
+    const innerListener = listener; // eslint-disable-line
     const watcher = chokidar.watch(globs, options);
     for (const evt of ['add', 'change', 'unlink']) {
         watcher.on(evt, innerListener);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "just-task",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "Build task definition library",
   "keywords": [],
   "repository": {
@@ -20,7 +20,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@rushstack/package-deps-hash": "^2.4.109",
+    "@rushstack/package-deps-hash": "^3.2.5",
     "bach": "^1.2.0",
     "chalk": "^4.0.0",
     "fs-extra": "^8.0.0",

package/src/cache.ts

@@ -1,4 +1,4 @@
-import { getPackageDeps, IPackageDeps } from '@rushstack/package-deps-hash';
+import { getPackageDeps } from '@rushstack/package-deps-hash';
 import { argv } from './option';
 import { resolveCwd } from './resolve';
 import * as fs from 'fs-extra';
@@ -83,7 +83,7 @@ function getCachePath() {
 interface CacheHash {
   args: { [arg: string]: string };
   taskName: string;
-  hash: IPackageDeps;
+  hash: Record<string, string>;
   dependentHashTimestamps: { [pkgName: string]: number };
 }
 
@@ -127,11 +127,10 @@ function getHash(taskName: string): CacheHash | null {
 
   const packageRootPath = getPackageRootPath();
 
-  const packageDeps = getPackageDeps(packageRootPath);
-
-  const lockFileHashes = getLockFileHashes();
-
-  packageDeps.files = { ...packageDeps.files, ...lockFileHashes };
+  const packageDeps = {
+    ...Object.fromEntries(getPackageDeps(packageRootPath)),
+    ...getLockFileHashes()
+  };
 
   const hash = {
     args,

package/src/watch.ts

@@ -21,7 +21,7 @@ export function watch(
   options = { ...options, ignoreInitial: true };
 
   // Wrapping this function teaches the glob-watcher about how to deal with sync taskFunction
-  const innerListener = listener!;
+  const innerListener = listener!; // eslint-disable-line
   const watcher = chokidar.watch(globs, options) as FSWatcher;
   for (const evt of ['add', 'change', 'unlink']) {
     watcher.on(evt, innerListener);