@abtnode/core 1.16.19 → 1.16.20-beta-cf6dfce1

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 (2) hide show
  1. package/lib/blocklet/project/index.js +32 -5
  2. package/package.json +32 -32
package/lib/blocklet/project/index.js CHANGED
@@ -101,6 +101,24 @@ const deleteRelease = async ({ did, projectId, releaseId, manager }) => {
101
101
  await fs.remove(releaseDir);
102
102
  };
103
103
 
104
+ const checkResourceExists = async (projectDir, action, releaseId) => {
105
+ const releaseDir =
106
+ action === 'create'
107
+ ? path.join(projectDir, PROJECT.RESOURCE_DIR)
108
+ : path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`, PROJECT.RESOURCE_DIR);
109
+
110
+ const configDir = path.join(releaseDir, COMPONENT_CONFIG_MAP_DIR);
111
+ const errMsg = 'resource should not be empty';
112
+ if (!fs.existsSync(configDir)) {
113
+ throw new Error(errMsg);
114
+ }
115
+
116
+ const files = await fs.readdir(configDir);
117
+ if (!files.length) {
118
+ throw new Error(errMsg);
119
+ }
120
+ };
121
+
104
122
  const createRelease = async ({
105
123
  did,
106
124
  projectId,
@@ -164,6 +182,12 @@ const createRelease = async ({
164
182
 
165
183
  params.blockletDid = blockletDid;
166
184
 
185
+ const projectDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${projectId}`);
186
+
187
+ if (status !== PROJECT.RELEASE_STATUS.draft) {
188
+ await checkResourceExists(projectDir, action, releaseId);
189
+ }
190
+
167
191
  const release = await releaseState.upsertRelease({
168
192
  ...params,
169
193
  projectId,
@@ -174,7 +198,6 @@ const createRelease = async ({
174
198
 
175
199
  const _releaseId = release.id;
176
200
 
177
- const projectDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${projectId}`);
178
201
  const tmpDir = path.join(manager.dataDirs.tmp, PROJECT.DIR, `${blockletDid}-${createRandomStr()}`);
179
202
  const releaseDir = path.join(projectDir, PROJECT.RELEASE_DIR, `${_releaseId}`);
180
203
  const resourceDir = path.join(releaseDir, PROJECT.RESOURCE_DIR);
@@ -251,7 +274,9 @@ const createRelease = async ({
251
274
 
252
275
  // create resource
253
276
  await fs.ensureDir(resourceDir);
254
- await fs.copy(resourceDir, path.join(tmpBundleDir, 'resource'));
277
+ const tmpBundleResourceDir = path.join(tmpBundleDir, 'resource');
278
+ await fs.copy(resourceDir, tmpBundleResourceDir);
279
+ await fs.remove(path.join(tmpBundleResourceDir, COMPONENT_CONFIG_MAP_DIR));
255
280
 
256
281
  // create blocklet.yml
257
282
  const resourceList = await fs.readdir(resourceDir);
@@ -267,7 +292,7 @@ const createRelease = async ({
267
292
  logo: logoFileName,
268
293
  resources: resourcesPaths.length ? resourcesPaths : undefined,
269
294
  components: [],
270
- files: ['screenshots'],
295
+ files: project.blockletScreenshots?.length ? ['screenshots'] : [],
271
296
  screenshots: project.blockletScreenshots || [],
272
297
  };
273
298
  await updateMetaFile(path.join(tmpBundleDir, BLOCKLET_META_FILE), meta);
@@ -362,8 +387,10 @@ const updateSelectedResources = async ({ did, projectId, releaseId, componentDid
362
387
  await fs.remove(file);
363
388
  }
364
389
 
365
- await fs.ensureDir(path.dirname(file));
366
- await fs.outputJSON(file, resources);
390
+ if (resources.length) {
391
+ await fs.ensureDir(path.dirname(file));
392
+ await fs.outputJSON(file, resources);
393
+ }
367
394
  };
368
395
 
369
396
  module.exports = {
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "1.16.19",
6
+ "version": "1.16.20-beta-cf6dfce1",
7
7
  "description": "",
8
8
  "main": "lib/index.js",
9
9
  "files": [
@@ -19,39 +19,39 @@
19
19
  "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
20
20
  "license": "Apache-2.0",
21
21
  "dependencies": {
22
- "@abtnode/analytics": "1.16.19",
23
- "@abtnode/auth": "1.16.19",
24
- "@abtnode/certificate-manager": "1.16.19",
25
- "@abtnode/constant": "1.16.19",
26
- "@abtnode/cron": "1.16.19",
27
- "@abtnode/logger": "1.16.19",
28
- "@abtnode/models": "1.16.19",
29
- "@abtnode/queue": "1.16.19",
30
- "@abtnode/rbac": "1.16.19",
31
- "@abtnode/router-provider": "1.16.19",
32
- "@abtnode/static-server": "1.16.19",
33
- "@abtnode/timemachine": "1.16.19",
34
- "@abtnode/util": "1.16.19",
35
- "@arcblock/did": "1.18.101",
36
- "@arcblock/did-auth": "1.18.101",
37
- "@arcblock/did-ext": "^1.18.101",
22
+ "@abtnode/analytics": "1.16.20-beta-cf6dfce1",
23
+ "@abtnode/auth": "1.16.20-beta-cf6dfce1",
24
+ "@abtnode/certificate-manager": "1.16.20-beta-cf6dfce1",
25
+ "@abtnode/constant": "1.16.20-beta-cf6dfce1",
26
+ "@abtnode/cron": "1.16.20-beta-cf6dfce1",
27
+ "@abtnode/logger": "1.16.20-beta-cf6dfce1",
28
+ "@abtnode/models": "1.16.20-beta-cf6dfce1",
29
+ "@abtnode/queue": "1.16.20-beta-cf6dfce1",
30
+ "@abtnode/rbac": "1.16.20-beta-cf6dfce1",
31
+ "@abtnode/router-provider": "1.16.20-beta-cf6dfce1",
32
+ "@abtnode/static-server": "1.16.20-beta-cf6dfce1",
33
+ "@abtnode/timemachine": "1.16.20-beta-cf6dfce1",
34
+ "@abtnode/util": "1.16.20-beta-cf6dfce1",
35
+ "@arcblock/did": "1.18.103",
36
+ "@arcblock/did-auth": "1.18.103",
37
+ "@arcblock/did-ext": "^1.18.103",
38
38
  "@arcblock/did-motif": "^1.1.13",
39
- "@arcblock/did-util": "1.18.101",
40
- "@arcblock/event-hub": "1.18.101",
41
- "@arcblock/jwt": "^1.18.101",
39
+ "@arcblock/did-util": "1.18.103",
40
+ "@arcblock/event-hub": "1.18.103",
41
+ "@arcblock/jwt": "^1.18.103",
42
42
  "@arcblock/pm2-events": "^0.0.5",
43
- "@arcblock/validator": "^1.18.101",
44
- "@arcblock/vc": "1.18.101",
45
- "@blocklet/constant": "1.16.19",
46
- "@blocklet/env": "1.16.19",
47
- "@blocklet/meta": "1.16.19",
48
- "@blocklet/resolver": "1.16.19",
49
- "@blocklet/sdk": "1.16.19",
50
- "@did-space/client": "^0.3.39",
43
+ "@arcblock/validator": "^1.18.103",
44
+ "@arcblock/vc": "1.18.103",
45
+ "@blocklet/constant": "1.16.20-beta-cf6dfce1",
46
+ "@blocklet/env": "1.16.20-beta-cf6dfce1",
47
+ "@blocklet/meta": "1.16.20-beta-cf6dfce1",
48
+ "@blocklet/resolver": "1.16.20-beta-cf6dfce1",
49
+ "@blocklet/sdk": "1.16.20-beta-cf6dfce1",
50
+ "@did-space/client": "^0.3.41",
51
51
  "@fidm/x509": "^1.2.1",
52
- "@ocap/mcrypto": "1.18.101",
53
- "@ocap/util": "1.18.101",
54
- "@ocap/wallet": "1.18.101",
52
+ "@ocap/mcrypto": "1.18.103",
53
+ "@ocap/util": "1.18.103",
54
+ "@ocap/wallet": "1.18.103",
55
55
  "@slack/webhook": "^5.0.4",
56
56
  "archiver": "^5.3.1",
57
57
  "axios": "^0.27.2",
@@ -101,5 +101,5 @@
101
101
  "jest": "^27.5.1",
102
102
  "unzipper": "^0.10.11"
103
103
  },
104
- "gitHead": "d7ad91ba5d0e15c2a311c335e24882b572f4169e"
104
+ "gitHead": "bc2f0c9c5a39b124c7a7b64ec907527b3e8ccdf1"
105
105
  }