From 5b02e48159e0bccade02f7a30cecbf96b7101ca0 Mon Sep 17 00:00:00 2001
From: Wendell <wendzhue@gmail.com>
Date: Sun, 21 Apr 2019 12:33:18 +0800
Subject: [PATCH] fix: fix patch not included (#3317)

* fix: fix patch not included

* chore: move core/style

* fix: compile style script
---
 components/components.less                             | 1 -
 components/ng-zorro-antd.less                          | 4 ++--
 components/style/entry.less                            | 2 ++
 components/{core/style/index.less => style/patch.less} | 2 +-
 docs/getting-started.en-US.md                          | 2 +-
 docs/getting-started.zh-CN.md                          | 2 +-
 scripts/build/compile-styles.js                        | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 components/style/entry.less
 rename components/{core/style/index.less => style/patch.less} (98%)

diff --git a/components/components.less b/components/components.less
index 1a1e6687ecb..993a0a8eb3b 100644
--- a/components/components.less
+++ b/components/components.less
@@ -11,7 +11,6 @@
 @import "./checkbox/style/entry.less";
 @import "./collapse/style/entry.less";
 @import "./comment/style/entry.less";
-@import "./core/style/index.less";
 @import "./date-picker/style/entry.less";
 @import "./divider/style/entry.less";
 @import "./drawer/style/entry.less";
diff --git a/components/ng-zorro-antd.less b/components/ng-zorro-antd.less
index 303f5cb2e24..65652512e39 100644
--- a/components/ng-zorro-antd.less
+++ b/components/ng-zorro-antd.less
@@ -1,2 +1,2 @@
-@import "./style/index.less";
-@import "./components.less";
\ No newline at end of file
+@import "./style/entry.less";
+@import "./components.less";
diff --git a/components/style/entry.less b/components/style/entry.less
new file mode 100644
index 00000000000..96cebe33bff
--- /dev/null
+++ b/components/style/entry.less
@@ -0,0 +1,2 @@
+@import './index.less';
+@import './patch.less';
diff --git a/components/core/style/index.less b/components/style/patch.less
similarity index 98%
rename from components/core/style/index.less
rename to components/style/patch.less
index e8f3a418ee6..ab729331500 100644
--- a/components/core/style/index.less
+++ b/components/style/patch.less
@@ -1,4 +1,4 @@
-@import "../../style/themes/default";
+@import './themes/default.less';
 
 // cdk overlay
 .cdk-overlay-container {
diff --git a/docs/getting-started.en-US.md b/docs/getting-started.en-US.md
index 8eaeced853b..12a3199054e 100755
--- a/docs/getting-started.en-US.md
+++ b/docs/getting-started.en-US.md
@@ -173,7 +173,7 @@ In style.css:
 If you want to import several components, it is recommended to use less instead of CSS. In styles.less:
 
 ```less
-@import "~ng-zorro-antd/style/index.less"; /* Import basic styles */
+@import "~ng-zorro-antd/style/entry.less"; /* Import basic styles */
 @import "~ng-zorro-antd/button/style/entry.less"; /* Import styles of the component */
 ```
 
diff --git a/docs/getting-started.zh-CN.md b/docs/getting-started.zh-CN.md
index 2a0fdf3cdae..283705c4a95 100755
--- a/docs/getting-started.zh-CN.md
+++ b/docs/getting-started.zh-CN.md
@@ -181,7 +181,7 @@ export class YourModule { }
 另：如果你想单独引入多个组件，我们建议使用 less，在你的 style.less 里导入各个组件的 entry.less 文件：
 
 ```less
-@import "~ng-zorro-antd/style/index.less"; /* 引入基本样式 */
+@import "~ng-zorro-antd/style/entry.less"; /* 引入基本样式 */
 @import "~ng-zorro-antd/button/style/entry.less"; /* 引入组件样式 */
 ```
 
diff --git a/scripts/build/compile-styles.js b/scripts/build/compile-styles.js
index 1b2a81631f4..5dc0038ae77 100644
--- a/scripts/build/compile-styles.js
+++ b/scripts/build/compile-styles.js
@@ -78,8 +78,8 @@ compileLess(lessContent, path.join(targetPath, 'ng-zorro-antd.css'), false);
 compileLess(lessContent, path.join(targetPath, 'ng-zorro-antd.min.css'), true);
 
 // Compile css file that doesn't have component-specific styles.
-const cssIndexPath = path.join(sourcePath, 'style', 'index.less');
-const cssIndex = fs.readFileSync(cssIndexPath, { encoding: 'utf8' }) + `@import '../core/style/index.less';\n`; // Compile patch.
+const cssIndexPath = path.join(sourcePath, 'style', 'entry.less');
+const cssIndex = fs.readFileSync(cssIndexPath, { encoding: 'utf8' });
 compileLess(cssIndex, path.join(targetPath, 'style', 'index.css'), false, true, cssIndexPath).catch(e =>
   console.log(e)
 );