Skip to content

Commit f6fcfaf

Browse files
authored
fix(umi-library): can't parse umirc.library config with .ts extname (umijs#2364)
1 parent 738b49d commit f6fcfaf

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

packages/umi-library/src/doc.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,13 @@ import { writeFileSync, existsSync } from 'fs';
55
import { sync as mkdirp } from 'mkdirp';
66
import ghpages from 'gh-pages';
77
import chalk from 'chalk';
8-
import { CONFIG_FILES } from './getUserConfig';
9-
import registerBabel from './registerBabel';
108

119
// userConfig 是从 Bigfish 过来的,用于传入额外的配置信息
1210
// 这部分信息需要写入到临时文件,因为在 doczrc.ts 里无法读取到他
1311
// TODO: userConfig 无法用函数
1412
export function devOrBuild({ cwd, cmd, params, userConfig = {} }) {
1513
process.chdir(cwd);
1614

17-
// register babel for config files
18-
registerBabel({
19-
cwd,
20-
only: CONFIG_FILES,
21-
});
22-
2315
mkdirp(join(cwd, '.docz'));
2416
writeFileSync(
2517
join(cwd, '.docz', '.umirc.library.json'),

packages/umi-library/src/doczrc.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import { css } from 'docz-plugin-umi-css';
22
import { join, dirname } from 'path';
33
import { readFileSync, existsSync } from 'fs';
44
import { merge } from 'lodash';
5-
import getUserConfig from './getUserConfig';
5+
import getUserConfig, { CONFIG_FILES } from './getUserConfig';
66
import reactExternal from './docz-plugin-react-externals';
7+
import registerBabel from './registerBabel';
78

89
const cssModuleRegex = /\.module\.css$/;
910
const lessModuleRegex = /\.module\.less$/;
@@ -12,6 +13,13 @@ const cwd = process.cwd();
1213
const localUserConfig = JSON.parse(
1314
readFileSync(join(cwd, '.docz', '.umirc.library.json'), 'utf-8'),
1415
);
16+
17+
// register babel for config files
18+
registerBabel({
19+
cwd,
20+
only: CONFIG_FILES,
21+
});
22+
1523
const userConfig = {
1624
...localUserConfig,
1725
// get user config directly from .umirc.library.js

0 commit comments

Comments
 (0)