fix: uni.scss unit 'px' deletion

# Conflicts:
#	generator.js

generator.js

@@ -4,7 +4,7 @@ const fse = require('fs-extra')
 
 const isBinary = require('isbinaryfile')
 
-async function generate (dir, files, base = '', rootOptions = {}) {
+async function generate(dir, files, base = '', rootOptions = {}) {
   const glob = require('glob')
 
   glob.sync('**/*', {
@@ -33,23 +33,32 @@ async function generate (dir, files, base = '', rootOptions = {}) {
 }
 
 module.exports = (api, options, rootOptions) => {
+  const templateWithSass = [
+    'dcloudio/hello-uniapp',
+    'dcloudio/uni-template-news'
+  ]
   api.extendPackage(pkg => {
     return {
-      dependencies: {
-        'regenerator-runtime': '^0.12.1',// 锁定版本，避免高版本在小程序中出错
-        '@dcloudio/uni-helper-json': '*'
-      },
       devDependencies: {
-        "@babel/runtime": "~7.12.0",// 临时指定版本，7.13.x 会报错
+        '@dcloudio/uni-helper-json': '*',
-        'postcss-comment': '^2.0.0',
+        '@dcloudio/types': '^3.3.2',
-        '@dcloudio/types': '*',
+        'postcss-comment': '^2.0.0'
-        'miniprogram-api-typings': '*',
-        'mini-types': '*'
       }
     }
   })
+  api.extendPackage(pkg => {
+    return {
+      dependencies: {
+        'vue': '>= 2.6.14 < 2.7'
+      },
+      devDependencies: {
+        'vue-template-compiler': '>= 2.6.14 < 2.7',
+      }
+    }
+  }, { forceOverwrite: true })
   if (options.template === 'default-ts') { // 启用 typescript
     api.extendPackage(pkg => {
+      const isV4 = api.cliVersion.split('.')[0] === '4'
       return {
         dependencies: {
           'vue-class-component': '^6.3.2',
@@ -57,17 +66,17 @@ module.exports = (api, options, rootOptions) => {
         },
         devDependencies: {
           '@babel/plugin-syntax-typescript': '^7.2.0',
-          '@vue/cli-plugin-typescript': '*',
+          '@vue/cli-plugin-typescript': '~' + api.cliServiceVersion,
-          'typescript': api.hasPlugin('eslint') ? '~3.1.1' : '^3.0.0'
+          'typescript': isV4 ? '~4.1.5' : '~4.5.5'
         }
       }
     })
-  } else if (options.template === 'dcloudio/uni-template-news') {
+  } else if (templateWithSass.includes(options.template)) {
     api.extendPackage(pkg => {
       return {
         devDependencies: {
-          'node-sass': '^4.11.0',
+          'sass': '^1.49.8',
-          'sass-loader': '^7.1.0'
+          'sass-loader': '^8.0.2'
         }
       }
     })
@@ -87,6 +96,17 @@ module.exports = (api, options, rootOptions) => {
     } else if (template === 'default-ts') {
       await generate(path.resolve(__dirname, './template/common-ts'), files)
       await generate(path.resolve(__dirname, './template/default-ts'), files, base, rootOptions)
+
+      // default-ts 模板删除 jsconfig.json
+      process.nextTick(() => {
+        const folderPath = path.resolve(process.cwd(), rootOptions.projectName)
+        const jsconfigPath = path.resolve(folderPath, './jsconfig.json')
+        const tsconfigPath = path.resolve(folderPath, './tsconfig.json')
+
+        if (fs.existsSync(jsconfigPath) && fs.existsSync(tsconfigPath)) {
+          fs.unlinkSync(jsconfigPath)
+        }
+      })
     } else {
       const ora = require('ora')
       const home = require('user-home')
@@ -135,7 +155,7 @@ module.exports = (api, options, rootOptions) => {
       const dirNames = ['cloudfunctions-aliyun', 'cloudfunctions-tcb']
       dirNames.forEach(dirName => {
         const dirPath = path.join(tmp, './', dirName)
-        if(fs.existsSync(dirPath)) {
+        if (fs.existsSync(dirPath)) {
           fse.moveSync(dirPath, path.join(tmp, '../', dirName), {
             overwrite: true
           })

preset.json

@@ -2,13 +2,13 @@
     "useConfigFiles": false,
     "plugins": {
         "@dcloudio/vue-cli-plugin-uni": {
-            "version": "^2.0.0-22420190823018"
+            "version": "^2.0.2-3061420221215001"
         },
         "@dcloudio/vue-cli-plugin-uni-optimize": {
-            "version": "^2.0.0-22420190823018"
+            "version": "^2.0.2-3061420221215001"
         },
         "@dcloudio/vue-cli-plugin-hbuilderx": {
-            "version": "^2.0.0-22420190823018"
+            "version": "^2.0.2-3061420221215001"
         },
         "@vue/cli-plugin-babel": {
             "presets": [

template/common-ts/tsconfig.json

@@ -14,9 +14,7 @@
     "baseUrl": ".",
     "types": [
       "webpack-env",
-      "@dcloudio/types",
+      "@dcloudio/types"
-      "miniprogram-api-typings",
-      "mini-types"
     ],
     "paths": {
       "@/*": [
@@ -33,6 +31,7 @@
   "exclude": [
     "node_modules",
     "unpackage",
+    "dist",
     "src/**/*.nvue"
   ]
 }

template/common/babel.config.js

@@ -1,3 +1,4 @@
+const webpack = require('webpack')
 const plugins = []
 
 if (process.env.UNI_OPT_TREESHAKINGNG) {
@@ -34,7 +35,7 @@ if (
         }
       }
     ])
-  } catch (e) {}
+  } catch (e) { }
 }
 
 process.UNI_LIBRARIES = process.UNI_LIBRARIES || ['@dcloudio/uni-ui']
@@ -49,15 +50,32 @@ process.UNI_LIBRARIES.forEach(libraryName => {
     }
   ])
 })
-module.exports = {
+
+if (process.env.UNI_PLATFORM !== 'h5') {
+  plugins.push('@babel/plugin-transform-runtime')
+}
+
+const config = {
   presets: [
     [
       '@vue/app',
       {
-        modules: 'commonjs',
+        modules: webpack.version[0] > 4 ? 'auto' : 'commonjs',
         useBuiltIns: process.env.UNI_PLATFORM === 'h5' ? 'usage' : 'entry'
       }
     ]
   ],
   plugins
 }
+
+const UNI_H5_TEST = '**/@dcloudio/uni-h5/dist/index.umd.min.js'
+if (process.env.NODE_ENV === 'production') {
+  config.overrides = [{
+    test: UNI_H5_TEST,
+    compact: true,
+  }]
+} else {
+  config.ignore = [UNI_H5_TEST]
+}
+
+module.exports = config

template/common/postcss.config.js

@@ -1,5 +1,6 @@
 const path = require('path')
-module.exports = {
+const webpack = require('webpack')
+const config = {
   parser: require('postcss-comment'),
   plugins: [
     require('postcss-import')({
@@ -20,3 +21,7 @@ module.exports = {
     require('@dcloudio/vue-cli-plugin-uni/packages/postcss')
   ]
 }
+if (webpack.version[0] > 4) {
+  delete config.parser
+}
+module.exports = config

template/common/public/index.html

@@ -8,9 +8,6 @@
             <%= htmlWebpackPlugin.options.title %>
         </title>
         <script>
-            document.addEventListener('DOMContentLoaded', function() {
-                document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-            })
             var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
             document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
         </script>

template/common/shims-uni.d.ts

@@ -0,0 +1,11 @@
+/// <reference types='@dcloudio/types' />
+import Vue from 'vue'
+declare module "vue/types/options" {
+  type Hooks = App.AppInstance & Page.PageInstance;
+  interface ComponentOptions<V extends Vue> extends Hooks {
+    /**
+     * 组件类型
+     */
+    mpType?: string;
+  }
+}

template/common/shims-vue.d.ts

@@ -0,0 +1,4 @@
+declare module "*.vue" {
+  import Vue from 'vue'
+  export default Vue
+}

template/common/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "types": [
-      "@dcloudio/types",
-      "miniprogram-api-typings",
-      "mini-types"
-    ]
-  }
-}

template/default-ts/main.ts

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 import App from './App.vue'
+import './uni.promisify.adaptor'
 
 Vue.config.productionTip = false
 
-new App().$mount()
+const app = new (typeof App === 'function' ? App : Vue.extend(Object.assign({ mpType: 'app' }, App)))
+app.$mount();

template/default-ts/pages/index/index.vue

@@ -9,6 +9,7 @@
 
 <script lang="ts">
   import Vue from 'vue';
+
 	export default Vue.extend({
 		data() {
 			return {

template/default-ts/sfc.d.ts

@@ -1,4 +0,0 @@
-declare module "*.vue" {
-    import Vue from 'vue'
-    export default Vue
-}

template/default-ts/uni.promisify.adaptor.ts

@@ -0,0 +1,10 @@
+uni.addInterceptor({
+  returnValue (res) {
+    if (!(!!res && (typeof res === "object" || typeof res === "function") && typeof res.then === "function")) {
+      return res;
+    }
+    return new Promise((resolve, reject) => {
+      res.then((res: [unknown, unknown]) => res[0] ? reject(res[0]) : resolve(res[1]));
+    });
+  },
+});

template/default-ts/uni.scss

@@ -21,56 +21,56 @@ $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
 
 /* 文字基本颜色 */
-$uni-text-color:#333;//基本色
+$uni-text-color: #333; // 基本色
-$uni-text-color-inverse:#fff;//反色
+$uni-text-color-inverse: #fff; // 反色
-$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-grey: #999; // 辅助灰色，如加载更多的提示信息
 $uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
+$uni-text-color-disable: #c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color:#ffffff;
+$uni-bg-color: #fff;
-$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-grey: #f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-hover: #f1f1f1; // 点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 0.4); // 遮罩颜色
 
 /* 边框颜色 */
-$uni-border-color:#c8c7cc;
+$uni-border-color: #c8c7cc;
 
 /* 尺寸变量 */
 
 /* 文字尺寸 */
-$uni-font-size-sm:24rpx;
+$uni-font-size-sm: 12px;
-$uni-font-size-base:28rpx;
+$uni-font-size-base: 14px;
-$uni-font-size-lg:32rpx;
+$uni-font-size-lg: 16px;
 
 /* 图片尺寸 */
-$uni-img-size-sm:40rpx;
+$uni-img-size-sm: 20px;
-$uni-img-size-base:52rpx;
+$uni-img-size-base: 26px;
-$uni-img-size-lg:80rpx;
+$uni-img-size-lg: 40px;
 
 /* Border Radius */
-$uni-border-radius-sm: 4rpx;
+$uni-border-radius-sm: 2px;
-$uni-border-radius-base: 6rpx;
+$uni-border-radius-base: 3px;
-$uni-border-radius-lg: 12rpx;
+$uni-border-radius-lg: 6px;
 $uni-border-radius-circle: 50%;
 
 /* 水平间距 */
-$uni-spacing-row-sm: 10px;
+$uni-spacing-row-sm: 5px;
-$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-base: 10px;
-$uni-spacing-row-lg: 30rpx;
+$uni-spacing-row-lg: 15px;
 
 /* 垂直间距 */
-$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-sm: 4px;
-$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-base: 8px;
-$uni-spacing-col-lg: 24rpx;
+$uni-spacing-col-lg: 12px;
 
 /* 透明度 */
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
+$uni-color-title: #2c405a; // 文章标题颜色
-$uni-font-size-title:40rpx;
+$uni-font-size-title: 20px;
-$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-color-subtitle: #555; // 二级标题颜色
-$uni-font-size-subtitle:36rpx;
+$uni-font-size-subtitle: 18px;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-color-paragraph: #3f536e; // 文章段落颜色
-$uni-font-size-paragraph:30rpx;
+$uni-font-size-paragraph: 15px;

template/default/main.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import App from './App'
+import './uni.promisify.adaptor'
 
 Vue.config.productionTip = false
 

template/default/uni.promisify.adaptor.js

@@ -0,0 +1,10 @@
+uni.addInterceptor({
+  returnValue (res) {
+    if (!(!!res && (typeof res === "object" || typeof res === "function") && typeof res.then === "function")) {
+      return res;
+    }
+    return new Promise((resolve, reject) => {
+      res.then((res) => res[0] ? reject(res[0]) : resolve(res[1]));
+    });
+  },
+});

template/default/uni.scss

@@ -21,56 +21,56 @@ $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;
 
 /* 文字基本颜色 */
-$uni-text-color:#333;//基本色
+$uni-text-color: #333; // 基本色
-$uni-text-color-inverse:#fff;//反色
+$uni-text-color-inverse: #fff; // 反色
-$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-grey: #999; // 辅助灰色，如加载更多的提示信息
 $uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
+$uni-text-color-disable: #c0c0c0;
 
 /* 背景颜色 */
-$uni-bg-color:#ffffff;
+$uni-bg-color: #fff;
-$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-grey: #f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-hover: #f1f1f1; // 点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 0.4); // 遮罩颜色
 
 /* 边框颜色 */
-$uni-border-color:#c8c7cc;
+$uni-border-color: #c8c7cc;
 
 /* 尺寸变量 */
 
 /* 文字尺寸 */
-$uni-font-size-sm:24rpx;
+$uni-font-size-sm: 12px;
-$uni-font-size-base:28rpx;
+$uni-font-size-base: 14px;
-$uni-font-size-lg:32rpx;
+$uni-font-size-lg: 16px;
 
 /* 图片尺寸 */
-$uni-img-size-sm:40rpx;
+$uni-img-size-sm: 20px;
-$uni-img-size-base:52rpx;
+$uni-img-size-base: 26px;
-$uni-img-size-lg:80rpx;
+$uni-img-size-lg: 40px;
 
 /* Border Radius */
-$uni-border-radius-sm: 4rpx;
+$uni-border-radius-sm: 2px;
-$uni-border-radius-base: 6rpx;
+$uni-border-radius-base: 3px;
-$uni-border-radius-lg: 12rpx;
+$uni-border-radius-lg: 6px;
 $uni-border-radius-circle: 50%;
 
 /* 水平间距 */
-$uni-spacing-row-sm: 10px;
+$uni-spacing-row-sm: 5px;
-$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-base: 10px;
-$uni-spacing-row-lg: 30rpx;
+$uni-spacing-row-lg: 15px;
 
 /* 垂直间距 */
-$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-sm: 4px;
-$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-base: 8px;
-$uni-spacing-col-lg: 24rpx;
+$uni-spacing-col-lg: 12px;
 
 /* 透明度 */
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
-$uni-color-title: #2C405A; // 文章标题颜色
+$uni-color-title: #2c405a; // 文章标题颜色
-$uni-font-size-title:40rpx;
+$uni-font-size-title: 20px;
-$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-color-subtitle: #555; // 二级标题颜色
-$uni-font-size-subtitle:36rpx;
+$uni-font-size-subtitle: 18px;
-$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-color-paragraph: #3f536e; // 文章段落颜色
-$uni-font-size-paragraph:30rpx;
+$uni-font-size-paragraph: 15px;

yarn.lock

@@ -3,8 +3,8 @@
 
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
+  version "3.0.1"
-  resolved "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
 
 ansi-styles@^3.2.1:
   version "3.2.1"
@@ -355,8 +355,8 @@ inherits@~2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
 
 ini@^1.3.4:
-  version "1.3.5"
+  version "1.3.8"
-  resolved "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
 
 is-natural-number@^4.0.1:
   version "4.0.1"