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

build: correct css not generated #1811

Merged
merged 3 commits into from
Jul 4, 2024
Merged

build: correct css not generated #1811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef17ee7
build: correct css not generated
cipchk Jul 3, 2024
de9930e
chore: fix build
cipchk Jul 3, 2024
1f427f5
chore: fix build
cipchk Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions packages/abc/st/test/st.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,31 +750,6 @@ describe('abc: st', () => {
.asyncEnd();
}));
});
// TODO: 当前版本自动设置，无须参与计算
xdescribe('[fixed]', () => {
it('should be fixed left column', fakeAsync(() => {
page.updateColumn([
{ title: '1', index: 'id', fixed: 'left', width: '100px' },
{ title: '2', index: 'id', fixed: 'left', width: '100px' },
{ title: '3', index: 'id', fixed: 'left', width: '100px' }
]);
expect(page.getCell(1, 1).style.left).toBe('0px');
expect(page.getCell(1, 2).style.left).toBe('100px');
expect(page.getCell(1, 3).style.left).toBe('200px');
page.asyncEnd();
}));
it('should be fixed right column', fakeAsync(() => {
page.updateColumn([
{ title: '1', index: 'id', fixed: 'right', width: '100px' },
{ title: '2', index: 'id', fixed: 'right', width: '100px' },
{ title: '3', index: 'id', fixed: 'right', width: '100px' }
]);
expect(page.getCell(1, 1).style.right).toBe('200px');
expect(page.getCell(1, 2).style.right).toBe('100px');
expect(page.getCell(1, 3).style.right).toBe('0px');
page.asyncEnd();
}));
});
describe('[Mulit Headers]', () => {
it('should be working', fakeAsync(() => {
page.updateColumn([
Expand Down
3 changes: 1 addition & 2 deletions scripts/build/generate-css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ async function genCss(name, min) {
less.render
.call(less, content, {
plugins,
paths: ['node_modules/'],
javascriptEnabled: true,
paths: [path.join(__dirname, '../../node_modules/')]
})
.then(({ css }) => {
const savePath = path.join(ROOT_DIR, `theme/${name}${min ? '.min' : ''}.css`);
Expand Down
3 changes: 3 additions & 0 deletions scripts/ci/build-artifacts-site.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ echo "https://${ACCESS_TOKEN}:@github.com" > .git/credentials

if [[ $(git ls-remote origin "refs/tags/${buildTagName}") ]]; then
echo "removed tag because tag is already published"
git tag -d ${buildTagName}
git push --delete origin ${buildTagName}
git push origin :refs/tags/${buildTagName}
sleep 2
fi

echo "Git configuration has been updated to match the last commit author. Publishing now.."
Expand Down
3 changes: 2 additions & 1 deletion scripts/ci/build-artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ echo "https://${ACCESS_TOKEN}:@github.com" > .git/credentials

if [[ $(git ls-remote origin "refs/tags/${buildTagName}") ]]; then
echo "removed tag because tag is already published"
git tag -d ${buildTagName}
git push --delete origin ${buildTagName}
git push origin :refs/tags/${buildTagName}
sleep 5
sleep 2
fi

echo "Git configuration has been updated to match the last commit author. Publishing now.."
Expand Down
5 changes: 2 additions & 3 deletions scripts/ci/build-delon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ buildLess() {
node ./scripts/build/copy-less.js
echo 'fix zorro path...'
node ./scripts/build/fix-zorro-path.js
# TODO: https://github.com/NG-ZORRO/ng-zorro-antd/issues/8618
# echo 'build full css...'
# node ./scripts/build/generate-css.js
echo 'build full css...'
node ./scripts/build/generate-css.js
}

addBanners() {
Expand Down
Loading