@cloudbase/framework-plugin-low-code 0.6.32 → 0.6.35

package/lib/builder/config/index.js

@@ -21,12 +21,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sharedMaterialsDir = void 0;
 const path = __importStar(require("path"));
-const os_1 = __importDefault(require("os"));
+const os = __importStar(require("os"));
 __exportStar(require("../../generator/config/index"), exports);
-exports.sharedMaterialsDir = path.join(os_1.default.homedir(), '.weapps-materials');
+exports.sharedMaterialsDir = path.join(os.homedir(), '.weapps-materials');

package/lib/builder/core/copy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../src/builder/core/copy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAM7D,wBAAsB,OAAO,CAC3B,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,kBAAkB,EACrC,OAAO,EAAE;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,iBAwBpC"}
+{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../src/builder/core/copy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAM7D,wBAAsB,OAAO,CAC3B,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,kBAAkB,EACrC,OAAO,EAAE;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,iBAwBpC"}

package/lib/builder/mp/materials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/materials.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,EAIxB,MAAM,mBAAmB,CAAC;AAa3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU/C,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,UAAU,EAAE,EACpB,GAAG,EAAE,aAAa,iBA+KnB;AAGD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,oBAAoB,EAAE,EACpC,cAAc,EAAE,aAAa,EAAE,EAC/B,WAAW,CAAC,EAAE,UAAU,cAsCzB;AA6ID,wBAAgB,UAAU,CACxB,GAAG,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,YAAY,CAAC,EACpD,GAAG,EAAE,aAAa,EAClB,WAAW,CAAC,EAAE,WAAW;;;;;;EA8D1B"}
+{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/materials.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,EAIxB,MAAM,mBAAmB,CAAC;AAa3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU/C,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,UAAU,EAAE,EACpB,GAAG,EAAE,aAAa,iBA8NnB;AAGD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,oBAAoB,EAAE,EACpC,cAAc,EAAE,aAAa,EAAE,EAC/B,WAAW,CAAC,EAAE,UAAU,cAsCzB;AA6ID,wBAAgB,UAAU,CACxB,GAAG,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,YAAY,CAAC,EACpD,GAAG,EAAE,aAAa,EAClB,WAAW,CAAC,EAAE,WAAW;;;;;;EA8D1B"}

package/lib/builder/mp/materials.js

@@ -85,8 +85,29 @@ function installMaterials(projDir, usedComps, weapps, ctx) {
                 else {
                     usingMaterialMap[targetDir] = true;
                 }
+                const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
+                let compGroupIndexJson = '';
+                let componentsJson = {};
+                const dirsToDelete = [];
+                try {
+                    compGroupIndexJson = yield fs.readJSON(path.join(materialsSrcDirPath, 'index.json'));
+                    const componentsPathMap = compGroupIndexJson.components;
+                    componentsJson = Object.keys(componentsPathMap).reduce((acc, compName) => {
+                        if (usedComps[name].has(compName)) {
+                            acc[compName] = componentsPathMap[compName];
+                        }
+                        else {
+                            if (typeof componentsPathMap[compName] === 'string') {
+                                dirsToDelete.push(path.join(targetDir, path.dirname(componentsPathMap[compName])));
+                            }
+                        }
+                        return acc;
+                    }, {});
+                }
+                catch (e) {
+                    console.error('streamline error:', e);
+                }
                 if (libUpdated(targetDir, version)) {
-                    const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
                     if (fs.existsSync(materialsSrcDirPath)) {
                         console.log(`Copying material ${materialId} from ${materialsSrcDir}/src to ${targetDir}`);
                         const metaJosnPath = path.join(materialsSrcDir, 'meta.json');
@@ -95,8 +116,7 @@ function installMaterials(projDir, usedComps, weapps, ctx) {
                         }
                         yield fs.copy(materialsSrcDirPath, targetDir, {
                             filter: function (src, dest) {
-                                const path = src.split('/');
-                                return !junk.is(path[path.length - 1]);
+                                return !junk.is(path.basename(src));
                             },
                         });
                     }
@@ -104,12 +124,17 @@ function installMaterials(projDir, usedComps, weapps, ctx) {
                         console.log(`Copying material ${materialId} from ${materialsSrcDir} to ${targetDir}`);
                         yield fs.copy(materialsSrcDir, targetDir, {
                             filter: function (src, dest) {
-                                const path = src.split('/');
-                                return !junk.is(path[path.length - 1]);
+                                return !junk.is(path.basename(src));
                             },
                         });
                     }
                 }
+                if (compGroupIndexJson) {
+                    yield fs.writeJSON(path.join(targetDir, 'index.json'), Object.assign(Object.assign({}, compGroupIndexJson), { components: componentsJson }), { spaces: 2 });
+                    yield Promise.all(dirsToDelete.map((dir) => __awaiter(this, void 0, void 0, function* () {
+                        fs.remove(dir);
+                    })));
+                }
                 const libMeta = util_4.readComponentLibMata(targetDir);
                 if (!lib.components) {
                     lib.components = Object.keys((libMeta === null || libMeta === void 0 ? void 0 : libMeta.components) || {}).map((name) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.32",
+  "version": "0.6.35",
   "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

@@ -247,6 +247,7 @@ module.exports = function (options) {
               options: {
                 lessOptions: {
                   modifyVars: themeVars,
+                  javascriptEnabled: true,
                 },
               },
             },

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

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

@@ -1,103 +0,0 @@
-const Event = require('../event/event')
-
-class LocalStorage {
-    constructor(window) {
-        this.$_keys = []
-        this.$_window = window
-    }
-
-    /**
-     * 更新 storage 信息
-     */
-    $_updateInfo() {
-        try {
-            const info = wx.getStorageInfoSync()
-            const pages = getCurrentPages() || []
-            pages.forEach(page => {
-                if (page && page.window) {
-                    page.window.localStorage.$$keys = info.keys
-                }
-            })
-        } catch (err) {
-            console.warn('getStorageInfoSync fail')
-        }
-    }
-
-    /**
-     * 触发 window 的 storage 事件
-     */
-    $_triggerStorage(key, newValue, oldValue, force) {
-        if (!force && newValue === oldValue) return
-
-        const pages = getCurrentPages() || []
-        pages.forEach(page => {
-            if (page && page.window && page.window !== this.$_window) {
-                page.window.$$trigger('storage', {
-                    event: new Event({
-                        name: 'storage',
-                        target: page.window,
-                        $$extra: {
-                            key,
-                            newValue,
-                            oldValue,
-                            storageArea: this,
-                            url: this.$_window.location.href,
-                        }
-                    })
-                })
-            }
-        })
-    }
-
-    set $$keys(keys) {
-        this.$_keys = keys
-    }
-
-    /**
-     * 对外属性和方法
-     */
-    get length() {
-        return this.$_keys && this.$_keys.length || 0
-    }
-
-    key(num) {
-        if (typeof num !== 'number' || !isFinite(num) || num < 0) return null
-
-        return this.$_keys[num] || null
-    }
-
-    getItem(key) {
-        if (!key || typeof key !== 'string') return null
-
-        return wx.getStorageSync(key) || null
-    }
-
-    setItem(key, data) {
-        if (!key || typeof key !== 'string') return
-        data = '' + data
-
-        const oldValue = wx.getStorageSync(key) || null
-
-        wx.setStorageSync(key, data)
-        this.$_updateInfo()
-        this.$_triggerStorage(key, data, oldValue)
-    }
-
-    removeItem(key) {
-        if (!key || typeof key !== 'string') return
-
-        const oldValue = wx.getStorageSync(key) || null
-
-        wx.removeStorageSync(key)
-        this.$_updateInfo()
-        this.$_triggerStorage(key, null, oldValue)
-    }
-
-    clear() {
-        wx.clearStorageSync()
-        this.$_updateInfo()
-        this.$_triggerStorage(null, null, null, true)
-    }
-}
-
-module.exports = LocalStorage