@cloudbase/lowcode-builder 0.1.0 → 0.1.4

package/template/package.json

@@ -6,10 +6,10 @@
   },
   "dependencies": {
     "@cloudbase/js-sdk": "1.5.3-alpha.0",
-    "@cloudbase/weda-cloud-sdk": "stable",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",
+    "@cloudbase/weda-client": "stable",
     "fastclick": "^1.0.6",
     "lodash": "^4.17.19",
     "mobx": "^5.15.4",
@@ -54,8 +54,10 @@
     "mini-css-extract-plugin": "^0.8.0",
     "hard-source-webpack-plugin": "^0.13.1",
     "html-webpack-plugin": "^3.2.0",
+    "ts-loader": "^8.3.0",
+    "typescript": "^4.4.4",
     "webpack": "^4.41.4",
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0"
   }
-}
+}

package/template/src/app/global-api.js

@@ -1,6 +1,5 @@
 import * as sdk from '@tcwd/weapps-sdk';
 import { createComputed } from 'utils';
-import { DS_SDK, CLOUD_SDK, createDataset, EXTRA_API } from '../datasources';
 import store, { subPackageName } from '../store';
 import computed from '../store/computed';
 import common from './common';
@@ -8,6 +7,8 @@ import { formatDate } from '../utils/date';
 import { getter, setter, _isMobile } from '../utils';
 import actionMap from './material-actions';
 import { scanCodeApi } from '../utils/scan-code-action';
+import { createWebApp, ACTIONS_KEY, ROUTER_KEY } from '@cloudbase/weda-client';
+import { createDataset, EXTRA_API } from '../datasources/index'
 
 const mainAppKey = '__weappsMainApp';
 const appGlobal = process.env.isMiniprogram ? getApp() : window;
