Skip to content

Commit 316da32

Browse files
cipchkclaude
andcommitted
fix(theme): replace cross-package relative style imports with package-name imports
Change all relative path imports (`../abc/`, `../chart/`, `../../../form/`) to package-name imports (`@delon/abc/`, `@delon/form/`) to fix pnpm strict module resolution. - Remove `@import '../chart/index.less'` from default.less/variable.less (chart is not a declared dependency of theme) - Add `@import './theme-default.less'` to abc/index.less for self-contained styles - Add `dist/` to generate-css.js paths (ordered before node_modules/) to resolve package-name imports during build - All 8 theme CSS files compile successfully with zero errors Close ng-alain/ng-alain#2631 Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 569e8ac commit 316da32

9 files changed

Lines changed: 13 additions & 11 deletions

File tree

packages/abc/index.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import './theme-default.less';
12
@import './st/style/index.less';
23
@import './sv/style/index.less';
34
@import './se/style/index.less';

packages/theme/default.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
@import './system/index.less';
33
@import './layout-default/style/index.less';
44
@import './layout-blank/style/index.less';
5-
@import '../abc/index.less';
6-
@import '../chart/index.less';
5+
@import '@delon/abc/index.less';
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import '../../../form/src/style/index.less';
2-
@import '../../../acl/src/style/index.less';
1+
@import '@delon/form/src/style/index.less';
2+
@import '@delon/acl/src/style/index.less';
33
@import '../../setting-drawer/style/index.less';
44
@import '../../theme-btn/style/index.less';
55
@import '../../src/pipes/yn/style/index.less';

packages/theme/theme-compact.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
@import './system/theme-compact.less';
44
@import './layout-default/style/theme-compact.less';
55
@import './layout-blank/style/theme-compact.less';
6-
@import '../abc/theme-compact.less';
6+
@import '@delon/abc/theme-compact.less';

packages/theme/theme-dark.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
@import './system/theme-dark.less';
44
@import './layout-default/style/theme-dark.less';
55
@import './layout-blank/style/theme-dark.less';
6-
@import '../abc/theme-dark.less';
6+
@import '@delon/abc/theme-dark.less';

packages/theme/theme-default.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
@import './system/theme-default.less';
44
@import './layout-default/style/theme-default.less';
55
@import './layout-blank/style/theme-default.less';
6-
@import '../abc/theme-default.less';
6+
@import '@delon/abc/theme-default.less';

packages/theme/theme-variable.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
@import './system/theme-variable.less';
44
@import './layout-default/style/theme-variable.less';
55
@import './layout-blank/style/theme-variable.less';
6-
@import '../abc/theme-variable.less';
6+
@import '@delon/abc/theme-variable.less';

packages/theme/variable.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
@import './system/index.less';
33
@import './layout-default/style/index.less';
44
@import './layout-blank/style/index.less';
5-
@import '../abc/index.less';
6-
@import '../chart/index.less';
5+
@import '@delon/abc/index.less';

scripts/build/generate-css.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ async function genCss(name, min) {
2121
less.render
2222
.call(less, content, {
2323
plugins,
24-
paths: [path.join(__dirname, '../../node_modules/')]
24+
paths: [
25+
path.join(__dirname, '../../dist/'),
26+
path.join(__dirname, '../../node_modules/')
27+
]
2528
})
2629
.then(({ css }) => {
2730
const savePath = path.join(ROOT_DIR, `theme/${name}${min ? '.min' : ''}.css`);

0 commit comments

Comments
 (0)