Skip to content

Commit 55a74a1

Browse files
bailin0824v_guanglwen
bailin0824
and
v_guanglwen
authored
miniprogram-ci & lint & fix bugs (#163)
* feat: swiper change skyline * fix: components change skyline * fix: appjson add pages * fix: Update code format and appid * fix: Delete cover-image * fix: update code format * fix: delete useless function * fix: delete unnecessary symbols * fix: navigation-bar style * feat: github action + miniprogram-ci * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format * fix: code format(1) * fix: code format(2) * fix: code format(3) * fix: code format(4) * fix: code format(5) * fix: code format(6) * fix: update package * feat: update getSystemInfoSync * feat: update bottom-sheet tab ui * feat: update ci appid * feat: 回滚代码,添加eslint ignore忽略文件 * feat: 修改eslint规则 * feat: 去除多于判断 * feat: 修复评论不显示的情况 * feat: eslint格式化 * feat: 修改eslintignore文件 * feat: 去除getSystemInfo * feat: 修改eslintignore * feat: 回滚代码 * feat: 回滚代码（packageChatTool/tdesign） * feat: 修改eslintignore（packageChatTool/tdesign） --------- Co-authored-by: v_guanglwen <[email protected]>
1 parent bc415f2 commit 55a74a1

File tree

570 files changed

+31515
-31791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

570 files changed

+31515
-31791
lines changed

‎.eslintignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
/vendor
22
/node_modules
3+
/cloudfunctions/ARDemo/cloud-functions-tools/test/svrkit-utils/example
4+
/cloudfunctions/ARDemo/wx-server-sdk-wxg-service/index.js
5+
/miniprogram/packageSkylineExamples
6+
/miniprogram/_commons/0.js
7+
/miniprogram/packageAPI/pages/ar/3dmarker-ar/protobuf
8+
/miniprogram/packageAPI/components/tdesign-miniprogram
9+
/miniprogram/packageAPI/pages/ar/gaussian-splatting/util/gl-matrix-min.js
10+
/miniprogram/packageChatTool/components/tdesign-miniprogram

‎.eslintrc.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
module.exports = {
2-
'extends': [
2+
extends: [
33
'airbnb-base',
44
'plugin:promise/recommended'
55
],
6-
'parserOptions': {
7-
'ecmaVersion': 9,
8-
'ecmaFeatures': {
9-
'jsx': false
6+
parserOptions: {
7+
ecmaVersion: 9,
8+
ecmaFeatures: {
9+
jsx: false
1010
},
11-
'sourceType': 'module'
11+
sourceType: 'module'
1212
},
13-
'env': {
14-
'es6': true,
15-
'node': true,
16-
'jest': true
13+
env: {
14+
es6: true,
15+
node: true,
16+
jest: true
1717
},
18-
'plugins': [
18+
plugins: [
1919
'import',
2020
'node',
2121
'promise'
2222
],
23-
'rules': {
23+
rules: {
2424
'arrow-parens': 'off',
2525
'comma-dangle': [
2626
'error',
2727
'only-multiline'
2828
],
29-
'complexity': ['error', 10],
29+
complexity: ['error', 10],
3030
'func-names': 'off',
3131
'global-require': 'off',
3232
'handle-callback-err': [
@@ -36,9 +36,9 @@ module.exports = {
3636
'import/no-unresolved': [
3737
'error',
3838
{
39-
'caseSensitive': true,
40-
'commonjs': true,
41-
'ignore': ['^[^.]']
39+
caseSensitive: true,
40+
commonjs: true,
41+
ignore: ['^[^.]']
4242
}
4343
],
4444
'import/prefer-default-export': 'off',
@@ -58,13 +58,13 @@ module.exports = {
5858
'node/process-exit-as-throw': 'error',
5959
'object-curly-spacing': [
6060
'error',
61-
'never'
61+
'always'
6262
],
6363
'operator-linebreak': [
6464
'error',
6565
'after',
6666
{
67-
'overrides': {
67+
overrides: {
6868
':': 'before',
6969
'?': 'before'
7070
}
@@ -77,23 +77,23 @@ module.exports = {
7777
1,
7878
'as-needed',
7979
{
80-
'unnecessary': true
80+
unnecessary: true
8181
}
8282
],
83-
'semi': [
83+
semi: [
8484
'error',
8585
'never'
8686
]
8787
},
88-
'globals': {
89-
'window': true,
90-
'document': true,
91-
'App': true,
92-
'Page': true,
93-
'Component': true,
94-
'Behavior': true,
95-
'wx': true,
96-
'worker': true,
97-
'getApp': true
88+
globals: {
89+
window: true,
90+
document: true,
91+
App: true,
92+
Page: true,
93+
Component: true,
94+
Behavior: true,
95+
wx: true,
96+
worker: true,
97+
getApp: true
9898
}
9999
}

‎.github/workflows/ci.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: WeChat MiniProgram Demo CI/CD
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
jobs:
11+
upload:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Upload MiniProgram
15+
env:
16+
WX_PRIVATE_KEY: ${{ secrets.WX_PRIVATE_KEY }}
17+
run: |
18+
echo "$WX_PRIVATE_KEY" > ./build/key
19+
node ./build/ci.js

‎build/ci.js

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
const path = require('path')
2+
const ci = require('miniprogram-ci')
3+
const fs = require('fs')
4+
const packageJson = require('../package.json')
5+
6+
const privateKeyContent = process.env.WX_PRIVATE_KEY
7+
if (!privateKeyContent) {
8+
throw new Error('未找到私钥内容，请确保已正确配置 GitHub Secrets')
9+
}
10+
11+
const privateKeyPath = path.resolve(__dirname, './private.key')
12+
fs.writeFileSync(privateKeyPath, privateKeyContent)
13+
14+
const project = new ci.Project({
15+
appid: 'wxe5f52902cf4de896',
16+
type: 'miniProgram',
17+
projectPath: path.resolve(__dirname, '../'),
18+
privateKeyPath: path.resolve(__dirname, './key'),
19+
ignores: [path.resolve(__dirname, '../miniprogram/node_modules/**/*')]
20+
})
21+
const robotNumber = 2
22+
const params = {
23+
onProgressUpdate: console.log,
24+
robot: robotNumber,
25+
version: packageJson.version,
26+
desc: packageJson.bundleDescription,
27+
setting: {
28+
es7: true,
29+
minifyJS: true,
30+
minifyWXML: true,
31+
minifyWXSS: true,
32+
codeProtect: false,
33+
autoPrefixWXSS: true
34+
},
35+
}
36+
ci.upload({
37+
project,
38+
...params
39+
}).then(res => {
40+
console.debug('>>>>upload res', res)
41+
}).catch(err => {
42+
console.error('>>>>upload error', err)
43+
throw err
44+
}).finally(() => {
45+
// 删除临时私钥文件
46+
fs.unlinkSync(privateKeyPath)
47+
})

‎cloudfunctions/ARDemo/cloud-functions-tools/cli/svrkit-utils-template.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
21
function generate(options) {
32
if (!options) {
43
throw new Error('options must be provided')
54
}
65

76
const { serviceName, funcName, data } = options
87

9-
const serviceConfig = config.find(c => c.serviceName === serviceName)
8+
const serviceConfig = config.find(c => c.serviceName === serviceName)
109
if (!serviceConfig) {
1110
throw new Error('service not found')
1211
}
@@ -38,7 +37,7 @@ function generate(options) {
3837
if (!reqProtoJSON.fields[key]) {
3938
throw new Error(`'${key}' doesn't exist in '${reqProtoName}' proto, valid keys are ${Object.keys(reqProtoJSON.fields)}`)
4039
}
41-
}
40+
}
4241
} else {
4342
throw new Error('data must be object')
4443
}
@@ -91,7 +90,7 @@ function generateV2(options) {
9190
if (!reqProtoJSON.fields[key]) {
9291
throw new Error(`'${key}' doesn't exist in '${reqProtoName}' proto, valid keys are ${Object.keys(reqProtoJSON.fields)}`)
9392
}
94-
}
93+
}
9594
} else {
9695
throw new Error('data must be object')
9796
}

‎cloudfunctions/ARDemo/cloud-functions-tools/cli/svrkit-utils.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const path = require('path')
33
const yargs = require('yargs')
44
const chalk = require('chalk')
55
const debug = require('debug')('cli')
6-
const pbjs = require("protobufjs/cli/pbjs")
6+
const pbjs = require('protobufjs/cli/pbjs')
77

88
const log = (...msg) => {
99
console.log(chalk.blue('svrkit-utils'), ...msg)
@@ -50,7 +50,7 @@ function main() {
5050
throw err
5151
}
5252

53-
let staticModuleContent = fs.readFileSync(staticModuleFilePath, 'utf8')
53+
const staticModuleContent = fs.readFileSync(staticModuleFilePath, 'utf8')
5454
fs.writeFileSync(staticModuleFilePath, `// #lizard forgives
5555
${staticModuleContent}`, 'utf8')
5656

@@ -95,4 +95,3 @@ ${protoUtils}
9595
module.exports = {
9696
main,
9797
}
98-

‎cloudfunctions/ARDemo/index.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ exports.main = async (event, context) => {
1111
const wxContext = cloud.getWXContext()
1212
const bizuin = wxContext.APPUIN
1313
switch (event.type) {
14-
case "GenerateARModel":
14+
case 'GenerateARModel':
1515
return await cloud.callWXSvrkit({
1616
pbInstance: svrkitUtils.generate({
17-
serviceName: "Mmbizwxaintpar",
18-
funcName: "GenerateARModel",
17+
serviceName: 'Mmbizwxaintpar',
18+
funcName: 'GenerateARModel',
1919
data: {
20-
bizuin: bizuin,
20+
bizuin,
2121
name: event.name,
2222
url: event.url,
2323
algoType: event.algoType,
@@ -26,14 +26,14 @@ exports.main = async (event, context) => {
2626
},
2727
}),
2828
timeout: 30000,
29-
});
30-
case "GetARModel":
29+
})
30+
case 'GetARModel':
3131
return await cloud.callWXSvrkit({
3232
pbInstance: svrkitUtils.generate({
33-
serviceName: "Mmbizwxaintpar",
34-
funcName: "GetARModel",
33+
serviceName: 'Mmbizwxaintpar',
34+
funcName: 'GetARModel',
3535
data: {
36-
bizuin: bizuin,
36+
bizuin,
3737
cosid: event.cosid,
3838
modelType: event.modelType,
3939
needData: event.needData,
@@ -42,7 +42,7 @@ exports.main = async (event, context) => {
4242
},
4343
}),
4444
timeout: 30000,
45-
});
45+
})
4646
// GetARModelList 废弃，完全依赖本地缓存
4747
// case "GetARModelList":
4848
// return await cloud.callWXSvrkit({
@@ -58,5 +58,4 @@ exports.main = async (event, context) => {
5858
// timeout: 30000,
5959
// });
6060
}
61-
62-
}
61+
}

‎cloudfunctions/ARDemo/svrkit-utils.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
21
const config = require('./svrkit.config.js')
32
const proto = require('./svrkit-utils.static.js')
43
const protoJSON = require('./svrkit-utils.static.json')
4+
55
function getProto(proto, serviceName, protoName) {
66
if (proto[protoName]) {
7-
return proto[protoName];
7+
return proto[protoName]
88
}
99

1010
if (proto[serviceName] && proto[serviceName][protoName]) {
11-
return proto[serviceName][protoName];
11+
return proto[serviceName][protoName]
1212
}
1313

14-
/** 处理 mmpayolcirclemodel.QueryActivityReq 的形式*/
14+
/** 处理 mmpayolcirclemodel.QueryActivityReq 的形式 */
1515
const [realServiceName, realProtoName] = protoName.split('.')
1616
if (proto[realServiceName]) {
1717
return proto[realServiceName][realProtoName]
1818
}
1919

20-
return undefined;
20+
return undefined
2121
}
2222

2323
function generate(options) {
@@ -37,14 +37,14 @@ function generate(options) {
3737
}
3838

3939
const reqProtoName = serviceConfig.functions[funcName].req
40-
const reqProto = getProto(proto, serviceName, reqProtoName);
40+
const reqProto = getProto(proto, serviceName, reqProtoName)
4141

4242
if (!reqProto) {
4343
throw new Error('request proto not found')
4444
}
4545

4646
const resProtoName = serviceConfig.functions[funcName].res
47-
const resProto = resProtoName && getProto(proto, serviceName, resProtoName);
47+
const resProto = resProtoName && getProto(proto, serviceName, resProtoName)
4848

4949
const reqProtoVerifyErr = reqProto.verify(data)
5050
if (reqProtoVerifyErr) {
@@ -133,4 +133,3 @@ module.exports = {
133133
generate,
134134
generateV2,
135135
}
136-

‎cloudfunctions/ARDemo/svrkit.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ module.exports = [
3131
}
3232
}
3333
}
34-
]
34+
]

0 commit comments

Comments
 (0)