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

WIP: [ts-migration] lib/core #9870

Closed
wants to merge 8 commits into from
Closed

WIP: [ts-migration] lib/core #9870

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
832db6d
add types entry for lib/ui
kroeder Feb 16, 2020
8b47f1f
prepare lib/core for ts migration
kroeder Feb 16, 2020
e14292c
migrate conditional-polyfills to typescript
kroeder Feb 16, 2020
a10b6c3
modify method signatures for Provider
kroeder Feb 16, 2020
f05fc6a
allow error to be undefined
kroeder Feb 16, 2020
6f7bf59
migrate core/client/preview
kroeder Feb 16, 2020
1520e7b
Merge remote-tracking branch 'origin/next' into ts-migration/core
tmeasday Feb 20, 2020
ca87ad4
Merge branch 'next' into ts-migration/core
ndelangen Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"license": "MIT",
"main": "dist/client/index.js",
"types": "dist/client/index.d.ts",
"files": [
"dist/**/*",
"dll/**/*",
Expand Down
0 lib/core/src/client/index.js → lib/core/src/client/index.ts
View file
Open in desktop
File renamed without changes.
11 changes: 6 additions & 5 deletions ...c/client/manager/conditional-polyfills.js → ...c/client/manager/conditional-polyfills.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ export const importPolyfills = () => {
if (!window.fetch) {
// manually patch window.fetch;
// see issue: <https://github.com/developit/unfetch/issues/101#issuecomment-454451035>
const patch = ({ default: fetch }) => {
window.fetch = fetch;
};

polyfills.push(import('unfetch/dist/unfetch').then(patch));
// todo needs review
polyfills.push(
import('unfetch').then(res => {
window.fetch = res.default;
})
);
}

return Promise.all(polyfills);
Expand Down
0 lib/core/src/client/manager/index.js → lib/core/src/client/manager/index.ts
View file
Open in desktop
File renamed without changes.
11 changes: 8 additions & 3 deletions lib/core/src/client/manager/provider.js → lib/core/src/client/manager/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { Provider } from '@storybook/ui';
import addons from '@storybook/addons';
import addons, { AddonStore } from '@storybook/addons';
import createChannel from '@storybook/channel-postmessage';
import Events from '@storybook/core-events';
import Channel from '@storybook/channels';

export default class ReactProvider extends Provider {
addons: AddonStore;

channel: Channel;

constructor() {
super();

Expand All @@ -16,15 +21,15 @@ export default class ReactProvider extends Provider {
this.channel = channel;
}

getElements(type) {
getElements(type: string) {
return this.addons.getElements(type);
}

getConfig() {
return this.addons.getConfig();
}

handleAPI(api) {
handleAPI(api: any) {
this.addons.loadAddons(api);
}
}
0 lib/core/src/client/preview/NoDocs.js → lib/core/src/client/preview/NoDocs.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/client/preview/index.js → lib/core/src/client/preview/index.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/client/preview/start.test.js → lib/core/src/client/preview/start.test.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/client/preview/start.js → lib/core/src/client/preview/start.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/client/preview/url.test.js → lib/core/src/client/preview/url.test.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/client/preview/url.js → lib/core/src/client/preview/url.ts
View file
Open in desktop
File renamed without changes.
Empty file added lib/core/src/public_api.ts
View file
Open in desktop
Empty file.
0 lib/core/src/server/build-dev.js → lib/core/src/server/build-dev.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/build-static.js → lib/core/src/server/build-static.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/cli/dev.js → lib/core/src/server/cli/dev.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/cli/index.js → lib/core/src/server/cli/index.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/cli/prod.js → lib/core/src/server/cli/prod.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/cli/utils.js → lib/core/src/server/cli/utils.ts
View file
Open in desktop
File renamed without changes.
0 ...e/src/server/common/babel-cache-preset.js → ...e/src/server/common/babel-cache-preset.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/common/babel.js → lib/core/src/server/common/babel.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/common/common-preset.js → lib/core/src/server/common/common-preset.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/common/custom-presets.js → lib/core/src/server/common/custom-presets.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/common/polyfills.js → lib/core/src/server/common/polyfills.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/config.js → lib/core/src/server/config.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/config/utils.js → lib/core/src/server/config/utils.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/dev-server.js → lib/core/src/server/dev-server.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/logConfig.js → lib/core/src/server/logConfig.ts
View file
Open in desktop
File renamed without changes.
0 ...rc/server/manager/babel-loader-manager.js → ...rc/server/manager/babel-loader-manager.ts
View file
Open in desktop
File renamed without changes.
0 ...core/src/server/manager/manager-config.js → ...core/src/server/manager/manager-config.ts
View file
Open in desktop
File renamed without changes.
0 ...core/src/server/manager/manager-preset.js → ...core/src/server/manager/manager-preset.ts
View file
Open in desktop
File renamed without changes.
0 .../server/manager/manager-webpack.config.js → .../server/manager/manager-webpack.config.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/presets.test.js → lib/core/src/server/presets.test.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/presets.js → lib/core/src/server/presets.ts
View file
Open in desktop
File renamed without changes.
0 ...rc/server/preview/babel-loader-preview.js → ...rc/server/preview/babel-loader-preview.ts
View file
Open in desktop
File renamed without changes.
0 ...src/server/preview/base-webpack.config.js → ...src/server/preview/base-webpack.config.ts
View file
Open in desktop
File renamed without changes.
0 ...c/server/preview/custom-webpack-preset.js → ...c/server/preview/custom-webpack-preset.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/preview/entries.js → lib/core/src/server/preview/entries.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/preview/globals.js → lib/core/src/server/preview/globals.ts
View file
Open in desktop
File renamed without changes.
0 ...c/server/preview/iframe-webpack.config.js → ...c/server/preview/iframe-webpack.config.ts
View file
Open in desktop
File renamed without changes.
0 ...core/src/server/preview/preview-preset.js → ...core/src/server/preview/preview-preset.ts
View file
Open in desktop
File renamed without changes.
0 .../src/server/preview/to-require-context.js → .../src/server/preview/to-require-context.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/standalone.js → lib/core/src/server/standalone.ts
View file
Open in desktop
File renamed without changes.
0 .../src/server/utils/interpret-files.test.js → .../src/server/utils/interpret-files.test.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/utils/interpret-files.js → lib/core/src/server/utils/interpret-files.ts
View file
Open in desktop
File renamed without changes.
0 .../server/utils/load-custom-babel-config.js → .../server/utils/load-custom-babel-config.ts
View file
Open in desktop
File renamed without changes.
0 ...erver/utils/load-custom-webpack-config.js → ...erver/utils/load-custom-webpack-config.ts
View file
Open in desktop
File renamed without changes.
0 ...rver/utils/load-manager-or-addons-file.js → ...rver/utils/load-manager-or-addons-file.ts
View file
Open in desktop
File renamed without changes.
0 ...rver/utils/load-preview-or-config-file.js → ...rver/utils/load-preview-or-config-file.ts
View file
Open in desktop
File renamed without changes.
0 ...server/utils/merge-webpack-config.test.js → ...server/utils/merge-webpack-config.test.ts
View file
Open in desktop
File renamed without changes.
0 .../src/server/utils/merge-webpack-config.js → .../src/server/utils/merge-webpack-config.ts
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion lib/core/src/server/utils/middleware.js → lib/core/src/server/utils/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ export function getMiddleware(configDir) {
const middlewarePath = path.resolve(configDir, 'middleware.js');
if (fs.existsSync(middlewarePath)) {
let middlewareModule = require(middlewarePath); // eslint-disable-line
if (middlewareModule.__esModule) { // eslint-disable-line
if (middlewareModule.__esModule) {
// eslint-disable-line
middlewareModule = middlewareModule.default;
}
return middlewareModule;
Expand Down
0 lib/core/src/server/utils/resolve-file.js → lib/core/src/server/utils/resolve-file.ts
View file
Open in desktop
File renamed without changes.
0 .../server/utils/resolve-path-in-sb-cache.js → .../server/utils/resolve-path-in-sb-cache.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/utils/server-require.js → lib/core/src/server/utils/server-require.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/utils/template.test.js → lib/core/src/server/utils/template.test.ts
View file
Open in desktop
File renamed without changes.
0 lib/core/src/server/utils/template.js → lib/core/src/server/utils/template.ts
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions lib/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"license": "MIT",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist/**/*",
"README.md",
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/src/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default class Provider {
getElements() {
getElements(type: string) {
Copy link
Member Author

Choose a reason for hiding this comment

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

fyi @ndelangen I had to modify the signature of getElements and handleAPI because every class that has extended this base class had these arguments implemented

I hope that's ok?

throw new Error('Provider.getElements() is not implemented!');
}

handleAPI() {
handleAPI(api: any) {
throw new Error('Provider.handleAPI() is not implemented!');
}

Expand Down