Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Presets: Replace config with previewAnnotations, remove previewEntries #19152

Merged
merged 8 commits into from
Sep 13, 2022
Merged

Presets: Replace config with previewAnnotations, remove previewEntries #19152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1335697
No longer handle previewEntries in the vite builder.
tmeasday Sep 9, 2022
3c7b5a7
Stop using `previewEntries`.
tmeasday Sep 12, 2022
661232f
Config is always an array
tmeasday Sep 12, 2022
272eb03
Update lockfile
tmeasday Sep 12, 2022
25ac06a
Update snapshots
tmeasday Sep 12, 2022
a5b0349
Add migration notes
tmeasday Sep 13, 2022
62cabad
Fix issue with virtualModuleEntry
tmeasday Sep 13, 2022
9aef619
Fix WP5 template
tmeasday Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions code/lib/builder-vite/src/codegen-iframe-script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ import type { ExtendedOptions } from './types';
export async function generateIframeScriptCode(options: ExtendedOptions) {
const { presets } = options;
const frameworkName = await getFrameworkName(options);
const presetEntries = await presets.apply('config', [], options);
const previewEntries = await presets.apply('previewEntries', [], options);
const absolutePreviewEntries = previewEntries.map((entry) =>
const configField = await presets.apply('config', [], options);
const absoluteConfigField = configField.map((entry) =>
isAbsolute(entry) ? entry : resolve(entry)
);
const configEntries = [...presetEntries, ...absolutePreviewEntries].filter(Boolean);
const configEntries = [...absoluteConfigField].filter(Boolean);

const absoluteFilesToImport = (files: string[], name: string) =>
files
Expand Down
7 changes: 3 additions & 4 deletions code/lib/builder-vite/src/codegen-modern-iframe-script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ export async function generateModernIframeScriptCode(options: ExtendedOptions) {
const frameworkName = await getFrameworkName(options);

const previewOrConfigFile = loadPreviewOrConfigFile({ configDir });
const presetEntries = await presets.apply('config', [], options);
const previewEntries = await presets.apply('previewEntries', [], options);
const absolutePreviewEntries = [...presetEntries, ...previewEntries].map((entry) =>
const configField = await presets.apply('config', [], options);
const absoluteConfigField = [...configField].map((entry) =>
isAbsolute(entry) ? entry : resolve(entry)
);
const configEntries = [...absolutePreviewEntries, previewOrConfigFile]
const configEntries = [...absoluteConfigField, previewOrConfigFile]
.filter(Boolean)
.map((configEntry) => transformAbsPath(configEntry as string));

Expand Down
15 changes: 8 additions & 7 deletions scripts/sandbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
import prompts from 'prompts';
import type { AbortController } from 'node-abort-controller';
import command from 'execa';
import dedent from 'ts-dedent';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add https://www.npmjs.com/package/@ianvs/prettier-plugin-sort-imports so we don't need to worry about manually organizing imports. :-D


import { createOptions, getOptionsOrPrompt, OptionValues } from './utils/options';
import { executeCLIStep } from './utils/cli-step';
Expand All @@ -23,7 +24,6 @@ import { ConfigFile, readConfig, writeConfig } from '../code/lib/csf-tools';
import { babelParse } from '../code/lib/csf-tools/src/babelParse';
import TEMPLATES from '../code/lib/cli/src/repro-templates';
import { servePackages } from './utils/serve-packages';
import dedent from 'ts-dedent';

type Template = keyof typeof TEMPLATES;
const templates: Template[] = Object.keys(TEMPLATES) as any;
Expand Down Expand Up @@ -255,6 +255,11 @@ function forceViteRebuilds(mainConfig: ConfigFile) {
);
}

function addConfigEntries(mainConfig: ConfigFile, paths: string[]) {
const config = mainConfig.getFieldValue(['config']) as string[];
mainConfig.setFieldValue(['config'], [...(config || []), ...paths]);
}

// paths are of the form 'renderers/react', 'addons/actions'
async function addStories(paths: string[], { mainConfig }: { mainConfig: ConfigFile }) {
// Add `stories` entries of the form
Expand Down Expand Up @@ -289,11 +294,10 @@ async function addStories(paths: string[], { mainConfig }: { mainConfig: ConfigF
)
);

const config = mainConfig.getFieldValue(['config']) as string[];
const extraConfig = extraPreviewAndExistence
.filter(([, exists]) => exists)
.map(([p]) => path.join('..', '..', 'code', p));
mainConfig.setFieldValue(['config'], [...(config || []), ...extraConfig]);
addConfigEntries(mainConfig, extraConfig);
}

type Workspace = { name: string; location: string };
Expand Down Expand Up @@ -379,10 +383,7 @@ export async function sandbox(optionValues: OptionValues<typeof options>) {
path.join(codeDir, rendererPath, 'template', 'components'),
path.resolve(cwd, storiesPath, 'components')
);
mainConfig.setFieldValue(
['previewEntries'],
[`.${path.sep}${path.join(storiesPath, 'components')}`]
);
addConfigEntries(mainConfig, [`.${path.sep}${path.join(storiesPath, 'components')}`]);

// Link in the stories from the store, the renderer and the addons
const storiesToAdd = [] as string[];
Expand Down