@grafana/react-detect 0.2.1 → 0.3.0-canary.2395.21023152965.0

package/dist/commands/detect19.js

@@ -5,25 +5,34 @@ import { jsonReporter } from '../reporters/json.js';
 import { consoleReporter } from '../reporters/console.js';
 import { extractAllSources } from '../source-extractor.js';
 import { analyzeSourceFiles } from '../analyzer.js';
+import { output } from '../utils/output.js';
 
 async function detect19(argv) {
-  const pluginRoot = argv.pluginRoot || process.cwd();
-  const allMatches = await getAllMatches(pluginRoot);
-  const depContext = new DependencyContext();
-  await depContext.loadDependencies(pluginRoot);
-  const matchesWithRootDependency = allMatches.map((match) => {
-    if (match.type === "dependency" && match.packageName) {
-      return { ...match, rootDependency: depContext.findRootDependency(match.packageName) };
+  try {
+    const pluginRoot = argv.pluginRoot || process.cwd();
+    const allMatches = await getAllMatches(pluginRoot);
+    const depContext = new DependencyContext();
+    await depContext.loadDependencies(pluginRoot);
+    const matchesWithRootDependency = allMatches.map((match) => {
+      if (match.type === "dependency" && match.packageName) {
+        return { ...match, rootDependency: depContext.findRootDependency(match.packageName) };
+      }
+      return match;
+    });
+    const results = generateAnalysisResults(matchesWithRootDependency, pluginRoot, depContext);
+    if (argv.json) {
+      jsonReporter(results);
+    } else {
+      consoleReporter(results);
     }
-    return match;
-  });
-  const results = generateAnalysisResults(matchesWithRootDependency, pluginRoot, depContext);
-  if (argv.json) {
-    jsonReporter(results);
-  } else {
-    consoleReporter(results);
+    process.exit(results.summary.totalIssues > 0 ? 1 : 0);
+  } catch (error) {
+    output.error({
+      title: "Error during detection",
+      body: [error.message]
+    });
+    process.exit(1);
   }
-  process.exit(results.summary.totalIssues > 0 ? 1 : 0);
 }
 async function getAllMatches(pluginRoot) {
   const sourcemapPaths = await findSourceMapFiles(pluginRoot);

package/dist/utils/analyzer.js

@@ -37,7 +37,7 @@ function analyzeComponentType(ast) {
 function hasReactComponent(ast) {
   let found = false;
   walk(ast, (node) => {
-    if (node.type === "ClassDeclaration" && node.superClass?.type === "MemberExpression" && node.superClass.object.type === "Identifier" && node.superClass.object.name === "React" && node.superClass.property.type === "Identifier" && (node.superClass.property.name === "Component" || node.superClass.property.name === "PureComponent")) {
+    if (node && node.type === "ClassDeclaration" && node.superClass?.type === "MemberExpression" && node.superClass.object.type === "Identifier" && node.superClass.object.name === "React" && node.superClass.property.type === "Identifier" && (node.superClass.property.name === "Component" || node.superClass.property.name === "PureComponent")) {
       found = true;
     }
   });
@@ -51,7 +51,7 @@ function hasFunctionComponentPattern(ast) {
   }
   let found = false;
   walk(ast, (node) => {
-    if (node.type === "FunctionDeclaration" || node.type === "ArrowFunctionExpression") {
+    if (node && (node.type === "FunctionDeclaration" || node.type === "ArrowFunctionExpression")) {
       found = true;
     }
   });
@@ -60,7 +60,7 @@ function hasFunctionComponentPattern(ast) {
 function hasReactImport(ast) {
   let found = false;
   walk(ast, (node) => {
-    if (node.type === "ImportDeclaration" && node.source.type === "Literal" && (node.source.value === "react" || node.source.value === "react-dom")) {
+    if (node && node.type === "ImportDeclaration" && node.source.type === "Literal" && (node.source.value === "react" || node.source.value === "react-dom")) {
       found = true;
     }
   });
@@ -69,7 +69,7 @@ function hasReactImport(ast) {
 function hasJSX(ast) {
   let found = false;
   walk(ast, (node) => {
-    if (node.type === "JSXElement" || node.type === "JSXFragment") {
+    if (node && (node.type === "JSXElement" || node.type === "JSXFragment")) {
       found = true;
     }
   });
@@ -78,7 +78,7 @@ function hasJSX(ast) {
 function hasHooks(ast) {
   let found = false;
   walk(ast, (node) => {
-    if (node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name.startsWith("use")) {
+    if (node && node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name.startsWith("use")) {
       found = true;
     }
   });

package/dist/utils/dependencies.js

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { parsePnpmProject, parseNpmLockV2Project, parseYarnLockV2Project } from 'snyk-nodejs-lockfile-parser';
+import { parsePnpmProject, parseNpmLockV2Project, parseYarnLockV1Project, parseYarnLockV2Project } from 'snyk-nodejs-lockfile-parser';
 import { readFileSync, existsSync } from 'node:fs';
 import { readJsonFile } from './plugin.js';
 
@@ -34,12 +34,22 @@ class DependencyContext {
           pruneCycles: false
         });
       } else if (lockfile === "yarn.lock") {
-        this.depGraph = await parseYarnLockV2Project(pkgJsonContentString, lockfileContent, {
-          includeDevDeps: true,
-          includeOptionalDeps: true,
-          strictOutOfSync: false,
-          pruneWithinTopLevelDeps: true
-        });
+        if (/#\s*yarn lockfile v1/i.test(lockfileContent)) {
+          this.depGraph = await parseYarnLockV1Project(pkgJsonContentString, lockfileContent, {
+            includeDevDeps: true,
+            includeOptionalDeps: true,
+            includePeerDeps: true,
+            strictOutOfSync: false,
+            pruneLevel: "withinTopLevelDeps"
+          });
+        } else {
+          this.depGraph = await parseYarnLockV2Project(pkgJsonContentString, lockfileContent, {
+            includeDevDeps: true,
+            includeOptionalDeps: true,
+            strictOutOfSync: false,
+            pruneWithinTopLevelDeps: true
+          });
+        }
       }
       if (pkgJsonContent.dependencies) {
         Object.entries(pkgJsonContent.dependencies).forEach(([name, version]) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@grafana/react-detect",
   "description": "Run various checks to detect if a Grafana plugin is compatible with React.",
-  "version": "0.2.1",
+  "version": "0.3.0-canary.2395.21023152965.0",
   "repository": {
     "directory": "packages/react-detect",
     "url": "https://github.com/grafana/plugin-tools"
@@ -40,5 +40,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "31a4b153d8fa990eece9a5a58d6e29df5d801428"
+  "gitHead": "2d906bece6457dd89becbc6c62a78ccfbdedd8f7"
 }

package/src/commands/detect19.ts

@@ -6,32 +6,41 @@ import { jsonReporter } from '../reporters/json.js';
 import { consoleReporter } from '../reporters/console.js';
 import { extractAllSources } from '../source-extractor.js';
 import { analyzeSourceFiles } from '../analyzer.js';
+import { output } from '../utils/output.js';
 /**
  * Main detect command for finding React 19 breaking changes
  */
 export async function detect19(argv: minimist.ParsedArgs) {
-  const pluginRoot = argv.pluginRoot || process.cwd();
-
-  const allMatches = await getAllMatches(pluginRoot);
-  const depContext = new DependencyContext();
-  await depContext.loadDependencies(pluginRoot);
-
-  const matchesWithRootDependency = allMatches.map((match) => {
-    if (match.type === 'dependency' && match.packageName) {
-      return { ...match, rootDependency: depContext.findRootDependency(match.packageName) };
+  try {
+    const pluginRoot = argv.pluginRoot || process.cwd();
+
+    const allMatches = await getAllMatches(pluginRoot);
+    const depContext = new DependencyContext();
+    await depContext.loadDependencies(pluginRoot);
+
+    const matchesWithRootDependency = allMatches.map((match) => {
+      if (match.type === 'dependency' && match.packageName) {
+        return { ...match, rootDependency: depContext.findRootDependency(match.packageName) };
+      }
+      return match;
+    });
+
+    const results = generateAnalysisResults(matchesWithRootDependency, pluginRoot, depContext);
+
+    if (argv.json) {
+      jsonReporter(results);
+    } else {
+      consoleReporter(results);
     }
-    return match;
-  });
 
-  const results = generateAnalysisResults(matchesWithRootDependency, pluginRoot, depContext);
-
-  if (argv.json) {
-    jsonReporter(results);
-  } else {
-    consoleReporter(results);
+    process.exit(results.summary.totalIssues > 0 ? 1 : 0);
+  } catch (error) {
+    output.error({
+      title: 'Error during detection',
+      body: [(error as Error).message],
+    });
+    process.exit(1);
   }
-
-  process.exit(results.summary.totalIssues > 0 ? 1 : 0);
 }
 
 async function getAllMatches(pluginRoot: string) {

package/src/utils/analyzer.ts

@@ -47,6 +47,7 @@ export function hasReactComponent(ast: TSESTree.Program): boolean {
 
   walk(ast, (node) => {
     if (
+      node &&
       node.type === 'ClassDeclaration' &&
       node.superClass?.type === 'MemberExpression' &&
       node.superClass.object.type === 'Identifier' &&
@@ -71,7 +72,7 @@ export function hasFunctionComponentPattern(ast: TSESTree.Program): boolean {
 
   let found = false;
   walk(ast, (node) => {
-    if (node.type === 'FunctionDeclaration' || node.type === 'ArrowFunctionExpression') {
+    if (node && (node.type === 'FunctionDeclaration' || node.type === 'ArrowFunctionExpression')) {
       found = true;
     }
   });
@@ -84,6 +85,7 @@ function hasReactImport(ast: TSESTree.Program): boolean {
 
   walk(ast, (node) => {
     if (
+      node &&
       node.type === 'ImportDeclaration' &&
       node.source.type === 'Literal' &&
       (node.source.value === 'react' || node.source.value === 'react-dom')
@@ -99,7 +101,7 @@ function hasJSX(ast: TSESTree.Program): boolean {
   let found = false;
 
   walk(ast, (node) => {
-    if (node.type === 'JSXElement' || node.type === 'JSXFragment') {
+    if (node && (node.type === 'JSXElement' || node.type === 'JSXFragment')) {
       found = true;
     }
   });
@@ -111,7 +113,12 @@ function hasHooks(ast: TSESTree.Program): boolean {
   let found = false;
 
   walk(ast, (node) => {
-    if (node.type === 'CallExpression' && node.callee.type === 'Identifier' && node.callee.name.startsWith('use')) {
+    if (
+      node &&
+      node.type === 'CallExpression' &&
+      node.callee.type === 'Identifier' &&
+      node.callee.name.startsWith('use')
+    ) {
       found = true;
     }
   });

package/src/utils/dependencies.ts

@@ -1,5 +1,10 @@
 import { join } from 'node:path';
-import { parsePnpmProject, parseNpmLockV2Project, parseYarnLockV2Project } from 'snyk-nodejs-lockfile-parser';
+import {
+  parsePnpmProject,
+  parseNpmLockV2Project,
+  parseYarnLockV1Project,
+  parseYarnLockV2Project,
+} from 'snyk-nodejs-lockfile-parser';
 import type { DepGraph } from '@snyk/dep-graph';
 import { existsSync, readFileSync } from 'node:fs';
 import { readJsonFile } from './plugin.js';
@@ -32,12 +37,22 @@ export class DependencyContext {
           pruneCycles: false,
         });
       } else if (lockfile === 'yarn.lock') {
-        this.depGraph = await parseYarnLockV2Project(pkgJsonContentString, lockfileContent, {
-          includeDevDeps: true,
-          includeOptionalDeps: true,
-          strictOutOfSync: false,
-          pruneWithinTopLevelDeps: true,
-        });
+        if (/#\s*yarn lockfile v1/i.test(lockfileContent)) {
+          this.depGraph = await parseYarnLockV1Project(pkgJsonContentString, lockfileContent, {
+            includeDevDeps: true,
+            includeOptionalDeps: true,
+            includePeerDeps: true,
+            strictOutOfSync: false,
+            pruneLevel: 'withinTopLevelDeps',
+          });
+        } else {
+          this.depGraph = await parseYarnLockV2Project(pkgJsonContentString, lockfileContent, {
+            includeDevDeps: true,
+            includeOptionalDeps: true,
+            strictOutOfSync: false,
+            pruneWithinTopLevelDeps: true,
+          });
+        }
       }
 
       if (pkgJsonContent.dependencies) {