GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 19:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11410 from storybookjs/fix/next

Browse Source 
Build: Fix CI breaks
This commit is contained in:
Michael Shilman 2020-07-04 00:04:44 +08:00 committed by GitHub
commit 7dc59dabc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/integration/knobs.spec.ts
View File

@ -1,3 +1,4 @@
/* eslint-disable cypress/no-unnecessary-waiting */
import { clickAddon, visit } from '../helper';
describe('Knobs', () => {
@ -12,6 +13,7 @@ describe('Knobs', () => {
cy.getStoryElement()
.console('info')
.wait(3000)
.find('p')
.eq(0)
.should('contain.text', 'My name is John Doe');

1
examples/cra-ts-kitchen-sink/public/public
View File

@ -1 +0,0 @@
.

2
examples/official-storybook/package.json
View File

@ -8,7 +8,7 @@
"do-storyshots-puppeteer": "../../node_modules/.bin/jest --projects=./storyshots-puppeteer",
"generate-addon-jest-testresults": "jest --config=tests/addon-jest.config.json --json --outputFile=stories/addon-jest.testresults.json",
"graphql": "node ./graphql-server/index.js",
"packtracker": "yarn storybook --smoke-test --quiet && cross-env PT_PROJECT_TOKEN=1af1d41b-d737-41d4-ac00-53c8f3913b53 packtracker-upload --stats=./node_modules/.cache/storybook/manager-stats.json",
"packtracker": "yarn storybook --smoke-test --quiet && cross-env PT_PROJECT_TOKEN=1af1d41b-d737-41d4-ac00-53c8f3913b53 packtracker-upload --stats=./node_modules/.cache/storybook/public/manager-stats.json",
"storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true start-storybook -p 9011 -c ./ --no-dll",
"storyshots-puppeteer": "yarn run build-storybook && yarn run do-storyshots-puppeteer"
},

6
lib/core/src/server/build-dev.js
View File

@ -30,7 +30,7 @@ const cache = Cache({
const writeStats = async (name, stats) => {
await fs.writeFile(
resolvePathInStorybookCache(`${name}-stats.json`),
resolvePathInStorybookCache(`public/${name}-stats.json`),
JSON.stringify(stats.toJson(), null, 2),
'utf8'
);
@ -230,7 +230,9 @@ async function outputStats(previewStats, managerStats) {
await writeStats('preview', previewStats);
}
await writeStats('manager', managerStats);
logger.info(`stats written to => ${chalk.cyan(resolvePathInStorybookCache('[name].json'))}`);
logger.info(
`stats written to => ${chalk.cyan(resolvePathInStorybookCache('public/[name].json'))}`
);
}
function openInBrowser(address) {

5
lib/core/src/server/dev-server.js
View File

@ -24,7 +24,9 @@ const router = new Router();
export default function (options) {
const configDir = path.resolve(options.configDir);
const outputDir = path.resolve(options.outputDir || resolvePathInStorybookCache('public'));
const outputDir = options.smokeTest
? resolvePathInStorybookCache('public')
: path.resolve(options.outputDir || resolvePathInStorybookCache('public'));
const configType = 'DEVELOPMENT';
const startTime = process.hrtime();
@ -46,6 +48,7 @@ export default function (options) {
const devMiddlewareOptions = {
publicPath: config.output.publicPath,
writeToDisk: !!options.smokeTest,
watchOptions: {
aggregateTimeout: 2000,
ignored: /node_modules/,

2
lib/core/src/server/manager/manager-webpack.config.js
View File

@ -149,7 +149,7 @@ export default async ({
resolveLoader: {
plugins: [PnpWebpackPlugin.moduleLoader(module)],
},
recordsPath: resolvePathInStorybookCache('records.json'),
recordsPath: resolvePathInStorybookCache('public/records.json'),
performance: {
hints: false,
},