mirror of
https://gitee.com/nocobase/nocobase.git
synced 2024-12-01 19:58:15 +08:00
Merge branch 'main' into next
This commit is contained in:
commit
de595019ba
@ -78,7 +78,7 @@ class AppGenerator extends Generator {
|
||||
const { dbDialect, allDbDialect } = this.args;
|
||||
|
||||
if (allDbDialect) {
|
||||
dependencies.push(`"mysql2": "^2.3.3"`);
|
||||
dependencies.push(`"mysql2": "^3.11.0"`);
|
||||
dependencies.push(`"mariadb": "^2.5.6"`);
|
||||
dependencies.push(`"pg": "^8.7.3"`);
|
||||
dependencies.push(`"pg-hstore": "^2.3.4"`);
|
||||
@ -94,7 +94,7 @@ class AppGenerator extends Generator {
|
||||
break;
|
||||
case 'mysql':
|
||||
if (!allDbDialect) {
|
||||
dependencies.push(`"mysql2": "^2.3.3"`);
|
||||
dependencies.push(`"mysql2": "^3.11.0"`);
|
||||
}
|
||||
envs.push(`DB_HOST=${env.DB_HOST || 'localhost'}`);
|
||||
envs.push(`DB_PORT=${env.DB_PORT || 3306}`);
|
||||
|
@ -48,7 +48,7 @@ const deps: Record<string, string> = {
|
||||
'@dnd-kit/sortable': '6.x',
|
||||
'@dnd-kit/utilities': '3.x',
|
||||
dayjs: '1.x',
|
||||
mysql2: '2.x',
|
||||
mysql2: '3.x',
|
||||
pg: '8.x',
|
||||
'pg-hstore': '2.x',
|
||||
sqlite3: '5.x',
|
||||
|
@ -66,7 +66,7 @@
|
||||
"jsdom-worker": "^0.3.0",
|
||||
"mariadb": "^2.5.6",
|
||||
"mockjs": "^1.1.0",
|
||||
"mysql2": "^2.3.3",
|
||||
"mysql2": "^3.11.0",
|
||||
"pg": "^8.7.3",
|
||||
"pg-hstore": "^2.3.4",
|
||||
"sqlite3": "^5.0.8",
|
||||
|
21
yarn.lock
21
yarn.lock
@ -17820,11 +17820,6 @@ logform@^2.3.2, logform@^2.4.0:
|
||||
safe-stable-stringify "^2.3.1"
|
||||
triple-beam "^1.3.0"
|
||||
|
||||
long@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.npmmirror.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
|
||||
integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
|
||||
|
||||
long@^5.2.0, long@^5.2.1:
|
||||
version "5.2.3"
|
||||
resolved "https://registry.npmmirror.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
|
||||
@ -19272,20 +19267,6 @@ mute-stream@0.0.8, mute-stream@~0.0.4:
|
||||
resolved "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
|
||||
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
|
||||
|
||||
mysql2@^2.3.3:
|
||||
version "2.3.3"
|
||||
resolved "https://registry.npmmirror.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0"
|
||||
integrity sha512-wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA==
|
||||
dependencies:
|
||||
denque "^2.0.1"
|
||||
generate-function "^2.3.1"
|
||||
iconv-lite "^0.6.3"
|
||||
long "^4.0.0"
|
||||
lru-cache "^6.0.0"
|
||||
named-placeholders "^1.1.2"
|
||||
seq-queue "^0.0.5"
|
||||
sqlstring "^2.3.2"
|
||||
|
||||
mysql2@^3.11.0:
|
||||
version "3.11.0"
|
||||
resolved "https://registry.npmmirror.com/mysql2/-/mysql2-3.11.0.tgz#2a7bd7c615ab43f8167ed9922063b968f3e48f33"
|
||||
@ -19310,7 +19291,7 @@ mz@^2.7.0:
|
||||
object-assign "^4.0.1"
|
||||
thenify-all "^1.0.0"
|
||||
|
||||
named-placeholders@^1.1.2, named-placeholders@^1.1.3:
|
||||
named-placeholders@^1.1.3:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.npmmirror.com/named-placeholders/-/named-placeholders-1.1.3.tgz#df595799a36654da55dda6152ba7a137ad1d9351"
|
||||
integrity sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==
|
||||
|
Loading…
Reference in New Issue
Block a user