@@ -20,10 +21,10 @@ export function setCurrentPage(pageCtx) {
 }
 
 function createGlboalApi() {
+  const mpApp = createWebApp();
   const globalAPI = {
     id: '<%= appId %>',
     domain: '<%= domain %>',
-    platform: 'WEB',
     formActions: {},
     pages: {},
     session: {
@@ -34,12 +35,7 @@ function createGlboalApi() {
     state: store,
     computed: createComputed(computed.global),
     common,
-    dataSources: DS_SDK,
-    utils: {
-      formatDate,
-      get: getter,
-      set: setter,
-    },
+    ...mpApp
     // ... other sdk apis & apis from mp
   }; // The global api exposed to lowcode
 
@@ -81,8 +77,6 @@ function createGlboalApi() {
   sdkModsIncluded.forEach((key) => {
     globalAPI[key] = sdk[key];
   });
-  // 避免被wx.cloud 覆盖
-  globalAPI.cloud = CLOUD_SDK;
 
   return globalAPI;
 }
@@ -103,80 +97,9 @@ function createPageApi() {
 export const mountAPIs = (sdks) => {
   Object.keys(sdks).forEach((item) => {
     let action = sdks[item];
-
-    switch (item) {
-      case 'showToast': {
-        action = function (obj) {
-          if (obj.icon === 'error' && !obj.image) {
-            return sdks[item]({
-              ...obj,
-              image:
-                'data:image/svg+xml,%3Csvg%20width%3D%22120%22%20height%3D%22120%22%20viewBox%3D%220,0,24,24%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M12%2010.586l5.657-5.657%201.414%201.414L13.414%2012l5.657%205.657-1.414%201.414L12%2013.414l-5.657%205.657-1.414-1.414L10.586%2012%204.929%206.343%206.343%204.93%2012%2010.586z%22%20fill-rule%3D%22evenodd%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E',
-            });
-          }
-          return sdks[item](obj);
-        };
-        break;
-      }
-      case 'showModal': {
-        const OFFICIAL_COMPONENT_LIB = 'gsd-h5-react';
-        const showModal =
-          actionMap[OFFICIAL_COMPONENT_LIB] &&
-          actionMap[OFFICIAL_COMPONENT_LIB].showModal;
-        if (!_isMobile() && showModal) {
-          action = function (params) {
-            return showModal({ data: params });
-          };
-        }
-        break;
-      }
-      case 'scanCode': {
-        action = (options) => {
-          if (
-            !options ||
-            (!options.success && !options.fail && !options.complete)
-          ) {
-            return new Promise((resolve, reject) => {
-              scanCodeApi({
-                ...options,
-                success: resolve,
-                fail: reject,
-              });
-            });
-          }
-          scanCodeApi(options);
-        };
-        break;
-      }
-      case 'navigateTo':
-      case 'reLaunch':
-      case 'redirectTo': {
-        action = function (obj) {
-          if (obj.mode === 'web' && process.env.isMiniprogram) {
-            console.warn('url navigation can only be used in h5 build');
-            return;
-          }
-          const { url, ...restOpts } = obj;
-          if (obj.mode === 'web') {
-            if (item === 'navigateTo') {
-              window.open(url);
-            } else {
-              window.location.href = url;
-            }
-          } else {
-            return sdks[item]({
-              ...restOpts,
-              pageId: restOpts.pageId
-                ? restOpts.pageId.replace(/^(\.)?\//, '')
-                : restOpts.pageId,
-            });
-          }
-        };
-        break;
-      }
+    if (!(item in ACTIONS_KEY) && !(item in ROUTER_KEY)) {
+      app[item] = action;
     }
-
-    app[item] = action;
   });
   return app;
 };

package/template/src/app/material-actions.js

@@ -1,14 +1,16 @@
 // Imports all material actions
-<% materials.map((material,index) => { if(material.entry){ %>
-import <%= _.camelCase(material.name)%>_<%= index%> from 'libraries/<%=material.name%>@<%= material.version %>/<%=material.entry%>';
-const <%= _.camelCase(material.name)%>Actions_<%= index%> = <%= _.camelCase(material.name)%>_<%= index%>.actions
-<% } else { (material.actions || []).map(act => {%>
-import <%= _.camelCase(material.name)%>_<%=act.name%> from 'libraries/<%=material.name%>@<%= material.version %>/actions/<%= act.name %>'
-<% }) }}) %>
-export default {
-  <% materials.map((material, index) => {
-  %>  ['<%= material.name%>']:<% if(material.entry){ %> <%=_.camelCase(material.name)%>Actions_<%= index%>,
-  <% }else{ %> {<% (material.actions || []).map(act => { %>
-      ['<%= act.name%>']: <%= _.camelCase(material.name)%>_<%=act.name%>,<%})%>
-    },
-  <%}}) %>}
+<% materials.map((material,index) => { if(material.entries && material.entries.actions){ %>
+  import * as <%= _.camelCase(material.name)%>Actions_<%= index%> from 'libraries/<%=material.name%>@<%= material.version %>/<%=material.entries.actions%>';
+  <% } else if(material.entries && material.entries.entry) {%>
+  import <%= _.camelCase(material.name)%>_<%= index%> from 'libraries/<%=material.name%>@<%= material.version %>/<%=material.entries.entry%>';
+  const <%= _.camelCase(material.name)%>Actions_<%= index%> = <%= _.camelCase(material.name)%>_<%= index%>.actions
+  <% } else { (material.actions || []).map(act => {%>
+  import <%= _.camelCase(material.name)%>_<%=act.name%> from 'libraries/<%=material.name%>@<%= material.version %>/actions/<%= act.name %>'
+  <% }) }}) %>
+  export default {
+    <% materials.map((material, index) => {
+    %>  ['<%= material.name%>']:<% if(material.entries && (material.entries.entry || material.entries.actions)){ %> <%=_.camelCase(material.name)%>Actions_<%= index%>,
+    <% }else{ %> {<% (material.actions || []).map(act => { %>
+        ['<%= act.name%>']: <%= _.camelCase(material.name)%>_<%=act.name%>,<%})%>
+      },
+    <%}}) %>}

package/template/src/datasources/index.js

@@ -1,6 +1,18 @@
-import { setConfig, initTcb } from '@cloudbase/weda-cloud-sdk/dist/h5';
+import { WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
 import config from './config';
 
+const {
+  setConfig,
+  initTcb,
+  CLOUD_SDK,
+  createDataset,
+  createStateDataSourceVar,
+  generateParamsParser,
+  EXTRA_API,
+  DS_API,
+  DS_SDK
+} = WEDA_CLOUD_SDK
+
 export {
   createDataset,
   createStateDataSourceVar,
@@ -9,7 +21,8 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-} from '@cloudbase/weda-cloud-sdk/dist/h5';
+  setConfig
+}
 
 setConfig(config);
 initTcb();

package/template/src/index.jsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as ReactDOM from 'react-dom'
-import { setConfig } from '@cloudbase/weda-cloud-sdk/dist/h5'
+import { setConfig } from './datasources/index'
 import App from './router'
 import './utils/monitor-jssdk.min'
 import './index.less'

package/template/webpack/web.prod.js

@@ -6,9 +6,10 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const themeVars = require('./themeVars');
 const HappyPack = require('happypack');
-const core = 4;
+const core = 7;
 const happyThreadPool = HappyPack.ThreadPool({ size: core });
 
+const TS_LOADER_ID = 'ts-loader';
 module.exports = function (options) {
   const {
     context,
@@ -22,54 +23,69 @@ module.exports = function (options) {
     definePlugin = {},
   } = options;
   const isDevelopment = mode !== 'production';
+  const babelLoader = {
+    loader: 'babel-loader',
+    options: {
+      compact: false,
+      cacheDirectory: true,
+      cwd: context,
+      presets: [
+        [
+          '@babel/preset-env',
+          {
+            modules: false,
+            targets: {
+              esmodules: true,
+            },
+          },
+        ],
+        '@babel/preset-react',
+      ],
+      plugins: [
+        [
+          'babel-plugin-import',
+          {
+            libraryName: '@govcloud/gsd-kbone-react',
+            libraryDirectory: 'lib/components',
+            camel2DashComponentName: false,
+          },
+        ],
+        '@babel/plugin-proposal-class-properties',
+        ['@babel/plugin-proposal-decorators', { legacy: true }],
+        '@babel/plugin-proposal-export-default-from',
+        '@babel/plugin-proposal-export-namespace-from',
+        '@babel/plugin-proposal-optional-chaining',
+        '@babel/plugin-proposal-partial-application',
+        ['@babel/plugin-proposal-pipeline-operator', { proposal: 'minimal' }],
+      ].filter(Boolean),
+    },
+  };
+
   let plugins = [
     new HappyPack({
-      id: 'babel',
+      id: TS_LOADER_ID,
       loaders: [
+        babelLoader,
         {
-          loader: 'babel-loader',
+          loader: 'ts-loader',
           options: {
-            compact: false,
-            cacheDirectory: true,
-            cwd: context,
-            presets: [
-              [
-                '@babel/preset-env',
-                {
-                  targets: {
-                    esmodules: true,
-                  },
-                  useBuiltIns: 'usage',
-                  corejs: '2.6.12',
-                },
-              ],
-              '@babel/preset-react',
-            ],
-            plugins: [
-              [
-                'babel-plugin-import',
-                {
-                  libraryName: '@govcloud/gsd-kbone-react',
-                  libraryDirectory: 'lib/components',
-                  camel2DashComponentName: false,
-                },
-              ],
-              '@babel/plugin-proposal-class-properties',
-              ['@babel/plugin-proposal-decorators', { legacy: true }],
-              '@babel/plugin-proposal-export-default-from',
-              '@babel/plugin-proposal-export-namespace-from',
-              '@babel/plugin-proposal-optional-chaining',
-              '@babel/plugin-proposal-partial-application',
-              [
-                '@babel/plugin-proposal-pipeline-operator',
-                { proposal: 'minimal' },
-              ],
-            ].filter(Boolean),
+            compilerOptions: {
+              target: 'ESNext',
+              module: 'ESNext',
+              esModuleInterop: true,
+            },
+            happyPackMode: true,
+            transpileOnly: true,
           },
         },
       ],
       threadPool: happyThreadPool,
     }),
+    new HappyPack({
+      id: 'babel',
+      loaders: [babelLoader],
+      threadPool: happyThreadPool,
+    }),
     new HtmlWebpackPlugin({
       template: htmlTemplatePath,
       filename: 'index.html',
@@ -125,7 +141,7 @@ module.exports = function (options) {
     },
     devtool: isDevelopment ? 'eval' : false,
     resolve: {
-      extensions: ['.js', '.jsx', '.tsx', '.json', '.scss', '.css'],
+      extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.scss', '.css'],
       modules: [...resolveModules],
       symlinks: false,
       cacheWithContext: false,
@@ -135,10 +151,15 @@ module.exports = function (options) {
     },
     module: {
       rules: [
+        {
+          test: /\.tsx?$/,
+          exclude: /node_modules\/(?!@cloudbase\/weda-ui)|gsd-kbone-react/,
+          use: [`happypack/loader?id=${TS_LOADER_ID}`],
+        },
         {
           test: /\.(js|jsx)$/,
+          exclude: /node_modules\/(?!@cloudbase\/weda-ui)|gsd-kbone-react/,
           use: ['happypack/loader?id=babel'],
-          exclude: /node_modules\/(?!@cloudbase\/weda-ui)/,
         },
         {
           test: /\.(scss|sass)$/,

package/lib/generate.d.ts

@@ -1 +0,0 @@
-export declare function handleMpPlugins(plugins: any[] | undefined, appBuildDir: string): Promise<void>;

package/lib/generate.js

@@ -1,60 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMpPlugins = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const core_1 = require("./builder/core");
-const lodash_1 = require("lodash");
-async function handleMpPlugins(plugins = [], appBuildDir) {
-    const appBuildMpDir = path_1.default.resolve(appBuildDir, 'dist/mp');
-    const appBuildNodeModulesDir = path_1.default.resolve(appBuildDir, 'node_modules');
-    const mpBuildPkgJsonPath = path_1.default.resolve(appBuildMpDir, 'package.json');
-    const buildPkgJson = fs_extra_1.default.readJsonSync(mpBuildPkgJsonPath);
-    const sourcePkgJson = fs_extra_1.default.readJsonSync(path_1.default.join(appBuildDir, 'package.json'));
-    // 合并插件内容
-    plugins
-        .filter((plugin) => plugin.type === 'mp')
-        .forEach((plugin) => {
-        const mpBuildAppJsonPath = path_1.default.resolve(appBuildMpDir, 'app.json');
-        const pluginAppJsonPath = path_1.default.resolve(appBuildNodeModulesDir, plugin.module, 'app.json');
-        // 合并 app.json
-        mergeSubPackages(mpBuildAppJsonPath, pluginAppJsonPath);
-        // 加入到包依赖中
-        buildPkgJson.dependencies[plugin.module] =
-            sourcePkgJson.dependencies[plugin.module];
-    });
-    // 安装
-    fs_extra_1.default.writeJsonSync(mpBuildPkgJsonPath, buildPkgJson, { spaces: 2 });
-    console.log('小程序安装依赖', appBuildMpDir);
-    await (0, core_1.installDep)(appBuildMpDir);
-}
-exports.handleMpPlugins = handleMpPlugins;
-function mergeSubPackages(baseAppJsonPath, mergeAppJsonPath) {
-    const baseJson = fs_extra_1.default.readJSONSync(baseAppJsonPath);
-    const mergeJson = fs_extra_1.default.readJSONSync(mergeAppJsonPath);
-    if (!mergeJson.subpackages)
-        return;
-    const newJson = { ...baseJson };
-    if (!baseJson.subpackages) {
-        newJson.subpackages = mergeJson.subpackages;
-    }
-    else {
-        mergeJson.subpackages.forEach((mergeItem) => {
-            // 找到重复的进行合并再去重
-            const targetItemIdx = newJson.subpackages.findIndex((item) => {
-                return item.root === mergeItem.root;
-            });
-            if (newJson.subpackages[targetItemIdx]) {
-                const pages = (0, lodash_1.uniq)([].concat(newJson.subpackages[targetItemIdx].pages, mergeItem.pages));
-                newJson.subpackages[targetItemIdx].pages = pages;
-            }
-            else {
-                newJson.subpackages.push(mergeItem);
-            }
-        });
-    }
-    fs_extra_1.default.writeJSONSync(baseAppJsonPath, newJson, { spaces: 2 });
-}

package/lib/tests/build.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/tests/build.js

@@ -1,19 +0,0 @@
-'use strict';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-const data_1 = __importDefault(require("./data"));
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const common_1 = require("../src/builder/types/common");
-const outPath = path_1.default.resolve(__dirname, '.temp');
-fs_extra_1.default.emptyDirSync(outPath);
-(0, index_1.buildWedaApp)({
-    ...data_1.default,
-    buildTypeList: [common_1.BuildType.WEB],
-    output: { path: outPath },
-}).then((dir) => {
-    console.log(dir);
-});

package/lib/tests/build.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/tests/build.test.js

@@ -1,22 +0,0 @@
-'use strict';
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-const data_1 = __importDefault(require("./data"));
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const common_1 = require("../lib/builder/types/common");
-describe('build', () => {
-    it('needs tests', async () => {
-        const outPath = path_1.default.resolve(__dirname, './temp');
-        fs_extra_1.default.emptyDir(outPath);
-        let dir = await (0, index_1.buildWedaApp)({
-            ...data_1.default,
-            buildTypeList: [common_1.BuildType.WEB],
-            output: { path: outPath },
-        });
-        console.log(dir);
-    });
-});

package/lib/tests/data.d.ts

@@ -1,18 +0,0 @@
-import { BuildType } from '../builder/types/common';
-import { DEPLOY_MODE } from '../types';
-export declare const test: {
-    appKey: string;
-    cals: any;
-    subAppCalsList: never[];
-    dependencies: any[];
-    buildTypeList: BuildType[];
-    deployOptions: {
-        mode: DEPLOY_MODE;
-        mpAppId: string;
-        targetMpAppId: string;
-    };
-    domain: string;
-    resourceAppId: string;
-};
-declare const _default: any;
-export default _default;