Merge pull request #112 from Dschungelabenteuer/fix-windows-paths

fix(no-uninstalled-addons) Support Windows paths
storybookjs · Jan 10, 2023 · 1397f4f · 1397f4f
2 parents 8b7f603 + 2d8e6b8
commit 1397f4f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/lib/rules/no-uninstalled-addons.ts b/lib/rules/no-uninstalled-addons.ts
@@ -5,7 +5,7 @@
 
 import { readFileSync } from 'fs'
 import dedent from 'ts-dedent'
-import { resolve, relative } from 'path'
+import { resolve, relative, sep } from 'path'
 
 import { createStorybookRule } from '../utils/create-storybook-rule'
 import { CategoryId } from '../utils/constants'
@@ -187,8 +187,8 @@ export = createStorybookRule({
           (elem) => !!result.find((addon) => addon.name === elem.value)
         )
 
-        const rootDir = process.cwd().split('/').pop()
-        const packageJsonPath = `${rootDir}/${relative(process.cwd(), packageJsonLocation)}`
+        const rootDir = process.cwd().split(sep).pop()
+        const packageJsonPath = `${rootDir}${sep}${relative(process.cwd(), packageJsonLocation)}`
 
         elemsWithErrors.forEach((elem) => {
           context.report({

diff --git a/tests/lib/rules/no-uninstalled-addons.test.ts b/tests/lib/rules/no-uninstalled-addons.test.ts
@@ -11,6 +11,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/utils'
 
 import rule from '../../../lib/rules/no-uninstalled-addons'
 import ruleTester from '../../utils/rule-tester'
+import { sep } from 'path';
 
 jest.mock('fs', () => ({
   ...jest.requireActual('fs'),
@@ -137,7 +138,7 @@ ruleTester.run('no-uninstalled-addons', rule, {
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: '@storybook/not-installed-addon',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
       ],
@@ -161,7 +162,7 @@ ruleTester.run('no-uninstalled-addons', rule, {
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: '@storybook/not-installed-addon',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
       ],
@@ -184,7 +185,7 @@ ruleTester.run('no-uninstalled-addons', rule, {
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: '@storybook/addon-esentials',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
       ],
@@ -205,7 +206,7 @@ ruleTester.run('no-uninstalled-addons', rule, {
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: '@storybook/adon-essentials',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
       ],
@@ -228,15 +229,15 @@ ruleTester.run('no-uninstalled-addons', rule, {
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: 'addon-withut-the-prefix',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
         {
           messageId: 'addonIsNotInstalled', // comes from the rule file
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: '@storybook/addon-esentials',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
       ],
@@ -259,15 +260,15 @@ ruleTester.run('no-uninstalled-addons', rule, {
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: 'addon-withut-the-prefix',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
         {
           messageId: 'addonIsNotInstalled', // comes from the rule file
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: '@storybook/addon-esentials',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
       ],
@@ -289,15 +290,15 @@ ruleTester.run('no-uninstalled-addons', rule, {
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: 'addon-withut-the-prefix',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
         {
           messageId: 'addonIsNotInstalled', // comes from the rule file
           type: AST_NODE_TYPES.Literal,
           data: {
             addonName: '@storybook/addon-esentials',
-            packageJsonPath: 'eslint-plugin-storybook/',
+            packageJsonPath: `eslint-plugin-storybook${sep}`,
           },
         },
       ],