@xfe-repo/mini-app 0.0.13 → 0.0.15
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.
- package/deploy/.drone.yml +6 -4
- package/dist/cli.js +9 -12
- package/dist/preview.js +3 -10
- package/package.json +1 -1
package/deploy/.drone.yml
CHANGED
|
@@ -51,17 +51,18 @@ trigger:
|
|
|
51
51
|
steps:
|
|
52
52
|
- name: build
|
|
53
53
|
pull: if-not-exists
|
|
54
|
-
image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-
|
|
54
|
+
image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-base:20.17.0-pnpm
|
|
55
55
|
volumes:
|
|
56
56
|
- name: node-modules
|
|
57
57
|
path: /drone/src/node_modules
|
|
58
58
|
commands:
|
|
59
|
+
- cp -r node_modules/@xfe-repo/mini-app/deploy deploy
|
|
59
60
|
- GET_API_ENV=`bash deploy/env.sh` && export API_ENV=$GET_API_ENV
|
|
60
61
|
- pnpm build --type weapp
|
|
61
62
|
|
|
62
63
|
- name: preview
|
|
63
64
|
pull: if-not-exists
|
|
64
|
-
image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-
|
|
65
|
+
image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-base:20.17.0-pnpm
|
|
65
66
|
volumes:
|
|
66
67
|
- name: node-modules
|
|
67
68
|
path: /drone/src/node_modules
|
|
@@ -77,7 +78,7 @@ steps:
|
|
|
77
78
|
|
|
78
79
|
- name: upload
|
|
79
80
|
pull: if-not-exists
|
|
80
|
-
image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-
|
|
81
|
+
image: xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image-common/node-base:20.17.0-pnpm
|
|
81
82
|
volumes:
|
|
82
83
|
- name: node-modules
|
|
83
84
|
path: /drone/src/node_modules
|
|
@@ -128,8 +129,8 @@ steps:
|
|
|
128
129
|
- name: node-modules
|
|
129
130
|
path: /drone/src/node_modules
|
|
130
131
|
commands:
|
|
132
|
+
- cp -r node_modules/@xfe-repo/mini-app/deploy deploy
|
|
131
133
|
- export REACT_APP_RELEASE=$DRONE_REPO_NAME@${DRONE_TAG:CI_COMMIT_SHA}
|
|
132
|
-
- cp -r node_modules/@xfe-repo/web-app/deploy deploy
|
|
133
134
|
- echo -n "$REACT_APP_RELEASE" > deploy/static/release
|
|
134
135
|
- pnpm build --type h5
|
|
135
136
|
|
|
@@ -147,6 +148,7 @@ steps:
|
|
|
147
148
|
- /usr/local/bin/dockerd-entrypoint.sh 2>&1 >> /dev/null &
|
|
148
149
|
- sleep 5
|
|
149
150
|
- sh /data/scripts/builderInit.sh
|
|
151
|
+
- mkdir -p build/client && cp -r dist/h5 build/client
|
|
150
152
|
- appName="`echo ${DRONE_REPO//\//-}`"
|
|
151
153
|
- sed -i "s/<<APP_NAME>>/$appName/g" deploy/helm/values.yaml
|
|
152
154
|
- docker build -f deploy/Dockerfile -t xhj-prod-registry-vpc.cn-hangzhou.cr.aliyuncs.com/xhj-image/$$appName:$$CI_COMMIT_SHA . --no-cache
|
package/dist/cli.js
CHANGED
|
@@ -374,7 +374,7 @@ function previewMini(version) {
|
|
|
374
374
|
}
|
|
375
375
|
function _previewMini() {
|
|
376
376
|
_previewMini = _async_to_generator(function(version) {
|
|
377
|
-
var pageUrl, desc, scene, progress, _pageUrl_split, pagePath, searchQuery, project, robot
|
|
377
|
+
var pageUrl, desc, scene, progress, _pageUrl_split, pagePath, searchQuery, project, robot;
|
|
378
378
|
var _arguments = arguments;
|
|
379
379
|
return _ts_generator(this, function(_state) {
|
|
380
380
|
switch(_state.label){
|
|
@@ -383,25 +383,18 @@ function _previewMini() {
|
|
|
383
383
|
_pageUrl_split = _sliced_to_array(pageUrl.split("?"), 2), pagePath = _pageUrl_split[0], searchQuery = _pageUrl_split[1];
|
|
384
384
|
project = getProject();
|
|
385
385
|
robot = choiceRobot();
|
|
386
|
-
onProgressUpdate = progress ? console.log : function() {
|
|
387
|
-
return null;
|
|
388
|
-
};
|
|
389
386
|
return [
|
|
390
387
|
4,
|
|
391
388
|
(0, import_miniprogram_ci.preview)({
|
|
392
389
|
project: project,
|
|
393
390
|
version: version,
|
|
394
391
|
qrcodeFormat: "terminal",
|
|
395
|
-
qrcodeOutputDest: "
|
|
392
|
+
qrcodeOutputDest: "deploy/preview.qrcode.jpg",
|
|
396
393
|
pagePath: pagePath,
|
|
397
394
|
searchQuery: searchQuery,
|
|
398
395
|
desc: desc,
|
|
399
396
|
robot: robot,
|
|
400
|
-
scene: scene
|
|
401
|
-
onProgressUpdate: onProgressUpdate,
|
|
402
|
-
setting: {
|
|
403
|
-
es6: true
|
|
404
|
-
}
|
|
397
|
+
scene: scene
|
|
405
398
|
})
|
|
406
399
|
];
|
|
407
400
|
case 1:
|
|
@@ -510,8 +503,12 @@ if (command === "dev") {
|
|
|
510
503
|
config();
|
|
511
504
|
} else if (command === "upload") {
|
|
512
505
|
var v = argv.v, version = argv.version, d = argv.d, desc = argv.desc, P = argv.P, progress = argv.progress;
|
|
513
|
-
void uploadMini(v || version, d || desc, P || progress)
|
|
506
|
+
void uploadMini(v || version, d || desc, P || progress).catch(console.error).finally(function() {
|
|
507
|
+
return process.exit(0);
|
|
508
|
+
});
|
|
514
509
|
} else if (command === "preview") {
|
|
515
510
|
var v1 = argv.v, version1 = argv.version, p = argv.p, previewPath = argv.path, d1 = argv.d, desc1 = argv.desc, s = argv.s, scene = argv.scene, P1 = argv.P, progress1 = argv.progress;
|
|
516
|
-
void previewMini(v1 || version1, p || previewPath, d1 || desc1, s || scene, P1 || progress1)
|
|
511
|
+
void previewMini(v1 || version1, p || previewPath, d1 || desc1, s || scene, P1 || progress1).finally(function() {
|
|
512
|
+
return process.exit(0);
|
|
513
|
+
});
|
|
517
514
|
}
|
package/dist/preview.js
CHANGED
|
@@ -275,7 +275,7 @@ function previewMini(version) {
|
|
|
275
275
|
}
|
|
276
276
|
function _previewMini() {
|
|
277
277
|
_previewMini = _async_to_generator(function(version) {
|
|
278
|
-
var pageUrl, desc, scene, progress, _pageUrl_split, pagePath, searchQuery, project, robot
|
|
278
|
+
var pageUrl, desc, scene, progress, _pageUrl_split, pagePath, searchQuery, project, robot;
|
|
279
279
|
var _arguments = arguments;
|
|
280
280
|
return _ts_generator(this, function(_state) {
|
|
281
281
|
switch(_state.label){
|
|
@@ -284,25 +284,18 @@ function _previewMini() {
|
|
|
284
284
|
_pageUrl_split = _sliced_to_array(pageUrl.split("?"), 2), pagePath = _pageUrl_split[0], searchQuery = _pageUrl_split[1];
|
|
285
285
|
project = getProject();
|
|
286
286
|
robot = choiceRobot();
|
|
287
|
-
onProgressUpdate = progress ? console.log : function() {
|
|
288
|
-
return null;
|
|
289
|
-
};
|
|
290
287
|
return [
|
|
291
288
|
4,
|
|
292
289
|
(0, import_miniprogram_ci.preview)({
|
|
293
290
|
project: project,
|
|
294
291
|
version: version,
|
|
295
292
|
qrcodeFormat: "terminal",
|
|
296
|
-
qrcodeOutputDest: "
|
|
293
|
+
qrcodeOutputDest: "deploy/preview.qrcode.jpg",
|
|
297
294
|
pagePath: pagePath,
|
|
298
295
|
searchQuery: searchQuery,
|
|
299
296
|
desc: desc,
|
|
300
297
|
robot: robot,
|
|
301
|
-
scene: scene
|
|
302
|
-
onProgressUpdate: onProgressUpdate,
|
|
303
|
-
setting: {
|
|
304
|
-
es6: true
|
|
305
|
-
}
|
|
298
|
+
scene: scene
|
|
306
299
|
})
|
|
307
300
|
];
|
|
308
301
|
case 1:
|