Skip to content

Commit 14c0b76

Browse files
committed
Merge remote-tracking branch 'origin/main' into v6
2 parents dc0317c + a52f8bd commit 14c0b76

File tree

5 files changed

+1286
-1418
lines changed

5 files changed

+1286
-1418
lines changed

Diff for: .github/workflows/ci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
DIALECT: postgres
2121
SEQ_PORT: 54320
2222
steps:
23-
- uses: actions/checkout@v3
24-
- uses: actions/setup-node@v3
23+
- uses: actions/checkout@v4
24+
- uses: actions/setup-node@v4
2525
with:
2626
node-version: ${{ matrix.node-version }}
2727
- run: yarn install --frozen-lockfile --ignore-engines
@@ -41,8 +41,8 @@ jobs:
4141
DIALECT: mysql
4242
SEQ_PORT: 33060
4343
steps:
44-
- uses: actions/checkout@v3
45-
- uses: actions/setup-node@v3
44+
- uses: actions/checkout@v4
45+
- uses: actions/setup-node@v4
4646
with:
4747
node-version: ${{ matrix.node-version }}
4848
- run: yarn install --frozen-lockfile --ignore-engines
@@ -61,8 +61,8 @@ jobs:
6161
env:
6262
DIALECT: sqlite
6363
steps:
64-
- uses: actions/checkout@v3
65-
- uses: actions/setup-node@v3
64+
- uses: actions/checkout@v4
65+
- uses: actions/setup-node@v4
6666
with:
6767
node-version: ${{ matrix.node-version }}
6868
- run: yarn install --frozen-lockfile --ignore-engines
@@ -82,8 +82,8 @@ jobs:
8282
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8383
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
8484
steps:
85-
- uses: actions/checkout@v3
86-
- uses: actions/setup-node@v3
85+
- uses: actions/checkout@v4
86+
- uses: actions/setup-node@v4
8787
with:
8888
node-version: 18.x
8989
- run: yarn install --frozen-lockfile

Diff for: .github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
language: [ 'javascript' ]
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
- name: Initialize CodeQL
2525
uses: github/codeql-action/init@v2
2626
with:

Diff for: package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
"yargs": "^16.2.0"
2222
},
2323
"devDependencies": {
24-
"@babel/cli": "7.21.5",
25-
"@babel/core": "7.22.1",
26-
"@babel/preset-env": "7.22.4",
27-
"@babel/register": "7.21.0",
28-
"@commitlint/cli": "17.6.5",
29-
"@commitlint/config-angular": "17.6.5",
24+
"@babel/cli": "7.23.0",
25+
"@babel/core": "7.23.2",
26+
"@babel/preset-env": "7.23.2",
27+
"@babel/register": "7.22.15",
28+
"@commitlint/cli": "18.2.0",
29+
"@commitlint/config-angular": "18.1.0",
3030
"bluebird": "3.7.2",
3131
"eslint": "7.32.0",
32-
"eslint-config-prettier": "8.8.0",
32+
"eslint-config-prettier": "9.0.0",
3333
"eslint-plugin-prettier": "4.2.1",
3434
"expect.js": "0.3.1",
3535
"gulp": "4.0.2",
3636
"husky": "8.0.3",
37-
"lint-staged": "13.2.2",
37+
"lint-staged": "15.0.2",
3838
"mocha": "9.2.2",
3939
"mysql2": "3.2.0",
4040
"pg": "latest",
4141
"pg-hstore": "latest",
4242
"prettier": "2.8.8",
43-
"semver": "7.5.1",
44-
"sequelize": "6.32.0",
43+
"semver": "7.5.4",
44+
"sequelize": "6.33.0",
4545
"sqlite3": "latest",
4646
"through2": "4.0.2"
4747
},

Diff for: src/helpers/config-helper.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,11 @@ const api = {
181181
};
182182

183183
if (urlParts.auth) {
184-
result = _.assign(result, {
185-
username: urlParts.auth.split(':')[0],
186-
password: urlParts.auth.split(':')[1],
187-
});
184+
const authParts = urlParts.auth.split(':');
185+
result.username = authParts[0];
186+
if (authParts.length > 1) {
187+
result.password = authParts.slice(1).join(':');
188+
}
188189
}
189190

190191
return result;

0 commit comments

Comments
 (0)