From 3baca257253abf2e105047c8466b9a8d7ebaed5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Sat, 18 Jan 2020 08:07:38 +0800
Subject: [PATCH] fix(create-app): should set css preprocessor

---
 .../templates/src/demo-button/index.less      |  3 ---
 .../templates/src/demo-button/index.vue       |  2 +-
 .../generators/templates/src/style/base.less  |  5 -----
 .../generators/templates/src/style/var.less   |  2 --
 .../generators/templates/vant.config.js       |  3 +++
 packages/create-vant-cli-app/src/generator.ts | 19 ++++++++++++-------
 6 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 packages/create-vant-cli-app/generators/templates/src/demo-button/index.less
 delete mode 100644 packages/create-vant-cli-app/generators/templates/src/style/base.less
 delete mode 100644 packages/create-vant-cli-app/generators/templates/src/style/var.less

diff --git a/packages/create-vant-cli-app/generators/templates/src/demo-button/index.less b/packages/create-vant-cli-app/generators/templates/src/demo-button/index.less
deleted file mode 100644
index 6446ebfd4..000000000
--- a/packages/create-vant-cli-app/generators/templates/src/demo-button/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.test {
-  color: red;
-}
diff --git a/packages/create-vant-cli-app/generators/templates/src/demo-button/index.vue b/packages/create-vant-cli-app/generators/templates/src/demo-button/index.vue
index 5ea80a62b..e5e9e8947 100644
--- a/packages/create-vant-cli-app/generators/templates/src/demo-button/index.vue
+++ b/packages/create-vant-cli-app/generators/templates/src/demo-button/index.vue
@@ -18,7 +18,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="<%= cssLang %>">
 .demo-button {
   min-width: 120px;
   color: #fff;
diff --git a/packages/create-vant-cli-app/generators/templates/src/style/base.less b/packages/create-vant-cli-app/generators/templates/src/style/base.less
deleted file mode 100644
index 880da5087..000000000
--- a/packages/create-vant-cli-app/generators/templates/src/style/base.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "./var.less";
-
-body {
-  color: @text-color;
-}
diff --git a/packages/create-vant-cli-app/generators/templates/src/style/var.less b/packages/create-vant-cli-app/generators/templates/src/style/var.less
deleted file mode 100644
index f636b24d8..000000000
--- a/packages/create-vant-cli-app/generators/templates/src/style/var.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@primary-color: #f44;
-@text-color: #4a4a4a;
diff --git a/packages/create-vant-cli-app/generators/templates/vant.config.js b/packages/create-vant-cli-app/generators/templates/vant.config.js
index aa6acd131..743235e47 100644
--- a/packages/create-vant-cli-app/generators/templates/vant.config.js
+++ b/packages/create-vant-cli-app/generators/templates/vant.config.js
@@ -1,6 +1,9 @@
 module.exports = {
   name: '<%= name %>',
   build: {
+    css: {
+      preprocessor: '<%= preprocessor %>',
+    },
     site: {
       publicPath: '/<%= name %>/'
     }
diff --git a/packages/create-vant-cli-app/src/generator.ts b/packages/create-vant-cli-app/src/generator.ts
index 571b4c4df..110e8060c 100644
--- a/packages/create-vant-cli-app/src/generator.ts
+++ b/packages/create-vant-cli-app/src/generator.ts
@@ -17,6 +17,7 @@ const PROMPTS = [
 export class VanGenerator extends Generator {
   inputs = {
     name: '',
+    cssLang: '',
     preprocessor: ''
   };
 
@@ -32,8 +33,12 @@ export class VanGenerator extends Generator {
   }
 
   async prompting() {
-    return this.prompt(PROMPTS).then(inputs => {
-      this.inputs.preprocessor = inputs.preprocessor as string;
+    return this.prompt<Record<string, string>>(PROMPTS).then(inputs => {
+      const preprocessor = inputs.preprocessor.toLowerCase();
+      const cssLang = preprocessor === 'sass' ? 'scss' : preprocessor;
+
+      this.inputs.cssLang = cssLang;
+      this.inputs.preprocessor = preprocessor;
     });
   }
 
@@ -44,21 +49,21 @@ export class VanGenerator extends Generator {
       this.fs.copy(join(TEMPLATES, from), this.destinationPath(to || from));
     };
 
-    const copyTpl = (name: string, target?: string) => {
+    const copyTpl = (from: string, to?: string) => {
       this.fs.copyTpl(
-        join(TEMPLATES, name),
-        this.destinationPath(target || name),
+        join(TEMPLATES, from),
+        this.destinationPath(to || from),
         this.inputs
       );
     };
 
     copyTpl('package.json.tpl', 'package.json');
     copyTpl('vant.config.js');
+    copyTpl('src/**/*', 'src');
+    copyTpl('docs/**/*', 'docs');
     copy('babel.config.js');
     copy('gitignore.tpl', '.gitignore');
     copy('eslintignore.tpl', '.eslintignore');
-    copy('src/**/*', 'src');
-    copy('docs/**/*', 'docs');
   }
 
   install() {