@serverless-devs/s 2.0.93 → 2.0.95-beta.3

package/lib/utils/command-util.d.ts

@@ -1,3 +1,4 @@
+export declare function setEnvbyDotenv(templateFile: string): Promise<void>;
 export declare function createUniversalCommand(command: string, customerCommandName?: string, description?: string): import("commander").Command;
 export declare function getCommandDetail(name: any, provider: any, version: any): Promise<any[]>;
 export declare function getParsedTemplateObj(templateFile: any): Promise<any>;

package/lib/utils/command-util.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recordCommandHistory = exports.registerVerbose = exports.registerUniversalCommand = exports.registerCustomerCommand = exports.registerCommandChecker = exports.createCustomerCommand = exports.getCustomerCommandInfo = exports.getParsedTemplateObj = exports.getCommandDetail = exports.createUniversalCommand = void 0;
+exports.recordCommandHistory = exports.registerVerbose = exports.registerUniversalCommand = exports.registerCustomerCommand = exports.registerCommandChecker = exports.createCustomerCommand = exports.getCustomerCommandInfo = exports.getParsedTemplateObj = exports.getCommandDetail = exports.createUniversalCommand = exports.setEnvbyDotenv = void 0;
 var os_1 = __importDefault(require("os"));
 var path_1 = __importDefault(require("path"));
 var commander_1 = require("commander");
@@ -49,9 +49,39 @@ var static_variable_1 = require("../constants/static-variable");
 var storage_1 = __importDefault(require("./storage"));
 var logger_1 = __importDefault(require("./logger"));
 var common_1 = require("./common");
+var lodash_1 = require("lodash");
 var core_2 = __importDefault(require("./core"));
-var loadComponent = core_2.default.loadComponent, fs = core_2.default.fse, yaml = core_2.default.jsyaml;
+var loadComponent = core_2.default.loadComponent, fs = core_2.default.fse, yaml = core_2.default.jsyaml, getYamlContent = core_2.default.getYamlContent;
 var getSubcommand = specification_1.version.getSubcommand, getServiceConfig = specification_1.version.getServiceConfig;
