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

Jump to bottom

Fix addon-docs acorn dependency for pnpm compat #16707

Closed
wants to merge 3 commits into from
Closed

Fix addon-docs acorn dependency for pnpm compat #16707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeda400
Fix addon-docs acorn dependency for pnpm compat
shilman Nov 17, 2021
e15d541
Upgrade acorn to 8
shilman Nov 17, 2021
536285f
Merge branch 'next' into 16705-fix-docs-dependency
shilman Dec 29, 2021
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
2 changes: 1 addition & 1 deletion addons/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@storybook/source-loader": "6.5.0-alpha.5",
"@storybook/store": "6.5.0-alpha.5",
"@storybook/theming": "6.5.0-alpha.5",
"acorn": "^7.4.1",
"acorn": "^8.5.0",
"acorn-jsx": "^5.3.1",
"acorn-walk": "^7.2.0",
"core-js": "^3.8.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/src/frameworks/react/lib/inspection/acornParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ function parseExpression(expression: any): ParsingResult<InspectionInferedType>
}

export function parse(value: string): ParsingResult<InspectionInferedType> {
const ast = (acornParser.parse(`(${value})`) as unknown) as estree.Program;
const ast = (acornParser.parse(`(${value})`, { ecmaVersion: 6 }) as unknown) as estree.Program;

let parsingResult: ParsingResult<InspectionUnknown> = {
inferredType: { type: InspectionType.UNKNOWN },
Expand Down
4 changes: 3 additions & 1 deletion app/angular/src/server/framework-preset-angular-cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,9 @@ async function getLegacyDefaultBuildOptions(options: PresetOptions) {
browserTarget.target
);

logger.info(`=> Using angular project "${browserTarget.project}:${browserTarget.target}" for configuring Storybook`);
logger.info(
`=> Using angular project "${browserTarget.project}:${browserTarget.target}" for configuring Storybook`
);
return { ...target.options };
} catch (error) {
logger.error(`=> Could not find angular project: ${error.message}`);
Expand Down
6 changes: 4 additions & 2 deletions lib/core-server/src/build-dev.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,13 @@ export async function buildDevStandalone(options: CLIOptions & LoadOptions & Bui
if (options.smokeTest) {
// @ts-ignore
const managerWarnings = (managerStats && managerStats.toJson().warnings) || [];
if (managerWarnings.length > 0) logger.warn(`manager: ${JSON.stringify(managerWarnings, null, 2)}`);
if (managerWarnings.length > 0)
logger.warn(`manager: ${JSON.stringify(managerWarnings, null, 2)}`);
// I'm a little reticent to import webpack types in this file :shrug:
// @ts-ignore
const previewWarnings = (previewStats && previewStats.toJson().warnings) || [];
if (previewWarnings.length > 0) logger.warn(`preview: ${JSON.stringify(previewWarnings, null, 2)}`);
if (previewWarnings.length > 0)
logger.warn(`preview: ${JSON.stringify(previewWarnings, null, 2)}`);
process.exit(
managerWarnings.length > 0 || (previewWarnings.length > 0 && !options.ignorePreview) ? 1 : 0
);
Expand Down
13 changes: 11 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7853,7 +7853,7 @@ __metadata:
"@types/prop-types": ^15.7.3
"@types/tmp": ^0.2.0
"@types/util-deprecate": ^1.0.0
acorn: ^7.4.1
acorn: ^8.5.0
acorn-jsx: ^5.3.1
acorn-walk: ^7.2.0
babel-loader: ^8.0.0
Expand Down Expand Up @@ -13795,7 +13795,7 @@ __metadata:
languageName: node
linkType: hard

"acorn@npm:^7.0.0, acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.3.1, acorn@npm:^7.4.0, acorn@npm:^7.4.1":
"acorn@npm:^7.0.0, acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.3.1, acorn@npm:^7.4.0":
version: 7.4.1
resolution: "acorn@npm:7.4.1"
bin:
Expand All @@ -13813,6 +13813,15 @@ __metadata:
languageName: node
linkType: hard

"acorn@npm:^8.5.0":
version: 8.5.0
resolution: "acorn@npm:8.5.0"
bin:
acorn: bin/acorn
checksum: a0cd0009d215df0c5a6c69ea40a5e784114f1b89d5649d663264ccbb855d4c6b6da6936fed607078b7d681bd8d8f2e730dad25931edbdef709bc4b520c0caa80
languageName: node
linkType: hard

"address@npm:1.1.2, address@npm:^1.0.1, address@npm:^1.1.2":
version: 1.1.2
resolution: "address@npm:1.1.2"
Expand Down