From 2d8e6b84d691a210aad289b0d19e1af9aac958be Mon Sep 17 00:00:00 2001 From: Charles GRUENAIS Date: Wed, 28 Dec 2022 20:00:24 +0100 Subject: [PATCH] Fixed windows paths --- lib/rules/no-uninstalled-addons.ts | 6 +++--- tests/lib/rules/no-uninstalled-addons.test.ts | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/rules/no-uninstalled-addons.ts b/lib/rules/no-uninstalled-addons.ts index 033dcbc..79f406b 100644 --- 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 index 5e2c26b..c9bea0a 100644 --- 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,7 +229,7 @@ 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}`, }, }, { @@ -236,7 +237,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}`, }, }, ], @@ -259,7 +260,7 @@ 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}`, }, }, { @@ -267,7 +268,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}`, }, }, ], @@ -289,7 +290,7 @@ 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}`, }, }, { @@ -297,7 +298,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}`, }, }, ],