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

refactor(core): avoid duplication of code used to get path of files/dirs in cache

Browse Source
This commit is contained in:
Gaëtan Maisse 2020-01-28 21:40:22 +01:00
parent 8b4fe4fa8d
commit b46444edce
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ import chalk from 'chalk';
import { logger, colors, instance as npmLog } from '@storybook/node-logger';
import fetch from 'node-fetch';
import Cache from 'file-system-cache';
import findCacheDir from 'find-cache-dir';
import open from 'open';
import boxen from 'boxen';
import semver from 'semver';
@ -21,17 +20,17 @@ import detectFreePort from 'detect-port';
import storybook from './dev-server';
import { getDevCli } from './cli';
import { resolvePathInStorybookCache } from './utils/resolve-path-in-sb-cache';
const defaultFavIcon = require.resolve('./public/favicon.ico');
const cacheDir = findCacheDir({ name: 'storybook' });
const cache = Cache({
basePath: cacheDir,
basePath: resolvePathInStorybookCache('dev-server'),
ns: 'storybook', // Optional. A grouping namespace for items.
});
const writeStats = async (name, stats) => {
await fs.writeFile(
path.join(cacheDir, `${name}-stats.json`),
resolvePathInStorybookCache(`${name}-stats.json`),
JSON.stringify(stats.toJson(), null, 2),
'utf8'
);
@ -231,7 +230,7 @@ async function outputStats(previewStats, managerStats) {
await writeStats('preview', previewStats);
}
await writeStats('manager', managerStats);
logger.info(`stats written to => ${chalk.cyan(path.join(cacheDir, '[name].json'))}`);
logger.info(`stats written to => ${chalk.cyan(resolvePathInStorybookCache('[name].json'))}`);
}
function openInBrowser(address) {

5
lib/core/src/server/common/babel-cache-preset.js
View File

@ -1,10 +1,9 @@
import findCacheDir from 'find-cache-dir';
import { resolvePathInStorybookCache } from '../utils/resolve-path-in-sb-cache';
const extend = babelConfig => ({
// This is a feature of `babel-loader` for webpack (not Babel itself).
// It enables a cache directory for faster-rebuilds
// `find-cache-dir` will create the cache directory under the node_modules directory.
cacheDirectory: findCacheDir({ name: 'storybook' }),
cacheDirectory: resolvePathInStorybookCache('babel'),
...babelConfig,
});

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

@ -8,16 +8,14 @@ import CoreJSUpgradeWebpackPlugin from 'corejs-upgrade-webpack-plugin';
import themingPaths from '@storybook/theming/paths';
import uiPaths from '@storybook/ui/paths';
import findCacheDir from 'find-cache-dir';
import { version } from '../../../package.json';
import { getManagerHeadHtml } from '../utils/template';
import { loadEnv } from '../config/utils';
import babelLoader from '../common/babel-loader';
import { resolvePathInStorybookCache } from '../utils/resolve-path-in-sb-cache';
const coreDirName = path.dirname(require.resolve('@storybook/core/package.json'));
const context = path.join(coreDirName, '../../node_modules');
const cacheDir = findCacheDir({ name: 'storybook' });
export default ({
configDir,
@ -124,7 +122,7 @@ export default ({
...uiPaths,
},
},
recordsPath: path.join(cacheDir, 'records.json'),
recordsPath: resolvePathInStorybookCache('records.json'),
performance: {
hints: false,
},