@cloudbase/framework-plugin-low-code 0.6.31 → 0.6.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.31",
+  "version": "0.6.34",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -28,7 +28,8 @@
     "dev": "tsc -w",
     "prebuild": "rm -rf ./lib && rm -rf ./tsconfig.tsbuildinfo && npm run template",
     "build": "tsc",
-    "test": "jest"
+    "test": "jest",
+    "link": "node scripts/link-packages.js"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
@@ -70,6 +71,7 @@
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
+    "@lerna/create-symlink": "^4.0.0",
     "@types/archiver": "^3.1.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -85,4 +87,4 @@
     "jest": "^26.0.1",
     "typescript": "^3.8.3"
   }
-}
+}

package/template/webpack/web.prod.js

@@ -92,22 +92,16 @@ module.exports = function (options) {
             threadMode: true,
             loaders: {
               js: [babelLoader],
-              ts: [
-                babelLoader,
-                typescriptLoader,
-              ],
-            }
-          }
+              ts: [babelLoader, typescriptLoader],
+            },
+          },
         },
       ],
-      threadPool: happyThreadPool
+      threadPool: happyThreadPool,
     }),
     new HappyPack({
       id: TS_LOADER_ID,
-      loaders: [
-        babelLoader,
-        typescriptLoader,
-      ],
+      loaders: [babelLoader, typescriptLoader],
       threadPool: happyThreadPool,
     }),
     new HappyPack({
@@ -125,13 +119,15 @@ module.exports = function (options) {
       filename: '[name].[contenthash].css',
       chunkFilename: '[id].[contenthash].css',
     }),
-    new webpack.DefinePlugin(Object.assign(
-      {
-        'process.env.isMiniprogram': false, // 注入环境变量，用于业务代码判断
-        'process.env.SSR': false,
-      },
-      definePlugin,
-    )),
+    new webpack.DefinePlugin(
+      Object.assign(
+        {
+          'process.env.isMiniprogram': false, // 注入环境变量，用于业务代码判断
+          'process.env.SSR': false,
+        },
+        definePlugin
+      )
+    ),
     new CopyWebpackPlugin({
       patterns: [
         {
@@ -157,6 +153,36 @@ module.exports = function (options) {
       }),
     ]);
   }
+
+  const cssLoaders = [
+    MiniCssExtractPlugin.loader,
+    {
+      loader: 'css-loader',
+      options: {
+        modules: false,
+        importLoaders: 2,
+      },
+    },
+    {
+      loader: 'postcss-loader',
+      options: {
+        postcssOptions: {
+          plugins: [
+            [
+              'postcss-pxtorem',
+              {
+                rootValue: 14,
+                propList: ['*'],
+                // todo
+                selectorBlackList: ['.weui-picker__indicator'],
+              },
+            ],
+          ],
+        },
+      },
+    },
+  ];
+
   return {
     context,
     entry,
@@ -184,7 +210,7 @@ module.exports = function (options) {
       rules: [
         {
           test: /\.vue$/,
-          loader: 'happypack/loader?id=vue'
+          loader: 'happypack/loader?id=vue',
         },
         {
           test: /\.tsx?$/,
@@ -199,32 +225,7 @@ module.exports = function (options) {
         {
           test: /\.(scss|sass)$/,
           use: [
-            MiniCssExtractPlugin.loader,
-            {
-              loader: 'css-loader',
-              options: {
-                modules: false,
-                importLoaders: 2,
-              },
-            },
-            {
-              loader: 'postcss-loader',
-              options: {
-                postcssOptions: {
-                  plugins: [
-                    [
-                      'postcss-pxtorem',
-                      {
-                        rootValue: 14,
-                        propList: ['*'],
-                        // todo
-                        selectorBlackList: ['.weui-picker__indicator'],
-                      },
-                    ],
-                  ],
-                },
-              },
-            },
+            ...cssLoaders,
             {
               loader: 'sass-loader',
               options: {
@@ -234,39 +235,19 @@ module.exports = function (options) {
           ],
         },
         {
-          test: /\.(css|less)$/,
+          test: /\.css$/,
+          use: [...cssLoaders],
+        },
+        {
+          test: /\.less$/,
           use: [
-            MiniCssExtractPlugin.loader,
-            {
-              loader: 'css-loader',
-              options: {
-                modules: false,
-                importLoaders: 2,
-              },
-            },
-            {
-              loader: 'postcss-loader',
-              options: {
-                postcssOptions: {
-                  plugins: [
-                    [
-                      'postcss-pxtorem',
-                      {
-                        rootValue: 14,
-                        propList: ['*'],
-                        // todo
-                        selectorBlackList: ['.weui-picker__indicator'],
-                      },
-                    ],
-                  ],
-                },
-              },
-            },
+            ...cssLoaders,
             {
               loader: 'less-loader',
               options: {
                 lessOptions: {
                   modifyVars: themeVars,
+                  javascriptEnabled: true,
                 },
               },
             },
@@ -310,20 +291,20 @@ module.exports = function (options) {
       },
       ...(isDevelopment
         ? {
-          minimize: false,
-          removeAvailableModules: false,
-          removeEmptyChunks: true,
-        }
+            minimize: false,
+            removeAvailableModules: false,
+            removeEmptyChunks: true,
+          }
         : {
-          minimizer: [
-            new TerserPlugin({
-              test: /\.js(\?.*)?$/i,
-              cache: false,
-              parallel: true,
-              sourceMap: false,
-            }),
-          ],
-        }),
+            minimizer: [
+              new TerserPlugin({
+                test: /\.js(\?.*)?$/i,
+                cache: false,
+                parallel: true,
+                sourceMap: false,
+              }),
+            ],
+          }),
     },
   };
 };

package/template/dist/mp/miniprogram_npm/miniprogram-render/bom/cookie.js

@@ -1,286 +0,0 @@
-const Location = require('./location')
-const cache = require('../util/cache')
-
-class Cookie {
-    constructor(pageName) {
-        const config = cache.getConfig()
-        const runtime = config.runtime || {}
-        this.cookieStore = runtime.cookieStore
-        this.$_pageName = pageName
-
-        if (this.cookieStore !== 'storage' && this.cookieStore !== 'memory') {
-            // 需要全局共享
-            this.$_map = cache.getCookie()
-        } else {
-            this.$_map = {} // 三维数组，domain - path - key
-        }
-    }
-
-    static parse(cookieStr) {
-        if (!cookieStr && typeof cookieStr !== 'string') return null
-
-        cookieStr = cookieStr.trim().split(';')
-
-        // key-value
-        const parseKeyValue = /^([^=;\x00-\x1F]+)=([^;\n\r\0\x00-\x1F]*).*/.exec(cookieStr.shift())
-        if (!parseKeyValue) return null
-
-        const key = (parseKeyValue[1] || '').trim()
-        const value = (parseKeyValue[2] || '').trim()
-
-        // 其他字段
-        let path = null
-        let domain = null
-        let expires = null
-        let maxAge = null
-        let secure = false
-        let httpOnly = false
-
-        for (let item of cookieStr) {
-            item = item.trim()
-            if (!item) continue
-
-            let [key, value] = item.split('=')
-            key = (key || '').trim().toLowerCase()
-            value = (value || '').trim()
-
-            if (!key) continue
-
-            switch (key) {
-            case 'path':
-                if (value[0] === '/') path = value
-                break
-            case 'domain':
-                value = value.replace(/^\./, '').toLowerCase()
-                if (value) domain = value
-                break
-            case 'expires':
-                if (value) {
-                    const timeStamp = Date.parse(value)
-                    if (timeStamp) expires = timeStamp
-                }
-                break
-            case 'max-age':
-                if (/^-?[0-9]+$/.test(value)) maxAge = +value * 1000
-                break
-            case 'secure':
-                secure = true
-                break
-            case 'httponly':
-                httpOnly = true
-                break
-            default:
-                // ignore
-                break
-            }
-        }
-
-        return {
-            key, value, path, domain, expires, maxAge, secure, httpOnly
-        }
-    }
-
-    /**
-     * 判断 domain
-     */
-    $_checkDomain(host, cookieDomain) {
-        if (host === cookieDomain) return true
-
-        const index = host.indexOf(`.${cookieDomain}`)
-
-        return index > 0 && cookieDomain.length + index + 1 === host.length
-    }
-
-    /**
-     * 判断 path
-     */
-    $_checkPath(path, cookiePath) {
-        if (path === cookiePath) return true
-
-        cookiePath = cookiePath === '/' ? '' : cookiePath
-        return path.indexOf(`${cookiePath}/`) === 0
-    }
-
-    /**
-     * 判断过期
-     */
-    $_checkExpires(cookie) {
-        const now = Date.now()
-
-        // maxAge 优先
-        if (cookie.maxAge !== null) return cookie.createTime + cookie.maxAge > now
-
-        // 判断 expires
-        if (cookie.expires !== null) return cookie.expires > now
-
-        return true
-    }
-
-    /**
-     * 设置 cookie
-     */
-    setCookie(cookie, url) {
-        cookie = Cookie.parse(cookie)
-
-        if (!cookie) return
-
-        const {hostname, port, pathname} = Location.$$parse(url)
-        const host = ((hostname || '') + (port ? ':' + port : '')) || ''
-        const path = (pathname || '')[0] === '/' ? pathname : '/'
-
-        if (cookie.domain) {
-            // 判断 domain
-            if (!this.$_checkDomain(host, cookie.domain)) return
-        } else {
-            // 使用 host 作为默认的 domain
-            cookie.domain = host
-        }
-
-        // 需要设置 path 字段的情况，取 url 中除去最后一节的 path
-        if (!cookie.path || cookie.path[0] !== '/') {
-            const lastIndex = path.lastIndexOf('/')
-
-            cookie.path = lastIndex === 0 ? path : path.substr(0, lastIndex)
-        }
-
-        // 存入 cookie
-        const map = this.$_map
-        const cookieDomain = cookie.domain
-        const cookiePath = cookie.path
-        const cookieKey = cookie.key
-
-        if (!map[cookieDomain]) map[cookieDomain] = {}
-        if (!map[cookieDomain][cookiePath]) map[cookieDomain][cookiePath] = {}
-
-        const oldCookie = map[cookieDomain][cookiePath][cookieKey]
-        cookie.createTime = oldCookie && oldCookie.createTime || Date.now()
-
-        if (this.$_checkExpires(cookie)) {
-            // 未过期
-            map[cookieDomain][cookiePath][cookieKey] = cookie
-        } else if (oldCookie) {
-            // 存在旧 cookie，且被设置为已过期
-            delete map[cookieDomain][cookiePath][cookieKey]
-        }
-
-        // 持久化 cookie
-        if (this.cookieStore !== 'memory' && this.cookieStore !== 'globalmemory') {
-            const key = this.cookieStore === 'storage' ? `PAGE_COOKIE_${this.$_pageName}` : 'PAGE_COOKIE'
-            wx.setStorage({
-                key,
-                data: this.serialize(),
-            })
-        }
-    }
-
-    /**
-     * 拉取 cookie
-     */
-    getCookie(url, includeHttpOnly) {
-        const {
-            protocol, hostname, port, pathname
-        } = Location.$$parse(url)
-        const host = ((hostname || '') + (port ? ':' + port : '')) || ''
-        const path = (pathname || '')[0] === '/' ? pathname : '/'
-        const res = []
-
-        const map = this.$_map
-        const domainList = Object.keys(map)
-
-        for (const domainItem of domainList) {
-            // 判断 domain
-            if (this.$_checkDomain(host, domainItem)) {
-                const domainMap = map[domainItem] || {}
-                const pathList = Object.keys(domainMap)
-
-                for (const pathItem of pathList) {
-                    // 判断 path
-                    if (this.$_checkPath(path, pathItem)) {
-                        const pathMap = map[domainItem][pathItem] || {}
-
-                        Object.keys(pathMap).forEach(key => {
-                            const cookie = pathMap[key]
-
-                            if (!cookie) return
-
-                            // 判断协议
-                            if (cookie.secure && protocol !== 'https:' && protocol !== 'wss:') return
-                            if (!includeHttpOnly && cookie.httpOnly && protocol && protocol !== 'http:') return
-
-                            // 判断过期
-                            if (this.$_checkExpires(cookie)) {
-                                res.push(cookie)
-                            } else {
-                                // 过期，删掉
-                                delete map[domainItem][pathItem][key]
-                            }
-                        })
-                    }
-                }
-            }
-        }
-
-        return res
-            .sort((a, b) => {
-                const gap = a.createTime - b.createTime
-
-                if (!gap) {
-                    return a.key < b.key ? -1 : 1
-                } else {
-                    return gap
-                }
-            })
-            .map(cookie => `${cookie.key}=${cookie.value}`)
-            .join('; ')
-    }
-
-    /**
-     * 序列化
-     */
-    serialize() {
-        try {
-            return JSON.stringify(this.$_map)
-        } catch (err) {
-            console.log('cannot serialize the cookie')
-            return ''
-        }
-    }
-
-    /**
-     * 反序列化
-     */
-    deserialize(str) {
-        let map = {}
-        try {
-            map = JSON.parse(str)
-        } catch (err) {
-            console.log('cannot deserialize the cookie')
-            map = {}
-        }
-
-        // 合并 cookie
-        const domainList = Object.keys(map)
-
-        for (const domainItem of domainList) {
-            const domainMap = map[domainItem] || {}
-            const pathList = Object.keys(domainMap)
-
-            for (const pathItem of pathList) {
-                const pathMap = map[domainItem][pathItem] || {}
-
-                Object.keys(pathMap).forEach(key => {
-                    const cookie = pathMap[key]
-
-                    if (!cookie) return
-
-                    // 已存在则不覆盖
-                    if (!this.$_map[domainItem]) this.$_map[domainItem] = {}
-                    if (!this.$_map[domainItem][pathItem]) this.$_map[domainItem][pathItem] = {}
-                    if (!this.$_map[domainItem][pathItem][key]) this.$_map[domainItem][pathItem][key] = cookie
-                })
-            }
-        }
-    }
-}
-
-module.exports = Cookie

package/template/dist/mp/miniprogram_npm/miniprogram-render/bom/history.js

@@ -1,133 +0,0 @@
-/**
- * 暂不维护跳转后页面的历史，不做页面刷新的操作
- */
-const Location = require('./location')
-const EventTarget = require('../event/event-target')
-
-class History extends EventTarget {
-    constructor(location) {
-        super()
-
-        this.$_location = location
-        this.$_stack = [{
-            state: null,
-            title: '',
-            url: location.href,
-        }]
-        this.$_currentIndex = 0
-
-        this.$_location.addEventListener('$_addToHistory', evt => {
-            this.$_currentIndex++
-            this.$_stack = this.$_stack.slice(0, this.$_currentIndex)
-            this.$_stack.push({
-                state: null,
-                title: '',
-                url: evt.href
-            })
-        })
-    }
-
-    /**
-     * 检查是否同源
-     */
-    $_checkOrigin(url) {
-        const {protocol, hostname, port} = Location.$$parse(url)
-
-        return (!protocol || this.$_location.protocol === protocol) && (!hostname || this.$_location.hostname === hostname) && ((!hostname && !port) || this.$_location.port === port)
-    }
-
-    /**
-     * 重置实例
-     */
-    $$reset() {
-        this.$_stack = [{
-            state: null,
-            title: '',
-            url: this.$_location.href,
-        }]
-        this.$_currentIndex = 0
-    }
-
-    /**
-     * 对外属性和方法
-     */
-    get state() {
-        const current = this.$_stack[this.$_currentIndex]
-        return current && current.state || null
-    }
-
-    get length() {
-        return this.$_stack.length
-    }
-
-    back() {
-        this.go(-1)
-    }
-
-    forward() {
-        this.go(1)
-    }
-
-    go(delta) {
-        if (typeof delta === 'number') {
-            const next = this.$_currentIndex + delta
-
-            if (next >= 0 && next < this.$_stack.length && this.$_currentIndex !== next) {
-                this.$_currentIndex = next
-                // 替换 href，但不做跳转（理论上此处应该做跳转，但是在小程序环境里不适合）
-                this.$_location.$$startCheckHash()
-                this.$_location.$$setHrefWithoutCheck(this.$_stack[this.$_currentIndex].url)
-                this.$_location.$$endCheckHash(true) // 因为不跳转，所以要强制触发 hashchange 检测
-
-                this.$$trigger('popstate', {
-                    event: {
-                        state: this.state
-                    }
-                })
-            }
-        } else {
-            // 刷新当前页面
-            this.$_location.reload()
-        }
-    }
-
-    pushState(state = null, title, url) {
-        if (!url || typeof url !== 'string') return
-
-        if (this.$_checkOrigin(url)) {
-            // 同源才允许操作
-            if (title && typeof title === 'string') {
-                // 设置标题
-                wx.setNavigationBarTitle({title})
-            }
-
-
-            this.$_currentIndex++
-            this.$_stack = this.$_stack.slice(0, this.$_currentIndex)
-
-            // 替换 href，但不做跳转
-            this.$_location.$$setHrefWithoutCheck(url)
-
-            this.$_stack.push({state, title, url: this.$_location.href})
-        }
-    }
-
-    replaceState(state = null, title, url) {
-        if (!url || typeof url !== 'string') return
-
-        if (this.$_checkOrigin(url)) {
-            // 同源才允许操作
-            if (title && typeof title === 'string') {
-                // 设置标题
-                wx.setNavigationBarTitle({title})
-            }
-
-            // 替换 href，但不做跳转
-            this.$_location.$$setHrefWithoutCheck(url)
-
-            this.$_stack.splice(this.$_currentIndex, 1, {state, title, url: this.$_location.href})
-        }
-    }
-}
-
-module.exports = History