snyk 1.749.0 → 1.750.0

package/dist/cli/784.index.js

@@ -3286,7 +3286,7 @@ exports.parse = parse;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getWorkspacesMap = exports.processYarnWorkspaces = void 0;
+exports.packageJsonBelongsToWorkspace = exports.getWorkspacesMap = exports.processYarnWorkspaces = void 0;
 const baseDebug = __webpack_require__(15158);
 const pathUtil = __webpack_require__(85622);
 // import * as _ from 'lodash';
@@ -3295,24 +3295,11 @@ const groupBy = __webpack_require__(20276);
 const micromatch = __webpack_require__(70850);
 const debug = baseDebug('snyk-yarn-workspaces');
 const lockFileParser = __webpack_require__(423);
-const path = __webpack_require__(85622);
 const errors_1 = __webpack_require__(55191);
 const get_file_contents_1 = __webpack_require__(84210);
 async function processYarnWorkspaces(root, settings, targetFiles) {
-    // the order of folders is important
+    // the order of yarnTargetFiles folders is important
     // must have the root level most folders at the top
-    // const yarnTargetFiles: {
-    //   [dir: string]: Array<{
-    //     path: string;
-    //     base: string;
-    //     dir: string;
-    //   }>;
-    // } = targetFiles
-    //   .map((p) => ({ path: p, ...pathUtil.parse(p) }))
-    //   .filter((res) => ['package.json'].includes(res.base))
-    //   .sortBy('dir')
-    //   .groupBy('dir')
-    //   .value();
     const mappedAndFiltered = targetFiles
         .map((p) => ({ path: p, ...pathUtil.parse(p) }))
         .filter((res) => ['package.json'].includes(res.base));
@@ -3359,9 +3346,9 @@ async function processYarnWorkspaces(root, settings, targetFiles) {
         }
         if (isYarnWorkspacePackage || isRootPackageJson) {
             const rootDir = isYarnWorkspacePackage
-                ? path.dirname(yarnWorkspacesFilesMap[packageJsonFileName].root)
-                : path.dirname(packageJsonFileName);
-            const rootYarnLockfileName = path.join(rootDir, 'yarn.lock');
+                ? pathUtil.dirname(yarnWorkspacesFilesMap[packageJsonFileName].root)
+                : pathUtil.dirname(packageJsonFileName);
+            const rootYarnLockfileName = pathUtil.join(rootDir, 'yarn.lock');
             const yarnLock = await get_file_contents_1.getFileContents(root, rootYarnLockfileName);
             if (rootWorkspaceManifestContent.hasOwnProperty('resolutions') &&
                 lockFileParser.getYarnLockfileType(yarnLock.content) ===
@@ -3375,7 +3362,7 @@ async function processYarnWorkspaces(root, settings, targetFiles) {
             const res = await lockFileParser.buildDepTree(packageJson.content, yarnLock.content, settings.dev, lockFileParser.LockfileType.yarn, settings.strictOutOfSync !== false);
             const project = {
                 packageManager: 'yarn',
-                targetFile: path.relative(root, packageJson.fileName),
+                targetFile: pathUtil.relative(root, packageJson.fileName),
                 depTree: res,
                 plugin: {
                     name: 'snyk-nodejs-lockfile-parser',
@@ -3414,12 +3401,12 @@ function getWorkspacesMap(file) {
 }
 exports.getWorkspacesMap = getWorkspacesMap;
 function packageJsonBelongsToWorkspace(packageJsonFileName, yarnWorkspacesMap, workspaceRoot) {
-    const workspaceRootFolder = path.dirname(workspaceRoot);
-    const workspacesGlobs = (yarnWorkspacesMap[workspaceRoot].workspaces || []).map((p) => path.join(workspaceRootFolder, p));
-    const filePath = path.normalize(packageJsonFileName);
-    const match = micromatch.isMatch(filePath, workspacesGlobs.map((p) => (p.endsWith('/**') ? p : p + '/**')));
+    const workspaceRootFolder = pathUtil.dirname(workspaceRoot.replace(/\\/g, '/'));
+    const workspacesGlobs = (yarnWorkspacesMap[workspaceRoot].workspaces || []).map((workspace) => pathUtil.join(workspaceRootFolder, workspace));
+    const match = micromatch.isMatch(packageJsonFileName.replace(/\\/g, '/'), workspacesGlobs.map((p) => pathUtil.normalize(pathUtil.join(p, '**')).replace(/\\/g, '/')));
     return match;
 }
+exports.packageJsonBelongsToWorkspace = packageJsonBelongsToWorkspace;
 
 
 /***/ }),