Skip to content

Commit

Permalink
Final fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@valentinpalkovic
valentinpalkovic committed Mar 11, 2025
1 parent 733ff35 commit 405d4ec
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 41 deletions.
58 changes: 29 additions & 29 deletions code/core/scripts/entries.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@ export const getEntries = (cwd: string) => {
const define = defineEntry(cwd);
return [
// empty, right now, TDB what to do with this
define('src/index.ts', ['node', 'browser'], true),
define('src/index.ts', ['node', 'browser'], true, ['react']),

define('src/node-logger/index.ts', ['node'], true),
define('src/client-logger/index.ts', ['browser', 'node'], true),
define('src/node-logger/index.ts', ['node'], true, ['react']),
define('src/client-logger/index.ts', ['browser', 'node'], true, ['react']),

define('src/theming/index.ts', ['browser', 'node'], true, ['react']),
define('src/theming/create.ts', ['browser', 'node'], true, ['react']),

define('src/core-server/index.ts', ['node'], true),
define('src/core-server/presets/common-preset.ts', ['node'], false),
define('src/core-server/presets/common-manager.ts', ['browser'], false),
define('src/core-server/presets/common-override-preset.ts', ['node'], false),
define('src/core-server/index.ts', ['node'], true, ['react']),
define('src/core-server/presets/common-preset.ts', ['node'], false, ['react']),
define('src/core-server/presets/common-manager.ts', ['browser'], false, ['react']),
define('src/core-server/presets/common-override-preset.ts', ['node'], false, ['react']),

define('src/actions/index.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/actions/preview.ts', ['browser', 'node'], true, ['react'], [], [], true),
define('src/actions/manager.tsx', ['browser'], false, ['react'], [], [], true),
define('src/actions/decorator.ts', ['browser'], true, ['react'], [], [], true),

define('src/core-events/index.ts', ['browser', 'node'], true),
define('src/manager-errors.ts', ['browser'], true),
define('src/preview-errors.ts', ['browser', 'node'], true),
define('src/server-errors.ts', ['node'], true),
define('src/core-events/index.ts', ['browser', 'node'], true, ['react']),
define('src/manager-errors.ts', ['browser'], true, ['react']),
define('src/preview-errors.ts', ['browser', 'node'], true, ['react']),
define('src/server-errors.ts', ['node'], true, ['react']),

define('src/channels/index.ts', ['browser', 'node'], true),
define('src/channels/index.ts', ['browser', 'node'], true, ['react']),
define('src/types/index.ts', ['browser', 'node'], true, ['react']),
define('src/csf-tools/index.ts', ['node'], true),
define('src/csf/index.ts', ['browser', 'node'], true),
define('src/common/index.ts', ['node'], true),
define('src/builder-manager/index.ts', ['node'], true),
define('src/telemetry/index.ts', ['node'], true),
define('src/preview-api/index.ts', ['browser', 'node'], true),
define('src/csf-tools/index.ts', ['node'], true, ['react']),
define('src/csf/index.ts', ['browser', 'node'], true, ['react']),
define('src/common/index.ts', ['node'], true, ['react']),
define('src/builder-manager/index.ts', ['node'], true, ['react']),
define('src/telemetry/index.ts', ['node'], true, ['react']),
define('src/preview-api/index.ts', ['browser', 'node'], true, ['react']),
define('src/manager-api/index.ts', ['browser', 'node'], true, ['react']),
define('src/router/index.ts', ['browser', 'node'], true, ['react']),
define(
Expand All @@ -44,22 +44,22 @@ export const getEntries = (cwd: string) => {
['react', 'react-dom'],
['prettier'] // the syntax highlighter uses prettier/standalone to format the code
),
define('src/docs-tools/index.ts', ['browser', 'node'], true),
define('src/docs-tools/index.ts', ['browser', 'node'], true, ['react']),

define('src/manager/globals-module-info.ts', ['node'], true),
define('src/manager/globals.ts', ['node'], true),
define('src/preview/globals.ts', ['node'], true),
define('src/cli/index.ts', ['node'], true),
define('src/babel/index.ts', ['node'], true),
define('src/cli/bin/index.ts', ['node'], true),
define('src/bin/index.ts', ['node'], false),
define('src/manager/globals-module-info.ts', ['node'], true, ['react']),
define('src/manager/globals.ts', ['node'], true, ['react']),
define('src/preview/globals.ts', ['node'], true, ['react']),
define('src/cli/index.ts', ['node'], true, ['react']),
define('src/babel/index.ts', ['node'], true, ['react']),
define('src/cli/bin/index.ts', ['node'], true, ['react']),
define('src/bin/index.ts', ['node'], false, ['react']),

define('src/instrumenter/index.ts', ['browser', 'node'], true),
define('src/instrumenter/index.ts', ['browser', 'node'], true, ['react']),
define(
'src/test/preview.ts',
['browser', 'node'],
true,
['util'],
['util', 'react'],
[],
[
'@testing-library/dom',
Expand All @@ -76,7 +76,7 @@ export const getEntries = (cwd: string) => {
'src/test/index.ts',
['browser', 'node'],
true,
['util'],
['util', 'react'],
[],
[
'@testing-library/dom',
Expand Down
14 changes: 4 additions & 10 deletions code/core/scripts/prep.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,28 +342,21 @@ async function run() {
await rm(metafilesDir, { recursive: true });
}
await mkdir(metafilesDir, { recursive: true });

const outputs = await Promise.all(
compile.map(async (context) => {
const output = await context.rebuild();
await context.dispose();

return output;
})
);

const metafileByModule: Record<string, Metafile> = {};

for (const currentOutput of outputs) {
if (!currentOutput.metafile) {
continue;
}

const keys = Object.keys(currentOutput.metafile.outputs);
const moduleName = keys.length === 1 ? dirname(keys[0]).replace('dist/', '') : 'core';

const existingMetafile = metafileByModule[moduleName];

if (existingMetafile) {
existingMetafile.inputs = {
...existingMetafile.inputs,
Expand All @@ -377,15 +370,16 @@ async function run() {
metafileByModule[moduleName] = currentOutput.metafile;
}
}

await Promise.all(
Object.entries(metafileByModule).map(async ([moduleName, metafile]) => {
console.log('saving metafiles', moduleName);
const sanitizedModuleName = moduleName.replace('/', '-');
await writeFile(
join(metafilesDir, `${moduleName}.json`),
join(metafilesDir, `${sanitizedModuleName}.json`),
JSON.stringify(metafile, null, 2)
);
await writeFile(
join(metafilesDir, `${moduleName}.txt`),
join(metafilesDir, `${sanitizedModuleName}.txt`),
await esbuild.analyzeMetafile(metafile, { color: false, verbose: false })
);
})
Expand Down
2 changes: 1 addition & 1 deletion code/core/src/docs-tools/hasDocsOrControls.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ import type { Options } from 'storybook/internal/types';
const packageRe = /(addons\/|addon-|addon-essentials\/)(docs|controls)/;

export const hasDocsOrControls = (options: Options) =>
options.presetsList?.some((preset) => packageRe.test(preset.name));
options.presetsList?.some((preset: any) => packageRe.test(preset.name));
1 change: 0 additions & 1 deletion code/lib/codemod/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"entries": [
"./src/index.ts",
"./src/transforms/csf-2-to-3.ts",
"./src/transforms/csf-hoist-story-annotations.js",
"./src/transforms/find-implicit-spies.ts",
"./src/transforms/upgrade-deprecated-types.ts",
"./src/transforms/upgrade-hierarchy-separators.js"
Expand Down

0 comments on commit 405d4ec

Please sign in to comment.