Release: Prerelease 10.0.0-beta.3 #32473
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,9 +19,10 @@ import { experimental_loadStorybook } from 'storybook/internal/core-server'; | |
| import { readConfig, writeConfig } from 'storybook/internal/csf-tools'; | ||
| import { logger } from 'storybook/internal/node-logger'; | ||
|
|
||
| import * as find from 'empathic/find'; | ||
| import * as pkg from 'empathic/package'; | ||
| // eslint-disable-next-line depend/ban-dependencies | ||
| import { execa } from 'execa'; | ||
| import { dirname, relative, resolve } from 'pathe'; | ||
| import prompts from 'prompts'; | ||
| import { coerce, satisfies } from 'semver'; | ||
|
|
@@ -60,10 +61,10 @@ const logErrors = (...args: Parameters<typeof printError>) => { | |
| printError(...args); | ||
| }; | ||
|
|
||
| const findFile = (basename: string, extensions = EXTENSIONS) => | ||
| find.any( | ||
| extensions.map((ext) => basename + ext), | ||
| { last: getProjectRoot() } | ||
| ); | ||
|
|
||
| export default async function postInstall(options: PostinstallOptions) { | ||
|
|
@@ -320,7 +321,7 @@ export default async function postInstall(options: PostinstallOptions) { | |
| } | ||
|
|
||
| const fileExtension = | ||
| allDeps.typescript || findFile('tsconfig', [...EXTENSIONS, '.json']) ? 'ts' : 'js'; | ||
|
|
||
| const vitestSetupFile = resolve(options.configDir, `vitest.setup.${fileExtension}`); | ||
| if (existsSync(vitestSetupFile)) { | ||
|
|
@@ -367,11 +368,11 @@ export default async function postInstall(options: PostinstallOptions) { | |
| ); | ||
|
|
||
| const vitestWorkspaceFile = | ||
| findFile('vitest.workspace', ['.ts', '.js', '.json']) || | ||
| findFile('vitest.projects', ['.ts', '.js', '.json']); | ||
| const viteConfigFile = findFile('vite.config'); | ||
| const vitestConfigFile = findFile('vitest.config'); | ||
| const vitestShimFile = findFile('vitest.shims.d'); | ||
| const rootConfig = vitestConfigFile || viteConfigFile; | ||
|
|
||
| const browserConfig = `{ | ||
|
|
@@ -576,10 +577,7 @@ async function getPackageNameFromPath(input: string): Promise<string> { | |
| return path; | ||
| } | ||
|
|
||
| const packageJsonPath = pkg.up({ cwd: path }); | ||
| if (!packageJsonPath) { | ||
| throw new Error(`Could not find package.json in path: ${path}`); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,10 +52,9 @@ | |
| "ts-dedent": "^2.0.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/node": "^22.0.0", | ||
| "empathic": "^2.0.0", | ||
| "es-module-lexer": "^1.5.0", | ||
| "glob": "^10.0.0", | ||
| "knitwork": "^1.1.0", | ||
| "magic-string": "^0.30.0", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,8 @@ import { existsSync } from 'node:fs'; | |
| import { mkdir, writeFile } from 'node:fs/promises'; | ||
| import { dirname, join } from 'node:path'; | ||
|
|
||
| import * as pkg from 'empathic/package'; | ||
| import { init, parse } from 'es-module-lexer'; | ||
| import MagicString from 'magic-string'; | ||
| import type { Alias, Plugin } from 'vite'; | ||
|
|
||
|
|
@@ -52,10 +52,7 @@ export async function externalGlobalsPlugin(externals: Record<string, string>): | |
| } | ||
| const newAlias = mergeAlias([], config.resolve?.alias) as Alias[]; | ||
|
|
||
| const cachePath = pkg.cache('sb-vite-plugin-externals', { create: true })!; | ||
| await Promise.all( | ||
| (Object.keys(externals) as Array<keyof typeof externals>).map(async (externalKey) => { | ||
| const externalCachePath = join(cachePath, `${externalKey}.js`); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -271,7 +271,6 @@ | |
| "@types/detect-port": "^1.3.0", | ||
| "@types/diff": "^5.0.9", | ||
| "@types/ejs": "^3.1.1", | ||
| "@types/js-yaml": "^4.0.5", | ||
| "@types/node": "^22.0.0", | ||
| "@types/npmlog": "^7.0.0", | ||
|
|
@@ -305,14 +304,12 @@ | |
| "diff": "^5.2.0", | ||
| "downshift": "^9.0.4", | ||
| "ejs": "^3.1.10", | ||
| "empathic": "^2.0.0", | ||
| "es-toolkit": "^1.36.0", | ||
| "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0", | ||
| "execa": "^8.0.1", | ||
| "exsolve": "^1.0.7", | ||
| "fetch-retry": "^6.0.0", | ||
| "flush-promises": "^1.0.2", | ||
| "fuse.js": "^3.6.1", | ||
| "get-npm-tarball-url": "^2.0.3", | ||
|
|
@@ -348,7 +345,6 @@ | |
| "react-textarea-autosize": "^8.3.0", | ||
| "react-transition-group": "^4.4.5", | ||
| "require-from-string": "^2.0.2", | ||
| "resolve.exports": "^2.0.3", | ||
| "sirv": "^2.0.4", | ||
| "slash": "^5.0.0", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ vi.mock(import('fs'), async (importOriginal) => { | |
| }); | ||
|
|
||
| vi.mock('storybook/internal/node-logger'); | ||
| vi.mock('empathic/find'); | ||
|
|
||
| const MOCK_FRAMEWORK_FILES: { | ||
| name: string; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ import type { JsPackageManager, PackageJsonWithMaybeDeps } from 'storybook/inter | |
| import { HandledError, commandLog, getProjectRoot } from 'storybook/internal/common'; | ||
| import { logger } from 'storybook/internal/node-logger'; | ||
|
|
||
| import * as find from 'empathic/find'; | ||
| import prompts from 'prompts'; | ||
| import semver from 'semver'; | ||
|
|
||
|
|
@@ -112,8 +112,8 @@ export function detectFrameworkPreset( | |
| * @returns CoreBuilder | ||
| */ | ||
| export async function detectBuilder(packageManager: JsPackageManager, projectType: ProjectType) { | ||
| const viteConfig = find.any(viteConfigFiles, { last: getProjectRoot() }); | ||
| const webpackConfig = find.any(webpackConfigFiles, { last: getProjectRoot() }); | ||
| const dependencies = packageManager.getAllDependencies(); | ||
|
|
||
| if (viteConfig || (dependencies.vite && dependencies.webpack === undefined)) { | ||
|
|
@@ -171,7 +171,7 @@ export function isStorybookInstantiated(configDir = resolve(process.cwd(), '.sto | |
| } | ||
|
|
||
| export async function detectPnp() { | ||
| return !!find.any(['.pnp.js', '.pnp.cjs']); | ||
| } | ||
|
|
||
| export async function detectLanguage(packageManager: JsPackageManager) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ import { readFile, writeFile } from 'node:fs/promises'; | |
|
|
||
| import { beforeEach, describe, expect, it, vi } from 'vitest'; | ||
|
|
||
| import * as find from 'empathic/find'; | ||
| import { dedent } from 'ts-dedent'; | ||
|
|
||
| import type { PackageJsonWithDepsAndDevDeps } from '../common'; | ||
|
|
@@ -14,8 +14,8 @@ import { | |
| normalizeExtends, | ||
| } from './eslintPlugin'; | ||
|
|
||
| vi.mock('empathic/find', () => ({ | ||
| up: vi.fn(), | ||
| })); | ||
|
|
||
| vi.mock(import('node:fs/promises'), async (importOriginal) => { | ||
|
|
@@ -38,32 +38,32 @@ describe('extractEslintInfo', () => { | |
| } satisfies Partial<JsPackageManager>; | ||
|
|
||
| beforeEach(() => { | ||
| vi.mocked(find).up.mockClear(); | ||
| mockPackageManager.getAllDependencies.mockClear(); | ||
| }); | ||
|
|
||
| it('should find ESLint config file with supported extension', async () => { | ||
| vi.mocked(find).up.mockImplementation((fileName) => { | ||
| return String(fileName) === '.eslintrc.js' ? String(fileName) : undefined; | ||
| }); | ||
|
|
||
| const result = findEslintFile(process.cwd()); | ||
| expect(result).toBe('.eslintrc.js'); | ||
| }); | ||
|
|
||
| it('should return undefined if no ESLint config file is found', async () => { | ||
| vi.mocked(find).up.mockImplementation(() => undefined); | ||
|
|
||
| const result = findEslintFile(process.cwd()); | ||
| expect(result).toBeUndefined(); | ||
| }); | ||
|
|
||
| it('should throw error for unsupported ESLint config file extensions', async () => { | ||
| vi.mocked(find).up.mockImplementation(() => { | ||
| return '.eslintrc.yaml'; | ||
| }); | ||
|
|
||
| expect(() => findEslintFile(process.cwd())).toThrowError( | ||
| 'Unsupported ESLint config extension: .yaml' | ||
| ); | ||
| }); | ||
|
|
@@ -72,7 +72,7 @@ describe('extractEslintInfo', () => { | |
| mockPackageManager.getAllDependencies.mockReturnValue({}); | ||
| mockPackageManager.primaryPackageJson.packageJson = { dependencies: {}, devDependencies: {} }; | ||
|
|
||
| vi.mocked(find).up.mockImplementation(() => undefined); | ||
|
|
||
| const result = await extractEslintInfo(mockPackageManager as any); | ||
|
|
||
|
|
@@ -96,7 +96,7 @@ describe('extractEslintInfo', () => { | |
| operationDir: '/some/path', | ||
| }; | ||
|
|
||
| vi.mocked(find).up.mockImplementation((fileName) => | ||
| String(fileName) === '.eslintrc.js' ? String(fileName) : undefined | ||
| ); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ import { logger, prompt } from 'storybook/internal/node-logger'; | |
|
|
||
| import commentJson from 'comment-json'; | ||
| import detectIndent from 'detect-indent'; | ||
| import * as find from 'empathic/find'; | ||
| import picocolors from 'picocolors'; | ||
| import { dedent } from 'ts-dedent'; | ||
|
|
||
|
|
@@ -15,13 +15,13 @@ import { babelParse, recast, types as t, traverse } from '../babel'; | |
| export const SUPPORTED_ESLINT_EXTENSIONS = ['ts', 'mts', 'cts', 'mjs', 'js', 'cjs', 'json']; | ||
| const UNSUPPORTED_ESLINT_EXTENSIONS = ['yaml', 'yml']; | ||
|
|
||
| export const findEslintFile = (instanceDir: string) => { | ||
| const filePrefixes = ['eslint.config', '.eslintrc']; | ||
|
|
||
| // Check for unsupported files | ||
| for (const prefix of filePrefixes) { | ||
| for (const ext of UNSUPPORTED_ESLINT_EXTENSIONS) { | ||
| const file = find.up(`${prefix}.${ext}`, { cwd: instanceDir, last: getProjectRoot() }); | ||
| if (file) { | ||
| throw new Error(`Unsupported ESLint config extension: .${ext}`); | ||
| } | ||
|
|
@@ -31,7 +31,7 @@ export const findEslintFile = async (instanceDir: string) => { | |
| // Find supported ESLint config files | ||
| for (const prefix of filePrefixes) { | ||
| for (const ext of SUPPORTED_ESLINT_EXTENSIONS) { | ||
| const file = find.up(`${prefix}.${ext}`, { cwd: instanceDir, last: getProjectRoot() }); | ||
| if (file) { | ||
| return file; | ||
| } | ||
|
|
@@ -157,7 +157,7 @@ export async function extractEslintInfo(packageManager: JsPackageManager): Promi | |
| let eslintConfigFile: string | undefined = undefined; | ||
|
|
||
| try { | ||
| eslintConfigFile = findEslintFile(packageManager.instanceDir); | ||
| } catch (err) { | ||
| if (err instanceof Error && err.message.includes('Unsupported ESLint')) { | ||
| unsupportedExtension = String(err); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,8 +53,8 @@ vi.mock('node:fs/promises', async (importOriginal) => { | |
| }; | ||
| }); | ||
|
|
||
| vi.mock('empathic/find', () => ({ | ||
| up: vi.fn(), | ||
| })); | ||
|
|
||
| vi.mock('path', async (importOriginal) => { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,15 +5,13 @@ import { join, resolve } from 'node:path'; | |
| import { | ||
| type JsPackageManager, | ||
| type PackageJson, | ||
| frameworkToRenderer, | ||
| getProjectRoot, | ||
| } from 'storybook/internal/common'; | ||
| import { logger } from 'storybook/internal/node-logger'; | ||
| import type { SupportedFrameworks, SupportedRenderers } from 'storybook/internal/types'; | ||
|
|
||
| import * as find from 'empathic/find'; | ||
| import picocolors from 'picocolors'; | ||
| import { coerce, satisfies } from 'semver'; | ||
| import stripJsonComments from 'strip-json-comments'; | ||
|
|
@@ -261,7 +259,7 @@ export async function adjustTemplate(templatePath: string, templateData: Record< | |
| } | ||
|
|
||
| export async function isNxProject() { | ||
| return find.up('nx.json', { last: getProjectRoot() }); | ||
| } | ||
|
|
||
| export function coerceSemver(version: string) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
logic: This import should use
find-upinstead ofempathic/findsince PR #32470 reverted the empathic changes. The current import will cause runtime errors.