cnpmcore 3.30.1 → 3.31.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.
|
@@ -30,6 +30,8 @@ const DOWNLOAD_PATHS = {
|
|
|
30
30
|
'ubuntu18.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
|
|
31
31
|
'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
|
|
32
32
|
'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
|
|
33
|
+
'debian11': 'builds/chromium/%s/chromium-linux.zip',
|
|
34
|
+
'debian11-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
|
|
33
35
|
'mac10.13': 'builds/chromium/%s/chromium-mac.zip',
|
|
34
36
|
'mac10.14': 'builds/chromium/%s/chromium-mac.zip',
|
|
35
37
|
'mac10.15': 'builds/chromium/%s/chromium-mac.zip',
|
|
@@ -37,6 +39,8 @@ const DOWNLOAD_PATHS = {
|
|
|
37
39
|
'mac11-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
|
|
38
40
|
'mac12': 'builds/chromium/%s/chromium-mac.zip',
|
|
39
41
|
'mac12-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
|
|
42
|
+
'mac13': 'builds/chromium/%s/chromium-mac.zip',
|
|
43
|
+
'mac13-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
|
|
40
44
|
'win64': 'builds/chromium/%s/chromium-win64.zip',
|
|
41
45
|
},
|
|
42
46
|
'chromium-tip-of-tree': {
|
|
@@ -49,6 +53,8 @@ const DOWNLOAD_PATHS = {
|
|
|
49
53
|
'ubuntu18.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
|
|
50
54
|
'ubuntu20.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
|
|
51
55
|
'ubuntu22.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
|
|
56
|
+
'debian11': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
|
|
57
|
+
'debian11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
|
|
52
58
|
'mac10.13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
53
59
|
'mac10.14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
54
60
|
'mac10.15': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
@@ -56,6 +62,8 @@ const DOWNLOAD_PATHS = {
|
|
|
56
62
|
'mac11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
|
|
57
63
|
'mac12': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
58
64
|
'mac12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
|
|
65
|
+
'mac13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
|
|
66
|
+
'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
|
|
59
67
|
'win64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-win64.zip',
|
|
60
68
|
},
|
|
61
69
|
'chromium-with-symbols': {
|
|
@@ -68,6 +76,8 @@ const DOWNLOAD_PATHS = {
|
|
|
68
76
|
'ubuntu18.04-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip',
|
|
69
77
|
'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip',
|
|
70
78
|
'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip',
|
|
79
|
+
'debian11': 'builds/chromium/%s/chromium-with-symbols-linux.zip',
|
|
80
|
+
'debian11-arm64': 'builds/chromium/%s/chromium-with-symbols-linux-arm64.zip',
|
|
71
81
|
'mac10.13': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
72
82
|
'mac10.14': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
73
83
|
'mac10.15': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
@@ -75,6 +85,8 @@ const DOWNLOAD_PATHS = {
|
|
|
75
85
|
'mac11-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip',
|
|
76
86
|
'mac12': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
77
87
|
'mac12-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip',
|
|
88
|
+
'mac13': 'builds/chromium/%s/chromium-with-symbols-mac.zip',
|
|
89
|
+
'mac13-arm64': 'builds/chromium/%s/chromium-with-symbols-mac-arm64.zip',
|
|
78
90
|
'win64': 'builds/chromium/%s/chromium-with-symbols-win64.zip',
|
|
79
91
|
},
|
|
80
92
|
'firefox': {
|
|
@@ -87,6 +99,8 @@ const DOWNLOAD_PATHS = {
|
|
|
87
99
|
'ubuntu18.04-arm64': undefined,
|
|
88
100
|
'ubuntu20.04-arm64': 'builds/firefox/%s/firefox-ubuntu-20.04-arm64.zip',
|
|
89
101
|
'ubuntu22.04-arm64': 'builds/firefox/%s/firefox-ubuntu-22.04-arm64.zip',
|
|
102
|
+
'debian11': 'builds/firefox/%s/firefox-debian-11.zip',
|
|
103
|
+
'debian11-arm64': 'builds/firefox/%s/firefox-debian-11-arm64.zip',
|
|
90
104
|
'mac10.13': 'builds/firefox/%s/firefox-mac-11.zip',
|
|
91
105
|
'mac10.14': 'builds/firefox/%s/firefox-mac-11.zip',
|
|
92
106
|
'mac10.15': 'builds/firefox/%s/firefox-mac-11.zip',
|
|
@@ -94,6 +108,8 @@ const DOWNLOAD_PATHS = {
|
|
|
94
108
|
'mac11-arm64': 'builds/firefox/%s/firefox-mac-11-arm64.zip',
|
|
95
109
|
'mac12': 'builds/firefox/%s/firefox-mac-11.zip',
|
|
96
110
|
'mac12-arm64': 'builds/firefox/%s/firefox-mac-11-arm64.zip',
|
|
111
|
+
'mac13': 'builds/firefox/%s/firefox-mac-11.zip',
|
|
112
|
+
'mac13-arm64': 'builds/firefox/%s/firefox-mac-11-arm64.zip',
|
|
97
113
|
'win64': 'builds/firefox/%s/firefox-win64.zip',
|
|
98
114
|
},
|
|
99
115
|
'firefox-beta': {
|
|
@@ -106,6 +122,8 @@ const DOWNLOAD_PATHS = {
|
|
|
106
122
|
'ubuntu18.04-arm64': undefined,
|
|
107
123
|
'ubuntu20.04-arm64': undefined,
|
|
108
124
|
'ubuntu22.04-arm64': 'builds/firefox-beta/%s/firefox-beta-ubuntu-22.04-arm64.zip',
|
|
125
|
+
'debian11': 'builds/firefox-beta/%s/firefox-beta-debian-11.zip',
|
|
126
|
+
'debian11-arm64': 'builds/firefox-beta/%s/firefox-beta-debian-11-arm64.zip',
|
|
109
127
|
'mac10.13': 'builds/firefox-beta/%s/firefox-beta-mac-11.zip',
|
|
110
128
|
'mac10.14': 'builds/firefox-beta/%s/firefox-beta-mac-11.zip',
|
|
111
129
|
'mac10.15': 'builds/firefox-beta/%s/firefox-beta-mac-11.zip',
|
|
@@ -113,25 +131,31 @@ const DOWNLOAD_PATHS = {
|
|
|
113
131
|
'mac11-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
|
|
114
132
|
'mac12': 'builds/firefox-beta/%s/firefox-beta-mac-11.zip',
|
|
115
133
|
'mac12-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
|
|
134
|
+
'mac13': 'builds/firefox-beta/%s/firefox-beta-mac-11.zip',
|
|
135
|
+
'mac13-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-11-arm64.zip',
|
|
116
136
|
'win64': 'builds/firefox-beta/%s/firefox-beta-win64.zip',
|
|
117
137
|
},
|
|
118
138
|
'webkit': {
|
|
119
139
|
'<unknown>': undefined,
|
|
120
140
|
'generic-linux': 'builds/webkit/%s/webkit-ubuntu-20.04.zip',
|
|
121
141
|
'generic-linux-arm64': 'builds/webkit/%s/webkit-ubuntu-20.04-arm64.zip',
|
|
122
|
-
'ubuntu18.04': 'builds/webkit/%s/webkit-ubuntu-18.04.zip',
|
|
142
|
+
'ubuntu18.04': 'builds/deprecated-webkit-ubuntu-18.04/%s/deprecated-webkit-ubuntu-18.04.zip',
|
|
123
143
|
'ubuntu20.04': 'builds/webkit/%s/webkit-ubuntu-20.04.zip',
|
|
124
144
|
'ubuntu22.04': 'builds/webkit/%s/webkit-ubuntu-22.04.zip',
|
|
125
145
|
'ubuntu18.04-arm64': undefined,
|
|
126
146
|
'ubuntu20.04-arm64': 'builds/webkit/%s/webkit-ubuntu-20.04-arm64.zip',
|
|
127
147
|
'ubuntu22.04-arm64': 'builds/webkit/%s/webkit-ubuntu-22.04-arm64.zip',
|
|
148
|
+
'debian11': 'builds/webkit/%s/webkit-debian-11.zip',
|
|
149
|
+
'debian11-arm64': 'builds/webkit/%s/webkit-debian-11-arm64.zip',
|
|
128
150
|
'mac10.13': undefined,
|
|
129
151
|
'mac10.14': 'builds/deprecated-webkit-mac-10.14/%s/deprecated-webkit-mac-10.14.zip',
|
|
130
|
-
'mac10.15': 'builds/webkit/%s/webkit-mac-10.15.zip',
|
|
152
|
+
'mac10.15': 'builds/deprecated-webkit-mac-10.15/%s/deprecated-webkit-mac-10.15.zip',
|
|
131
153
|
'mac11': 'builds/webkit/%s/webkit-mac-11.zip',
|
|
132
154
|
'mac11-arm64': 'builds/webkit/%s/webkit-mac-11-arm64.zip',
|
|
133
155
|
'mac12': 'builds/webkit/%s/webkit-mac-12.zip',
|
|
134
156
|
'mac12-arm64': 'builds/webkit/%s/webkit-mac-12-arm64.zip',
|
|
157
|
+
'mac13': 'builds/webkit/%s/webkit-mac-13.zip',
|
|
158
|
+
'mac13-arm64': 'builds/webkit/%s/webkit-mac-13-arm64.zip',
|
|
135
159
|
'win64': 'builds/webkit/%s/webkit-win64.zip',
|
|
136
160
|
},
|
|
137
161
|
'ffmpeg': {
|
|
@@ -144,6 +168,8 @@ const DOWNLOAD_PATHS = {
|
|
|
144
168
|
'ubuntu18.04-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
|
|
145
169
|
'ubuntu20.04-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
|
|
146
170
|
'ubuntu22.04-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
|
|
171
|
+
'debian11': 'builds/ffmpeg/%s/ffmpeg-linux.zip',
|
|
172
|
+
'debian11-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
|
|
147
173
|
'mac10.13': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
148
174
|
'mac10.14': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
149
175
|
'mac10.15': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
@@ -151,8 +177,13 @@ const DOWNLOAD_PATHS = {
|
|
|
151
177
|
'mac11-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
|
|
152
178
|
'mac12': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
153
179
|
'mac12-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
|
|
180
|
+
'mac13': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
|
|
181
|
+
'mac13-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
|
|
154
182
|
'win64': 'builds/ffmpeg/%s/ffmpeg-win64.zip',
|
|
155
183
|
},
|
|
184
|
+
'android': {
|
|
185
|
+
'<unknown>': 'builds/android/%s/android.zip',
|
|
186
|
+
},
|
|
156
187
|
};
|
|
157
188
|
let PlaywrightBinary = exports.PlaywrightBinary = class PlaywrightBinary extends AbstractBinary_1.AbstractBinary {
|
|
158
189
|
async initFetch() {
|
|
@@ -225,4 +256,4 @@ exports.PlaywrightBinary = PlaywrightBinary = __decorate([
|
|
|
225
256
|
(0, tegg_1.SingletonProto)(),
|
|
226
257
|
(0, AbstractBinary_1.BinaryAdapter)(Binary_1.BinaryType.Playwright)
|
|
227
258
|
], PlaywrightBinary);
|
|
228
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
259
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlaywrightBinary.js","sourceRoot":"","sources":["../../../../../app/common/adapter/binary/PlaywrightBinary.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,23 +60,23 @@ exports.default = (appInfo) => {
|
|
|
60
60
|
const config = {};
|
|
61
61
|
config.cnpmcore = exports.cnpmcoreConfig;
|
|
62
62
|
// override config from framework / plugin
|
|
63
|
-
config.dataDir = (0, path_1.join)(appInfo.root, '.cnpmcore');
|
|
63
|
+
config.dataDir = process.env.CNPMCORE_DATA_DIR || (0, path_1.join)(appInfo.root, '.cnpmcore');
|
|
64
64
|
config.orm = {
|
|
65
65
|
client: 'mysql',
|
|
66
|
-
database: process.env.MYSQL_DATABASE || 'cnpmcore',
|
|
67
|
-
host: process.env.MYSQL_HOST || '127.0.0.1',
|
|
68
|
-
port: process.env.MYSQL_PORT || 3306,
|
|
69
|
-
user: process.env.MYSQL_USER || 'root',
|
|
70
|
-
password: process.env.MYSQL_PASSWORD,
|
|
66
|
+
database: process.env.CNPMCORE_MYSQL_DATABASE || process.env.MYSQL_DATABASE || 'cnpmcore',
|
|
67
|
+
host: process.env.CNPMCORE_MYSQL_HOST || process.env.MYSQL_HOST || '127.0.0.1',
|
|
68
|
+
port: process.env.CNPMCORE_MYSQL_PORT || process.env.MYSQL_PORT || 3306,
|
|
69
|
+
user: process.env.CNPMCORE_MYSQL_USER || process.env.MYSQL_USER || 'root',
|
|
70
|
+
password: process.env.CNPMCORE_MYSQL_PASSWORD || process.env.MYSQL_PASSWORD,
|
|
71
71
|
charset: 'utf8mb4',
|
|
72
72
|
logger: {},
|
|
73
73
|
};
|
|
74
74
|
config.redis = {
|
|
75
75
|
client: {
|
|
76
|
-
port: 6379,
|
|
77
|
-
host: '127.0.0.1',
|
|
78
|
-
password: '',
|
|
79
|
-
db: 0,
|
|
76
|
+
port: Number(process.env.CNPMCORE_REDIS_PORT || 6379),
|
|
77
|
+
host: process.env.CNPMCORE_REDIS_HOST || '127.0.0.1',
|
|
78
|
+
password: process.env.CNPMCORE_REDIS_PASSWORD || '',
|
|
79
|
+
db: Number(process.env.CNPMCORE_REDIS_DB || 0),
|
|
80
80
|
},
|
|
81
81
|
};
|
|
82
82
|
config.security = {
|
|
@@ -93,7 +93,7 @@ exports.default = (appInfo) => {
|
|
|
93
93
|
};
|
|
94
94
|
config.nfs = {
|
|
95
95
|
client: null,
|
|
96
|
-
dir: (0, path_1.join)(config.dataDir, 'nfs'),
|
|
96
|
+
dir: process.env.CNPMCORE_NFS_DIR || (0, path_1.join)(config.dataDir, 'nfs'),
|
|
97
97
|
};
|
|
98
98
|
/* c8 ignore next 17 */
|
|
99
99
|
// enable oss nfs store by env values
|
|
@@ -116,7 +116,18 @@ exports.default = (appInfo) => {
|
|
|
116
116
|
config.logger = {
|
|
117
117
|
enablePerformanceTimer: true,
|
|
118
118
|
enableFastContextLogger: true,
|
|
119
|
+
appLogName: process.env.CNPMCORE_APP_LOG_NAME || `${appInfo.name}-web.log`,
|
|
120
|
+
coreLogName: process.env.CNPMCORE_CORE_LOG_NAME || 'egg-web.log',
|
|
121
|
+
agentLogName: process.env.CNPMCORE_AGENT_LOG_NAME || 'egg-agent.log',
|
|
122
|
+
errorLogName: process.env.CNPMCORE_ERROR_LOG_NAME || 'common-error.log',
|
|
123
|
+
outputJSON: Boolean(process.env.CNPMCORE_LOG_JSON_OUTPUT || false),
|
|
119
124
|
};
|
|
125
|
+
if (process.env.CNPMCORE_LOG_DIR) {
|
|
126
|
+
config.logger.dir = process.env.CNPMCORE_LOG_DIR;
|
|
127
|
+
}
|
|
128
|
+
if (process.env.CNPMCORE_LOG_JSON_OUTPUT) {
|
|
129
|
+
config.logger.outputJSON = Boolean(process.env.CNPMCORE_LOG_JSON_OUTPUT);
|
|
130
|
+
}
|
|
120
131
|
config.logrotator = {
|
|
121
132
|
// only keep 1 days log files
|
|
122
133
|
maxDays: 1,
|
|
@@ -143,4 +154,4 @@ exports.default = (appInfo) => {
|
|
|
143
154
|
};
|
|
144
155
|
return config;
|
|
145
156
|
};
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvY29uZmlnLmRlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLCtCQUE0QjtBQUU1Qix3REFBaUM7QUFDakMsaURBQStDO0FBQy9DLHVEQUFzRjtBQUd6RSxRQUFBLGNBQWMsR0FBbUI7SUFDNUMsSUFBSSxFQUFFLE1BQU07SUFDWixVQUFVLEVBQUUsS0FBSztJQUNqQixVQUFVLEVBQUUsRUFBRTtJQUNkLGNBQWMsRUFBRSw0QkFBNEI7SUFDNUMsb0JBQW9CLEVBQUUsS0FBSztJQUMzQixpQkFBaUIsRUFBRSxLQUFLO0lBQ3hCLHlCQUF5QixFQUFFLE1BQU07SUFDakMsc0JBQXNCLEVBQUUsR0FBRztJQUMzQixRQUFRLEVBQUUsb0JBQVEsQ0FBQyxJQUFJO0lBQ3ZCLGNBQWMsRUFBRSwwQkFBYyxDQUFDLE1BQU07SUFDckMsbUNBQW1DLEVBQUUsRUFBRTtJQUN2QyxtQ0FBbUMsRUFBRSxFQUFFO0lBQ3ZDLHlDQUF5QyxFQUFFLEVBQUU7SUFDN0Msb0JBQW9CLEVBQUUsRUFBRTtJQUN4QiwwQkFBMEIsRUFBRSxJQUFJO0lBQ2hDLGdCQUFnQixFQUFFLEtBQUs7SUFDdkIsdUJBQXVCLEVBQUUsRUFBRTtJQUMzQixzQkFBc0IsRUFBRSxLQUFLO0lBQzdCLDhCQUE4QixFQUFFLEVBQUU7SUFDbEMsdUJBQXVCLEVBQUUsRUFBRTtJQUMzQixtQkFBbUIsRUFBRSxLQUFLO0lBQzFCLDBCQUEwQixFQUFFLEdBQUc7SUFDL0IscUJBQXFCLEVBQUUsNkJBQTZCO0lBQ3BELHlCQUF5QixFQUFFLDZCQUFpQixDQUFDLFNBQVM7SUFDdEQsUUFBUSxFQUFFLHVCQUF1QjtJQUNqQyxVQUFVLEVBQUUsS0FBSztJQUNqQixXQUFXLEVBQUU7UUFDWCxPQUFPO1FBQ1AsV0FBVztRQUNYLFVBQVU7S0FDWDtJQUNELDJCQUEyQixF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
|