Skip to content

Commit 020c4ba

Browse files
authored
fix: missing default.css (ant-design#32116)
* chore: Add CI for compile * chore: Add missing compile file
1 parent b434e0a commit 020c4ba

File tree

4 files changed

+45
-21
lines changed

4 files changed

+45
-21
lines changed

.antd-tools.config.js

+2-20
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,6 @@ function finalizeCompile() {
3535
);
3636
});
3737
}
38-
39-
// Create entry for babel plugin import
40-
function patchEntry(styleEntry) {
41-
if (fs.existsSync(styleEntry)) {
42-
fs.writeFileSync(
43-
path.join(styleEntry, 'style', 'index-default.less'),
44-
[
45-
// Inject variable
46-
'@root-entry-name: default;',
47-
// Point to origin file
48-
"@import './index';",
49-
].join('\n'),
50-
);
51-
}
52-
}
53-
54-
patchEntry(path.join(process.cwd(), 'lib'));
55-
patchEntry(path.join(process.cwd(), 'es'));
5638
}
5739

5840
function buildThemeFile(theme, vars) {
@@ -154,6 +136,7 @@ function needTransformStyle(content) {
154136

155137
module.exports = {
156138
compile: {
139+
includeLessFile: [/(\/|\\)components(\/|\\)style(\/|\\)default.less$/],
157140
transformTSFile(file) {
158141
if (isComponentStyleEntry(file)) {
159142
let content = file.contents.toString();
@@ -162,8 +145,7 @@ module.exports = {
162145
const cloneFile = file.clone();
163146

164147
// Origin
165-
content = content.replace('../../style/index.less', '../../style/index-default.less');
166-
// content = content.replace('./index.less', './index-default.less');
148+
content = content.replace('../../style/index.less', '../../style/default.less');
167149
cloneFile.contents = Buffer.from(content);
168150

169151
return cloneFile;

.github/workflows/test.yml

+40
Original file line numberDiff line numberDiff line change
@@ -453,4 +453,44 @@ jobs:
453453
run: npm test
454454
env:
455455
LIB_DIR: dist
456+
needs: setup
457+
458+
style:
459+
name: style compile
460+
runs-on: ubuntu-latest
461+
steps:
462+
- name: checkout
463+
uses: actions/checkout@master
464+
465+
- name: restore cache from package-lock.json
466+
uses: actions/cache@v2
467+
with:
468+
path: package-temp-dir
469+
key: lock-${{ github.sha }}
470+
471+
- name: restore cache from node_modules
472+
uses: actions/cache@v2
473+
with:
474+
path: node_modules
475+
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
476+
477+
- name: compile
478+
run: npm run compile
479+
480+
- name: dist
481+
run: npm run dist
482+
env:
483+
NODE_OPTIONS: --max_old_space_size=4096
484+
485+
- name: lessc default
486+
run: npx lessc --js ./dist/antd.less
487+
488+
- name: lessc dark
489+
run: npx lessc --js ./dist/antd.dark.less
490+
491+
- name: lessc variable
492+
run: npx lessc --js ./dist/antd.variable.less
493+
494+
- name: lessc component
495+
run: npx lessc --js ./es/button/style/index.less
456496
needs: setup

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"devDependencies": {
154154
"@ant-design/bisheng-plugin": "^2.3.0",
155155
"@ant-design/hitu": "^0.0.0-alpha.13",
156-
"@ant-design/tools": "^14.0.0-alpha.2",
156+
"@ant-design/tools": "^14.0.0-alpha.3",
157157
"@docsearch/css": "^3.0.0-alpha.39",
158158
"@docsearch/react": "^3.0.0-alpha.39",
159159
"@qixian.cs/github-contributors-list": "^1.0.3",

tests/dekko/lib.test.js

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ function getFileName(filePath) {
88

99
$('lib').isDirectory().hasFile('index.js').hasFile('index.d.ts');
1010

11+
$('lib/style').isDirectory().hasFile('index.css').hasFile('default.css');
12+
1113
$('lib/*')
1214
.filter(
1315
filename =>

0 commit comments

Comments
 (0)