+function setEnvbyDotenv(templateFile) {
+    return __awaiter(this, void 0, void 0, function () {
+        var spath, data, services, codeUri, key, element;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    spath = path_1.default.dirname(templateFile);
+                    require('dotenv').config({ path: path_1.default.join(spath, '.env') });
+                    return [4 /*yield*/, getYamlContent(templateFile)];
+                case 1:
+                    data = _a.sent();
+                    services = data.services;
+                    for (key in services) {
+                        element = services[key];
+                        if (element.component === 'fc') {
+                            codeUri = (0, lodash_1.get)(element, 'props.function.codeUri');
+                            break;
+                        }
+                    }
+                    if (codeUri) {
+                        codeUri = path_1.default.isAbsolute(codeUri) ? codeUri : path_1.default.join(spath, codeUri);
+                        require('dotenv').config({ path: path_1.default.join(codeUri, '.env') });
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.setEnvbyDotenv = setEnvbyDotenv;
 function createUniversalCommand(command, customerCommandName, description) {
     var _command = new commander_1.Command(command);
     var processArgv = [];
@@ -281,4 +311,4 @@ exports.default = {
     registerCustomerCommand: registerCustomerCommand,
     registerUniversalCommand: registerUniversalCommand,
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command-util.js","sourceRoot":"","sources":["../../src/utils/command-util.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command-util.js","sourceRoot":"","sources":["../../src/utils/command-util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/s",
-  "version": "2.0.93",
+  "version": "2.0.95-beta.3",
   "description": "Serverless devs tool, serverless developer tool, supports Alibaba cloud, AWS, azure, baidu cloud, Huawei cloud, Google cloud and Tencent cloud.",
   "homepage": "https://www.serverless-devs.com",
   "keywords": [
@@ -31,7 +31,7 @@
     "prewatch": "rm -rf lib/* && cp -r ./src/daemon ./lib",
     "watch": "tsc -w",
     "test": "npx jest",
-    "prebuild": "rm -rf lib",
+    "prebuild": "rm -rf lib/*",
     "build": "tsc && cp -r ./src/daemon ./lib",
     "postbuild": "./shell/postbuild.sh",
     "test:cov": "jest --coverage",
@@ -92,6 +92,6 @@
     ]
   },
   "dependencies": {
-    "@serverless-devs/core": "latest"
+    "@serverless-devs/core": "^0.1.15-beta.5"
   }
 }

package/spec/zh/0.0.1/readme.md

@@ -10,7 +10,7 @@
 - 时间：2021.9.16
 - 内容：
     - [Serverless Registry Model](./serverless_registry_model)
-    - [Serverless Package Model](./serverless_tool_model)
+    - [Serverless Package Model](./serverless_package_model)
     - [Serverless User Model](./serverless_user_model)
 
 ## 简介

package/spec/zh/0.0.1/serverless_registry_model/2.overview_and_terminology.md

@@ -12,7 +12,7 @@
 - Serverless Registry 将会同时承载应用和组件；
 - 应用和组件在 Serverless Registry 上将会具有不同数据结构的元数据；
 - Serverless Registry 的应用可以通过规范的 API 进行查询和获取；
-- Serverless Registry 可以且仅可以承载符合 [Serverless Package Model 规范](./serverless_pacakge_model.md)的 Package （包括应用与组件）；
+- Serverless Registry 可以且仅可以承载符合 [Serverless Package Model 规范](./../serverless_package_model)的 Package （包括应用与组件）；
 - Serverless Registry 所承载的内容可以在之后的版本进行拓展；
 - Serverless Registry 可以根据 Registry 建设者/组织的需求增加符合自身需要的权限鉴定策略；
 - Serverless Registry 中的 Package （包括应用与组件）应当具备版本的划分能力，以及 Package 的增加、删除的能力；

package/spec/zh/0.0.1/serverless_registry_model/3.registry_model.md

@@ -25,9 +25,9 @@ Package 开发者和 Serverless 开发者在发布 Package 以及使用 Package
 
 ![](https://serverless-article-picture.oss-cn-hangzhou.aliyuncs.com/1631783208215_20210916090651949970.png)
 
-通过上述流程，可以看到对于 Package 开发者而言，需要按照[Serverless Package Model 规范](./serverless_pacakge_model.md)提供相对应的 Package 到 Serverless Registry，而对于 Serverless 开发者而言，则需通过 Serverless Devs 开发者工具 工具中，进行 Package 的下载和使用。在整个过程中，涉及到的核心规范如下：
+通过上述流程，可以看到对于 Package 开发者而言，需要按照[Serverless Package Model 规范](./../serverless_package_model)提供相对应的 Package 到 Serverless Registry，而对于 Serverless 开发者而言，则需通过 Serverless Devs 开发者工具 工具中，进行 Package 的下载和使用。在整个过程中，涉及到的核心规范如下：
 
-- Serverless Registry 在接受 Package 开发者贡献的组件与应用时，接受且只接受标准zip格式的压缩包，且压缩包中包括的代码等内容符合且必须符合符合 [Serverless Package Model 规范](./serverless_pacakge_model.md)；
+- Serverless Registry 在接受 Package 开发者贡献的组件与应用时，接受且只接受标准zip格式的压缩包，且压缩包中包括的代码等内容符合且必须符合符合 [Serverless Package Model 规范](./../serverless_package_model)；
 - 对于发布在 Serverless Registry 上的应用和组件，Serverless Registry 需要按照以下规范提供对应 Package 版本查询功能以及相对应的下载功能：
     - 全部版本查询：
         - Method：GET

package/spec/zh/0.0.1/serverless_registry_model/5.design_principles.md

@@ -1,3 +1,3 @@
 # 设计原则
 
-为了更加公平和开放，上述的设计规范参照于Github相关接口设计，所以可以认为 Serverless Devs 开发者工具 天然支持 Github 作为其默认的 Serverless Registry (https://api.github.com/repos/)。
+为了更加公平和开放，上述的设计规范参照于Github相关接口设计，所以可以认为 Serverless Devs 开发者工具 天然支持 Github 作为其默认的 Serverless Registry ( https://api.github.com/repos/ )。

package/test/ci.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+echo './bin/s -v'
+./bin/s -v
+
+echo './bin/s -h'
+./bin/s -h
+
+echo './bin/s config add --AccountID 12345 --AccessKeyID 12345 --AccessKeySecret 12345 -a test -f'
+./bin/s config add --AccountID 12345 --AccessKeyID 12345 --AccessKeySecret 12345 -a test -f
+
+echo './bin/s config get'
+./bin/s config get
+
+echo './bin/s config delete -a test'
+./bin/s config delete -a test
+
+echo './bin/s cli fc-api listServices'
+./bin/s cli fc-api
+
+echo './bin/s component'
+./bin/s component
+
+echo './bin/s component --component fc-api'
+./bin/s component --component fc-api
+
+echo './bin/s clean --component fc-api'
+./bin/s clean --component fc-api
+
+echo './bin/s clean --cache'
+./bin/s clean --cache
+
+
+

package/test/start-fc-http-nodejs12/code/index.js

@@ -0,0 +1,47 @@
+var getRawBody = require('raw-body');
+var getFormBody = require('body/form');
+var body = require('body');
+
+
+/*
+To enable the initializer feature (https://help.aliyun.com/document_detail/156876.html)
+please implement the initializer function as below：
+exports.initializer = (context, callback) => {
+  console.log('initializing');
+  callback(null, '');
+};
+*/
+
+exports.handler = (req, resp, context) => {
+    console.log('hello world');
+
+    var params = {
+        path: req.path,
+        queries: req.queries,
+        headers: req.headers,
+        method : req.method,
+        requestURI : req.url,
+        clientIP : req.clientIP,
+    }
+
+    getRawBody(req, function(err, body) {
+        for (var key in req.queries) {
+          var value = req.queries[key];
+          resp.setHeader(key, value);
+        }
+        params.body = body.toString();
+        resp.send(JSON.stringify(params, null, '    '));
+    });
+
+    /*
+    getFormBody(req, function(err, formBody) {
+        for (var key in req.queries) {
+          var value = req.queries[key];
+          resp.setHeader(key, value);
+        }
+        params.body = formBody;
+        console.log(formBody);
+        resp.send(JSON.stringify(params));
+    });
+    */
+}

package/test/start-fc-http-nodejs12/s.yaml

@@ -0,0 +1,38 @@
+edition: 1.0.0          #  命令行YAML规范版本，遵循语义化版本（Semantic Versioning）规范
+name: fcDeployApp       #  项目名称
+access: "default"  #  秘钥别名
+
+services:
+  fc-deploy-test: #  服务名称
+    component: devsapp/fc  # 组件名称
+    props: #  组件的属性值
+      region: cn-hangzhou
+      service:
+        name: fc-deploy-service
+        description: 'demo for fc-deploy component'
+        internetAccess: true
+      function:
+        name: http-trigger-nodejs12
+        description: this is a test
+        runtime: nodejs12
+        codeUri: ./code
+        # ossBucket:
+        # ossKey:  # conflict with codeUri
+        handler: index.handler
+        memorySize: 128
+        timeout: 60
+      triggers:
+        - name: httpTrigger
+          type: http
+          config:
+            authType: anonymous
+            methods:
+              - GET
+      customDomains:
+        - domainName: auto
+          protocol: HTTP
+          routeConfigs:
+            - path: /*
+              methods:
+                - GET
+# 函数计算FC组件文档参考地址：https://github.com/devsapp/fc

package/lib/init/template.d.ts

@@ -1,20 +0,0 @@
-declare const _default: {
-    Code: number;
-    Status: string;
-    Body: {
-        name_zh: string;
-        name_en: string;
-        value: string;
-        templates: {
-            id: number;
-            name_zh: string;
-            name_en: string;
-            value: string;
-            is_deploy: boolean;
-            rank: number;
-            category_id: number;
-            created_time: string;
-        }[];
-    }[];
-};
-export default _default;

package/lib/init/template.js

@@ -1,314 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    Code: 200,
-    Status: 'Success',
-    Body: [
-        {
-            name_zh: 'fc-runtime-starter - 快速部署一个 FC 函数',
-            name_en: 'fc-runtime-starter - Deploy FC function in 5 minutes',
-            value: 'fc-runtime-starter',
-            templates: [
-                {
-                    id: 1,
-                    name_zh: 'fc-http-nodejs - 快速部署一个 nodejs12 http函数',
-                    name_en: 'fc-http-nodejs - Deploy FC nodejs12 runtime http function',
-                    value: 'devsapp/start-fc-http-nodejs12',
-                    is_deploy: true,
-                    rank: 1,
-                    category_id: 1,
-                    created_time: '2021-10-03T11:06:34.473Z',
-                },
-                {
-                    id: 2,
-                    name_zh: 'fc-http-python - 快速部署一个 python3 http函数',
-                    name_en: 'fc-http-python - Deploy FC python3 runtime http function',
-                    value: 'devsapp/start-fc-http-python3',
-                    is_deploy: true,
-                    rank: 2,
-                    category_id: 1,
-                    created_time: '2021-10-03T12:36:26.450Z',
-                },
-                {
-                    id: 7,
-                    name_zh: 'fc-http-java - 快速部署一个 java8 http函数',
-                    name_en: 'fc-http-java - Deploy FC java8 runtime http function',
-                    value: 'devsapp/start-fc-http-java8',
-                    is_deploy: false,
-                    rank: 4,
-                    category_id: 1,
-                    created_time: '2021-10-12T06:29:59.392Z',
-                },
-                {
-                    id: 23,
-                    name_zh: 'fc-event-nodejs - 快速部署一个 nodejs12 event函数',
-                    name_en: 'fc-event-nodejs - Deploy FC nodejs12 runtime event function',
-                    value: 'devsapp/start-fc-event-nodejs12',
-                    is_deploy: true,
-                    rank: 5,
-                    category_id: 1,
-                    created_time: '2021-10-13T07:43:38.542Z',
-                },
-                {
-                    id: 24,
-                    name_zh: 'fc-event-python - 快速部署一个 python3 event函数',
-                    name_en: 'fc-event-python - Deploy FC python3 runtime event function',
-                    value: 'devsapp/start-fc-event-python3',
-                    is_deploy: true,
-                    rank: 6,
-                    category_id: 1,
-                    created_time: '2021-10-13T07:57:35.429Z',
-                },
-                {
-                    id: 25,
-                    name_zh: 'fc-http-php - 快速部署一个 php http函数',
-                    name_en: 'fc-http-php - Deploy FC php runtime http function',
-                    value: 'devsapp/start-fc-http-php7',
-                    is_deploy: true,
-                    rank: 3,
-                    category_id: 1,
-                    created_time: '2021-10-13T08:01:38.523Z',
-                },
-                {
-                    id: 26,
-                    name_zh: 'fc-event-php - 快速部署一个 php event函数',
-                    name_en: 'fc-event-php - Deploy FC php runtime event function',
-                    value: 'devsapp/start-fc-event-php7',
-                    is_deploy: true,
-                    rank: 7,
-                    category_id: 1,
-                    created_time: '2021-10-13T08:04:27.547Z',
-                },
-                {
-                    id: 27,
-                    name_zh: 'fc-event-java - 快速部署一个 java8 event函数',
-                    name_en: 'fc-event-java - Deploy FC java8 runtime event function',
-                    value: 'devsapp/start-fc-event-java8',
-                    is_deploy: false,
-                    rank: 8,
-                    category_id: 1,
-                    created_time: '2021-10-13T08:09:34.561Z',
-                },
-            ],
-        },
-        {
-            name_zh: 'fc-custom-container-stater - 快速部署一个 custom-container 应用',
-            name_en: 'fc-custom-container-stater - Deploy FC function with custom-container',
-            value: 'fc-custom-container-stater',
-            templates: [
-                {
-                    id: 3,
-                    name_zh: 'fc-custom-container-event-python3 - 快速部署一个通过事件触发的 python3 应用',
-                    name_en: 'fc-custom-container-event-python3 - Deploy python3 event-triggered application',
-                    value: 'devsapp/start-fc-custom-container-event-python3.9',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 4,
-                    created_time: '2021-10-12T06:23:10.797Z',
-                },
-                {
-                    id: 4,
-                    name_zh: 'fc-custom-container-event-cpp - 快速部署一个通过事件触发的 cpp 应用',
-                    name_en: 'fc-custom-container-event-cpp - Deploy cpp event-triggered application',
-                    value: 'devsapp/start-fc-custom-container-event-cpp',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 4,
-                    created_time: '2021-10-12T06:25:15.558Z',
-                },
-                {
-                    id: 5,
-                    name_zh: 'fc-custom-container-http-springboot - 快速部署一个通过 HTTP 请求触发的 springboot 应用',
-                    name_en: 'fc-custom-container-http-springboot - Deploy springboot HTTP Request-triggered application',
-                    value: 'devsapp/start-fc-custom-container-http-springboot',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 4,
-                    created_time: '2021-10-12T06:26:38.646Z',
-                },
-                {
-                    id: 6,
-                    name_zh: 'fc-custom-container-http-aspdotnetcore - 快速部署一个通过 HTTP 请求触发的 aspdotnetcore 应用',
-                    name_en: 'fc-custom-container-http-aspdotnetcore - Deploy dotnetcore HTTP Request-triggered application',
-                    value: 'devsapp/start-fc-custom-container-http-aspdotnetcore',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 4,
-                    created_time: '2021-10-12T06:27:57.306Z',
-                },
-            ],
-        },
-        {
-            name_zh: 'web-framework-stater - 快速部署一个 Web 框架',
-            name_en: 'web-framework-stater-Quickly deploy a web framework',
-            value: 'web',
-            templates: [
-                {
-                    id: 8,
-                    name_zh: 'express-starter - 快速部署一个 express 基础应用',
-                    name_en: 'express-starter - Deploy express application',
-                    value: 'devsapp/start-express',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 5,
-                    created_time: '2021-10-12T06:42:50.811Z',
-                },
-                {
-                    id: 9,
-                    name_zh: 'koa-starter - 快速部署一个 koa 基础应用',
-                    name_en: 'koa-starter - Deploy koa application',
-                    value: 'devsapp/start-koa',
-                    is_deploy: true,
-                    rank: 0,
-                    category_id: 5,
-                    created_time: '2021-10-12T06:44:17.038Z',
-                },
-                {
-                    id: 10,
-                    name_zh: 'nuxtjs-starter - 快速部署一个 nuxtjs 基础应用',
-                    name_en: 'nuxtjs-starter - Deploy nuxtjs application',
-                    value: 'devsapp/start-nuxt',
-                    is_deploy: true,
-                    rank: 0,
-                    category_id: 5,
-                    created_time: '2021-10-12T06:45:11.491Z',
-                },
-                {
-                    id: 11,
-                    name_zh: 'eggjs-starter - 快速部署一个 eggjs 基础应用',
-                    name_en: 'eggjs-starter - Deploy eggjs application',
-                    value: 'devsapp/start-egg',
-                    is_deploy: true,
-                    rank: 0,
-                    category_id: 5,
-                    created_time: '2021-10-12T06:51:54.762Z',
-                },
-                {
-                    id: 12,
-                    name_zh: 'flask-starter - 快速部署一个 flask 基础应用',
-                    name_en: 'flask-starter - Deploy flask application',
-                    value: 'devsapp/start-flask',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 5,
-                    created_time: '2021-10-12T06:52:38.428Z',
-                },
-                {
-                    id: 13,
-                    name_zh: 'SpringBoot-starter - 快速部署一个 SpringBoot 基础应用',
-                    name_en: 'SpringBoot-starter - Deploy SpringBoot application',
-                    value: 'devsapp/start-springboot',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 5,
-                    created_time: '2021-10-12T06:55:44.149Z',
-                },
-                {
-                    id: 14,
-                    name_zh: 'Zblog-starter - 快速部署一个 Zblog 基础应用',
-                    name_en: 'Zblog-starter - Deploy Zblog application',
-                    value: 'devsapp/start-zblog',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 5,
-                    created_time: '2021-10-12T06:56:32.239Z',
-                },
-            ],
-        },
-        {
-            name_zh: 'static-website-stater - 快速部署一个静态网站',
-            name_en: 'static-website-stater-Quickly deploy a static website',
-            value: 'static-site',
-            templates: [
-                {
-                    id: 15,
-                    name_zh: 'website-starter - 快速部署一个静态网站',
-                    name_en: 'website-starter - Deploy static website',
-                    value: 'devsapp/website-base',
-                    is_deploy: true,
-                    rank: 0,
-                    category_id: 6,
-                    created_time: '2021-10-12T07:15:48.795Z',
-                },
-                {
-                    id: 16,
-                    name_zh: 'react-starter - 快速部署一个 React.js 应用',
-                    name_en: 'react-starter - Deploy React.js application',
-                    value: 'devsapp/website-react',
-                    is_deploy: true,
-                    rank: 0,
-                    category_id: 6,
-                    created_time: '2021-10-12T07:16:39.534Z',
-                },
-                {
-                    id: 17,
-                    name_zh: 'vue-starter - 快速部署一个 Vue.js 应用',
-                    name_en: 'vue-starter - Deploy Vue.js application',
-                    value: 'devsapp/website-vue',
-                    is_deploy: true,
-                    rank: 0,
-                    category_id: 6,
-                    created_time: '2021-10-12T07:17:17.360Z',
-                },
-            ],
-        },
-        {
-            name_zh: 'serverless-best-practice - 快速体验 Serverless 最佳实践',
-            name_en: 'serverless-best-practice-Quickly experience serverless best practices',
-            value: 'best-practice',
-            templates: [
-                {
-                    id: 18,
-                    name_zh: 'puppeteer - 快速部署一个基于 puppeteer 截图的 Web 应用',
-                    name_en: 'puppeteer - Deploy screenshot application base on puppeteer + fc',
-                    value: 'devsapp/puppeteer-app',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 7,
-                    created_time: '2021-10-12T07:17:59.874Z',
-                },
-                {
-                    id: 19,
-                    name_zh: 'ffmpeg - 快速部署一个基于 ffmpeg 实现音视频处理应用',
-                    name_en: 'ffmpeg - Deploy audio and video processing application base on ffmpeg + fc',
-                    value: 'devsapp/ffmpeg-app',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 7,
-                    created_time: '2021-10-12T07:18:40.591Z',
-                },
-                {
-                    id: 20,
-                    name_zh: 'pdf2Img - 快速部署一个 pdf 转图片应用',
-                    name_en: 'pdf2Img - Deploy pdf to images application',
-                    value: 'devsapp/start-pdf2img',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 7,
-                    created_time: '2021-10-12T07:19:25.791Z',
-                },
-                {
-                    id: 21,
-                    name_zh: 'tensorflow - 快速部署一个 tensorflow 应用',
-                    name_en: 'tensorflow - Deploy tensorflow application',
-                    value: 'devsapp/start-tensorflow',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 7,
-                    created_time: '2021-10-12T07:20:07.140Z',
-                },
-                {
-                    id: 22,
-                    name_zh: 'todoList - 快速部署一个基于 nodejs 的网页 TodoList 应用',
-                    name_en: 'todoList - Deploy todoList application',
-                    value: 'devsapp/todolist-app',
-                    is_deploy: false,
-                    rank: 0,
-                    category_id: 7,
-                    created_time: '2021-10-12T07:20:44.323Z',
-                },
-            ],
-        },
-    ],
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5pdC90ZW1wbGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtCQUFlO0lBQ2IsSUFBSSxFQUFFLEdBQUc7SUFDVCxNQUFNLEVBQUUsU0FBUztJQUNqQixJQUFJLEVBQUU7UUFDSjtZQUNFLE9BQU8sRUFBRSxtQ0FBbUM7WUFDNUMsT0FBTyxFQUFFLHNEQUFzRDtZQUMvRCxLQUFLLEVBQUUsb0JBQW9CO1lBQzNCLFNBQVMsRUFBRTtnQkFDVDtvQkFDRSxFQUFFLEVBQUUsQ0FBQztvQkFDTCxPQUFPLEVBQUUseUNBQXlDO29CQUNsRCxPQUFPLEVBQUUsMkRBQTJEO29CQUNwRSxLQUFLLEVBQUUsZ0NBQWdDO29CQUN2QyxTQUFTLEVBQUUsSUFBSTtvQkFDZixJQUFJLEVBQUUsQ0FBQztvQkFDUCxXQUFXLEVBQUUsQ0FBQztvQkFDZCxZQUFZLEVBQUUsMEJBQTBCO2lCQUN6QztnQkFDRDtvQkFDRSxFQUFFLEVBQUUsQ0FBQztvQkFDTCxPQUFPLEVBQUUsd0NBQXdDO29CQUNqRCxPQUFPLEVBQUUsMERBQTBEO29CQUNuRSxLQUFLLEVBQUUsK0JBQStCO29CQUN0QyxTQUFTLEVBQUUsSUFBSTtvQkFDZixJQUFJLEVBQUUsQ0FBQztvQkFDUCxXQUFXLEVBQUUsQ0FBQztvQkFDZCxZQUFZLEVBQUUsMEJBQTBCO2lCQUN6QztnQkFDRDtvQkFDRSxFQUFFLEVBQUUsQ0FBQztvQkFDTCxPQUFPLEVBQUUsb0NBQW9DO29CQUM3QyxPQUFPLEVBQUUsc0RBQXNEO29CQUMvRCxLQUFLLEVBQUUsNkJBQTZCO29CQUNwQyxTQUFTLEVBQUUsS0FBSztvQkFDaEIsSUFBSSxFQUFFLENBQUM7b0JBQ1AsV0FBVyxFQUFFLENBQUM7b0JBQ2QsWUFBWSxFQUFFLDBCQUEwQjtpQkFDekM7Z0JBQ0Q7b0JBQ0UsRUFBRSxFQUFFLEVBQUU7b0JBQ04sT0FBTyxFQUFFLDJDQUEyQztv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