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.
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
Build: Regen lockfile #17283
Build: Regen lockfile #17283
Changes from 11 commits
b9088b5
4d6b419
e809109
fd13f46
c534cc4
9ac578c
f275a7b
8102934
bb10549
78fd801
151812d
f6f5558
55b6fb1
1281fb5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -131,6 +131,7 @@ | |
"require-from-string": "^2.0.2", | ||
"rxjs": "^6.6.3", | ||
"styled-components": "^5.2.1", | ||
"sveltedoc-parser": "4.1.0", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The newer version doesn't work correctly, some issue relating to a URL and eslint, strange. I made it an exact version in the devDependency, this way we have absolute control over the version WE use, but users can use whatever works for them. |
||
"terser-webpack-plugin": "^5.0.3", | ||
"tmp": "^0.2.1", | ||
"tslib": "^2.1.0", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
/* eslint-disable import/extensions */ | ||
require('./dist/esm/register.js'); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ import { TransformOptions } from '@babel/core'; | |
import { Configuration } from 'webpack'; | ||
import { findDistEsm, StorybookConfig } from '@storybook/core-common'; | ||
|
||
export function babelDefault(config: TransformOptions) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we provide the output type as well, we prevent issues where typescript 'gets confused' and tells you it can't use a non-exported type. |
||
export function babelDefault(config: TransformOptions): TransformOptions { | ||
return { | ||
...config, | ||
plugins: [ | ||
|
@@ -13,7 +13,7 @@ export function babelDefault(config: TransformOptions) { | |
}; | ||
} | ||
|
||
export function webpackFinal(config: Configuration) { | ||
export function webpackFinal(config: Configuration): Configuration { | ||
return { | ||
...config, | ||
resolve: { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,7 +74,8 @@ | |
}, | ||
"devDependencies": { | ||
"@storybook/client-api": "6.5.0-alpha.21", | ||
"@types/prompts": "^2.0.9" | ||
"@types/prompts": "^2.0.9", | ||
"webpack": "4" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So we recently added webpack 4 - 5 as a dep here, and so yarn is eager to install webpack 5 here, we can force it to install webpack 4 (and then de-dup it to the root, by adding a devDependency that equal to the rest of the repo. |
||
}, | ||
"peerDependencies": { | ||
"@babel/core": "^7.11.5", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,8 @@ export const render: ArgsStoryFn<VueFramework> = (props, context) => { | |
); | ||
} | ||
|
||
return h(Component, props); | ||
// TODO remove this hack | ||
return h(Component as Parameters<typeof h>[0], props); | ||
Comment on lines
+17
to
+18
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So multiple conflicting version of vue typings exist and they are equal but not the same, and so typescript complains. Since they are equal anyway, I simply cast it. this should result the same when users use it (because it will be the type they have installed, I assume |
||
}; | ||
|
||
export const activeStoryComponent = shallowRef<StoryFnVueReturnType | null>(null); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
/* eslint-disable import/extensions */ | ||
const base = require('./jest.config.js'); | ||
|
||
module.exports = { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
#!/usr/bin/env node | ||
|
||
// eslint-disable-next-line import/extensions | ||
require('../dist/cjs/generate.js'); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,8 +48,8 @@ | |
"lodash": "^4.17.21", | ||
"memoizerific": "^1.11.3", | ||
"qs": "^6.10.0", | ||
"react-router": "^6.0.0", | ||
"react-router-dom": "^6.0.0", | ||
"react-router": "6.0.2", | ||
"react-router-dom": "6.0.2", | ||
Comment on lines
+51
to
+52
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. react-router > 6.0.2 actually uses TS4 features, which we can't parse. |
||
"ts-dedent": "^2.0.0" | ||
}, | ||
"peerDependencies": { | ||
|
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.
This is a typings file, it has no runtime elements, and so babel doesn't need to work on this file.