@cloudbase/framework-plugin-low-code 1.7.34-alpha.5 → 1.7.35-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/index.d.ts +1 -1
  2. package/lib/index.d.ts.map +1 -1
  3. package/lib/index.js +11 -23
  4. package/package.json +6 -6
package/lib/index.d.ts CHANGED
@@ -114,7 +114,7 @@ declare class LowCodePlugin extends Plugin {
114
114
  deploy(): Promise<void>;
115
115
  _getHostingInfoTask(envId: any, loose?: boolean): Promise<any[]>;
116
116
  _getHostingInfo(envId: any, loose?: boolean): any;
117
- _enableExpireTime(envId: any): Promise<boolean>;
117
+ _enableExpireTime(envId: any): Promise<false | "exp" | "mp_exp">;
118
118
  _checkIsVersion(version: any): boolean;
119
119
  _postPersistentDependiences(): Promise<void>;
120
120
  _debugInfo(): Promise<void>;
package/lib/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/index.js CHANGED
@@ -256,7 +256,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
256
256
  let miniAppDir = '';
257
257
  let webAppDir = '';
258
258
  const { envId } = this.api;
259
- const [hostingRes, isExpPackage, uin] = yield Promise.all([
259
+ const [hostingRes, expiredTimeOrAd, uin] = yield Promise.all([
260
260
  this._getHostingInfoTask(envId, true).catch((e) => {
261
261
  this.api.logger.error('获取静态托管失败: ', e);
262
262
  throw e;
@@ -339,7 +339,8 @@ class LowCodePlugin extends framework_core_1.Plugin {
339
339
  resourceAppId: this._resolvedInputs.mpAppId,
340
340
  domain,
341
341
  endpointType: runtimeEndpointType,
342
- enableExpiredTag: isExpPackage,
342
+ enableExpiredTag: expiredTimeOrAd === 'exp',
343
+ enableAd: expiredTimeOrAd === 'mp_exp',
343
344
  account: { uin },
344
345
  }, (err, result) => __awaiter(this, void 0, void 0, function* () {
345
346
  if (!err) {
@@ -552,9 +553,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
552
553
  }
553
554
  }),
554
555
  ]);
555
- if (isOperationAppUser) {
556
- return false;
557
- }
558
556
  const list = Resources.sort((a, b) => {
559
557
  let atimesnap;
560
558
  let btimesnap;
@@ -577,8 +575,14 @@ class LowCodePlugin extends framework_core_1.Plugin {
577
575
  const exp = SubBillingItemCode.find((item) => {
578
576
  return item.Code === 'sv_lcap_generic_experience' && item.Num && Number(item.Num) > 0;
579
577
  });
580
- if (exp) {
581
- return true;
578
+ const mp_exp = SubBillingItemCode.find((item) => {
579
+ return item.Code === 'sv_lcap_generic_wx_experience' && item.Num && Number(item.Num) > 0;
580
+ });
581
+ if (exp && !isOperationAppUser) {
582
+ return 'exp';
583
+ }
584
+ else if (mp_exp) {
585
+ return 'mp_exp';
582
586
  }
583
587
  }
584
588
  }
@@ -694,22 +698,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
694
698
  catch (e) {
695
699
  this.api.logger.error(`上传构建快照失败：`, e);
696
700
  }
697
- yield new Promise((resolve, reject) => {
698
- var _a, _b, _c;
699
- cos.putObject({
700
- Bucket: ((_a = this._artifactOptions) === null || _a === void 0 ? void 0 : _a.bucket) || '',
701
- Region: ((_b = this._artifactOptions) === null || _b === void 0 ? void 0 : _b.region) || '',
702
- Key: `${(_c = this._artifactOptions) === null || _c === void 0 ? void 0 : _c.baseKey}/input.json`,
703
- Body: Buffer.from(JSON.stringify(Object.assign(Object.assign({}, rest), { deployOptions: Object.assign({}, restDeployOptions) }), undefined, 2)),
704
- }, (err, data) => {
705
- if (err) {
706
- reject(err);
707
- }
708
- else {
709
- resolve(data);
710
- }
711
- });
712
- });
713
701
  }
714
702
  });
715
703
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/framework-plugin-low-code",
3
- "version": "1.7.34-alpha.5",
3
+ "version": "1.7.35-alpha.0",
4
4
  "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
5
5
  "author": "yhsunshining@gmail.com",
6
6
  "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -34,11 +34,11 @@
34
34
  "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
35
35
  },
36
36
  "dependencies": {
37
- "@cloudbase/cals": "^1.0.62",
38
- "@cloudbase/framework-core": "1.9.7",
39
- "@cloudbase/framework-plugin-auth": "1.9.7",
40
- "@cloudbase/framework-plugin-website": "1.9.7",
41
- "@cloudbase/lowcode-builder": "^1.8.73",
37
+ "@cloudbase/cals": "^1.0.65",
38
+ "@cloudbase/framework-core": "^1.8.16",
39
+ "@cloudbase/framework-plugin-auth": "^1.8.16",
40
+ "@cloudbase/framework-plugin-website": "^1.8.17",
41
+ "@cloudbase/lowcode-builder": "^1.8.75",
42
42
  "@cloudbase/lowcode-deployer": "^1.3.4",
43
43
  "@formily/react-schema-renderer": "1.1.7",
44
44
  "archiver": "^4.0.1",