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

feat(storybook): upgrade @storybook/react-native version to 6.0.1-beta.5 #9657

Merged
merged 1 commit into from Apr 4, 2022
Merged

feat(storybook): upgrade @storybook/react-native version to 6.0.1-beta.5 #9657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions e2e/react-native/src/react-native.test.ts
View file
Open in desktop
Expand Up @@ -66,8 +66,8 @@ describe('react native', () => {
expect(() =>
checkFilesExist(
`.storybook/story-loader.js`,
`apps/${appName}/.storybook/storybook.ts`,
`apps/${appName}/.storybook/toggle-storybook.tsx`,
`apps/${appName}/src/storybook/storybook.ts`,
`apps/${appName}/src/storybook/toggle-storybook.tsx`,
`apps/${appName}/src/app/App.stories.tsx`
)
).not.toThrow();
Expand Down
19 changes: 11 additions & 8 deletions packages/react-native/src/executors/storybook/storybook.impl.ts
View file
Open in desktop
@@ -1,5 +1,6 @@
import { join } from 'path';
import { ExecutorContext, logger } from '@nrwl/devkit';
import { fileExists } from '@nrwl/workspace/src/utilities/fileutils';
import * as chalk from 'chalk';

import { ReactNativeStorybookOptions } from './schema';
Expand All @@ -23,15 +24,17 @@ export default async function* reactNatievStorybookExecutor(
);

// add storybook addons to app's package.json
displayNewlyAddedDepsMessage(
context.projectName,
await syncDeps(
const packageJsonPath = join(context.root, projectRoot, 'package.json');
if (fileExists(packageJsonPath))
displayNewlyAddedDepsMessage(
context.projectName,
projectRoot,
context.root,
'@storybook/addon-ondevice-actions,@storybook/addon-ondevice-backgrounds,@storybook/addon-ondevice-controls,@storybook/addon-ondevice-notes'
)
);
await syncDeps(
context.projectName,
projectRoot,
context.root,
'@storybook/addon-ondevice-actions,@storybook/addon-ondevice-backgrounds,@storybook/addon-ondevice-controls,@storybook/addon-ondevice-notes'
)
);

try {
await runCliStorybook(context.root, projectRoot, options);
Expand Down
9 changes: 1 addition & 8 deletions packages/react-native/src/generators/component-story/component-story.spec.ts
View file
Open in desktop
Expand Up @@ -60,8 +60,7 @@ describe('react-native:component-story', () => {
import React from 'react';
import { TestUiLib, TestUiLibProps } from './test-ui-lib';
const props: TestUiLibProps = {};
storiesOf('TestUiLib', module)
.addDecorator((getStory) => <>{getStory()}</>)
storiesOf('TestUiLib', module)
.add('Primary', () => <TestUiLib {...props} />);
`);
});
Expand Down Expand Up @@ -110,7 +109,6 @@ describe('react-native:component-story', () => {
const props = {};

storiesOf('Test', module)
.addDecorator((getStory) => <>{getStory()}</>)
.add('Primary', () => <Test {...props} />);
`);
});
Expand Down Expand Up @@ -149,7 +147,6 @@ describe('react-native:component-story', () => {
import { Test } from './test-ui-lib';
const props = {};
storiesOf('Test', module)
.addDecorator((getStory) => <>{getStory()}</>)
.add('Primary', () => <Test {...props} />);
`);
});
Expand All @@ -172,7 +169,6 @@ describe('react-native:component-story', () => {
import { TestUiLib, TestUiLibProps } from './test-ui-lib';
const props: TestUiLibProps = {};
storiesOf('TestUiLib', module)
.addDecorator((getStory) => <>{getStory()}</>)
.add('Primary', () => <TestUiLib {...props} />);
`);
});
Expand Down Expand Up @@ -223,7 +219,6 @@ describe('react-native:component-story', () => {
const actions = { someAction: action('someAction executed!') };
const props: TestProps = { name: '', displayAge: false };
storiesOf('Test', module)
.addDecorator((getStory) => <>{getStory()}</>)
.add('Primary', () => <Test {...props} {...actions} />);
`);
});
Expand Down Expand Up @@ -372,7 +367,6 @@ describe('react-native:component-story', () => {
displayAge: false,
};
storiesOf('Test', module)
.addDecorator((getStory) => <>{getStory()}</>)
.add('Primary', () => <Test {...props} />);
`);
});
Expand Down Expand Up @@ -404,7 +398,6 @@ describe('react-native:component-story', () => {
const props: TestUiLibProps = {};

storiesOf('TestUiLib', module)
.addDecorator((getStory) => <>{getStory()}</>)
.add('Primary', () => <TestUiLib {...props} />);
`);
});
Expand Down
1 change: 0 additions & 1 deletion ...act-native/src/generators/component-story/files/__componentFileName__.stories.__fileExt__
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@ const props <% if ( propsTypeName ) { %>:<%= propsTypeName %><% } %> = {<% for (
<% } %>};

storiesOf('<%= componentName %>', module)
.addDecorator((getStory) => <>{getStory()}</>)
.add('Primary', () => (
<<%= componentName %> {...props} <% if (hasActions) { %> {...actions} <% } %>/>
));
2 changes: 1 addition & 1 deletion packages/react-native/src/generators/storybook-configuration/files/app/storybook.ts.template
View file
Open in desktop
@@ -1,6 +1,6 @@
import { configure, getStorybookUI } from '@storybook/react-native';

import { loadStories } from '../../../.storybook/story-loader';
import { loadStories } from '../../../../.storybook/story-loader';

configure(loadStories(), module, false);

Expand Down
2 changes: 1 addition & 1 deletion ...act-native/src/generators/storybook-configuration/files/app/toggle-storybook.tsx.template
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ import React, { useState, useEffect, useRef } from 'react';
import { DevSettings } from 'react-native';
import AsyncStorage from '@react-native-async-storage/async-storage';

import AppRoot from '../src/app/App';
import AppRoot from '../app/App';

export const DEFAULT_REACTOTRON_WS_URI = 'ws://localhost:9090';

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/src/generators/storybook-configuration/lib/create-storybook-files.ts
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ export async function createStorybookFiles(
generateFiles(
host,
join(__dirname, '../files/app'),
join(root, '.storybook'),
join(root, 'src', 'storybook'),
{
tmpl: '',
offsetFromRoot: offsetFromRoot(sourceRoot),
Expand Down
4 changes: 2 additions & 2 deletions ...c/generators/storybook-configuration/lib/replace-app-import-with-storybook-toggle.spec.ts
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ describe('replaceAppImportWithStorybookToggle', () => {
const mainFile = tree.read('apps/products/src/main.tsx', 'utf-8');
expect(formatFile`${mainFile}`).toEqual(
formatFile`import { AppRegistry } from 'react-native';
import App from '../.storybook/toggle-storybook';
import App from './storybook/toggle-storybook';

AppRegistry.registerComponent('main', () => App);`
);
Expand All @@ -57,7 +57,7 @@ describe('replaceAppImportWithStorybookToggle', () => {
const mainFile = tree.read('apps/products/src/main.tsx', 'utf-8');
expect(formatFile`${mainFile}`).toEqual(
formatFile`import { AppRegistry } from 'react-native';
import App from '../.storybook/toggle-storybook';
import App from './storybook/toggle-storybook';

AppRegistry.registerComponent('main', () => App);`
);
Expand Down
2 changes: 1 addition & 1 deletion ...ve/src/generators/storybook-configuration/lib/replace-app-import-with-storybook-toggle.ts
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ export function replaceAppImportWithStorybookToggle(

const mainFilePath = join(sourceRoot, schema.js ? 'main.js' : 'main.tsx');
const appImportImport = `import App from './app/App';`;
const storybookeToggleImport = `import App from '../.storybook/toggle-storybook';`;
const storybookeToggleImport = `import App from './storybook/toggle-storybook';`;

try {
logger.debug(`Updating import for ${mainFilePath}`);
Expand Down
20 changes: 20 additions & 0 deletions packages/storybook/migrations.json
View file
Open in desktop
Expand Up @@ -87,6 +87,26 @@
"@storybook/core-server": {
"version": "~6.4.12",
"alwaysAddToPackageJson": true
},
"@storybook/react-native": {
"version": "^6.0.1-beta.5",
"alwaysAddToPackageJson": false
},
"@storybook/addon-ondevice-actions": {
"version": "^6.0.1-beta.5",
"alwaysAddToPackageJson": false
},
"@storybook/addon-ondevice-backgrounds": {
"version": "^6.0.1-beta.5",
"alwaysAddToPackageJson": false
},
"@storybook/addon-ondevice-controls": {
"version": "^6.0.1-beta.5",
"alwaysAddToPackageJson": false
},
"@storybook/addon-ondevice-notes": {
"version": "^6.0.1-beta.5",
"alwaysAddToPackageJson": false
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook/src/utils/versions.ts
View file
Open in desktop
Expand Up @@ -6,5 +6,5 @@ export const babelPresetTypescriptVersion = '7.12.13';
export const svgrVersion = '^5.4.0';
export const urlLoaderVersion = '^3.0.0';
export const webpack5Version = '^5.64.0';
export const storybookReactNativeVersion = '6.0.1-alpha.7';
export const storybookReactNativeVersion = '^6.0.1-beta.5';
export const reactNativeStorybookLoader = '^2.0.5';