From ba9ccd7e1e5f47d172fa683be5e8ac5262f69d35 Mon Sep 17 00:00:00 2001
From: cipchk <cipchk@qq.com>
Date: Tue, 4 Dec 2018 21:46:56 +0800
Subject: [PATCH] releases: 7.0.0-rc.1

---
 components/schematics/shell/custom-theme.ts | 11 +++--------
 package.json                                |  2 +-
 scripts/build/build.sh                      | 12 ++++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/schematics/shell/custom-theme.ts b/components/schematics/shell/custom-theme.ts
index a16f961..c260f88 100644
--- a/components/schematics/shell/custom-theme.ts
+++ b/components/schematics/shell/custom-theme.ts
@@ -1,15 +1,10 @@
-import {Project} from '../utils/devkit-utils/config';
+import { Project } from '../utils/devkit-utils/config';
 
 /** Create custom theme for the given application configuration. */
 export function createCustomTheme(project: Project) {
   const name = project.name || 'app';
-  return `// cli v6 bug，暂不支持 ~weui 写法，相关ISSUES
-// - [#10717](https://github.com/angular/angular-cli/issues/10717)
-// - [#10721](https://github.com/angular/angular-cli/issues/10721)
-// @import '~weui/src/style/weui.less';
-// @import '~ngx-weui/index';
-@import 'node_modules/weui/src/style/weui.less';
-@import 'node_modules/ngx-weui/index';
+  return `@import '~weui/src/style/weui.less';
+@import '~ngx-weui/index';
 
 // [自定义主题](https://cipchk.github.io/ngx-weui/#/docs/style)
 // @weuiFontDefault: "Helvetica Neue";
diff --git a/package.json b/package.json
index 0474358..17284e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-weui",
-  "version": "7.0.0-rc.0",
+  "version": "7.0.0-rc.1",
   "description": "weui for angular",
   "repository": {
     "type": "git",
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index 11f5a28..62b62d7 100644
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -26,6 +26,15 @@ updateVersionReferences() {
   )
 }
 
+buildSchematics() {
+  echo '>> Compiling schematics'
+  schematics_source_dir=${PWD}/components/schematics/
+  schematics_dist_dir=${PWD}/publish/schematics/
+  $(npm bin)/tsc -p ${schematics_source_dir}tsconfig.json
+  echo '>>>> Coping all json files'
+  rsync -am --include="*.json" --include="*/" --exclude=* ${schematics_source_dir}/ ${schematics_dist_dir}/
+}
+
 PWD=`pwd`
 VERSION=$(node -p "require('./package.json').version")
 SOURCE=${PWD}/components
@@ -49,5 +58,8 @@ updateVersionReferences ${DIST}
 echo ">> generate css"
 node ./scripts/build/generate-css.js
 
+echo 'Build schematics'
+buildSchematics
+
 # copy readme
 cp README.md ${DIST}/README.md
\ No newline at end of file