Merge branch 'main' into v6

Author: WikiRik

.github/workflows/ci.yml

@@ -26,8 +26,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
       - run: yarn add sequelize@${{ matrix.sequelize-version }} --ignore-engines
-      - run: docker-compose up -d ${DIALECT}
-      - run: docker run --link ${DIALECT}:db -e CHECK_PORT=${SEQ_PORT::-1} -e CHECK_HOST=db --net cli_default giorgos/takis
+      - run: docker compose up -d ${DIALECT}
+      - run: docker run --link ${DIALECT}:db --net cli_default jwilder/dockerize -wait tcp://${DIALECT}:${SEQ_PORT::-1} -timeout 2m
       - run: yarn test
   test-mysql:
     strategy:
@@ -47,8 +47,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
       - run: yarn add sequelize@${{ matrix.sequelize-version }} --ignore-engines
-      - run: docker-compose up -d ${DIALECT}
-      - run: docker run --link ${DIALECT}:db -e CHECK_PORT=${SEQ_PORT::-1} -e CHECK_HOST=db --net cli_default giorgos/takis
+      - run: docker compose up -d ${DIALECT}
+      - run: docker run --link ${DIALECT}:db --net cli_default jwilder/dockerize -wait tcp://${DIALECT}:${SEQ_PORT::-1} -timeout 2m
       - run: yarn test
   test-sqlite:
     strategy:

.github/workflows/codeql-analysis.yml

@@ -22,10 +22,10 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - "54320:5432"
     container_name: postgres
     command: >
-      bash -c "sed -i -e 's/# \(zh_TW\|en_US\).UTF-8 UTF-8/\1.UTF-8 UTF-8/' /etc/locale.gen
+      bash -c "sed -i -e 's/# \\(zh_TW\\|en_US\\).UTF-8 UTF-8/\\1.UTF-8 UTF-8/' /etc/locale.gen
       && locale-gen
       && docker-entrypoint.sh postgres"
 

package.json

@@ -12,36 +12,36 @@
     "types.d.ts"
   ],
   "dependencies": {
-    "cli-color": "^2.0.3",
     "fs-extra": "^9.1.0",
-    "js-beautify": "^1.14.5",
+    "js-beautify": "1.15.4",
     "lodash": "^4.17.21",
+    "picocolors": "^1.1.1",
     "resolve": "^1.22.1",
     "umzug": "^2.3.0",
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.23.0",
-    "@babel/core": "7.23.2",
-    "@babel/preset-env": "7.23.2",
-    "@babel/register": "7.22.15",
-    "@commitlint/cli": "18.2.0",
-    "@commitlint/config-angular": "18.1.0",
+    "@babel/cli": "7.27.1",
+    "@babel/core": "7.27.1",
+    "@babel/preset-env": "7.27.1",
+    "@babel/register": "7.27.1",
+    "@commitlint/cli": "18.6.1",
+    "@commitlint/config-angular": "18.6.1",
     "bluebird": "3.7.2",
     "eslint": "7.32.0",
-    "eslint-config-prettier": "9.0.0",
+    "eslint-config-prettier": "10.1.2",
     "eslint-plugin-prettier": "4.2.1",
     "expect.js": "0.3.1",
     "gulp": "4.0.2",
     "husky": "8.0.3",
-    "lint-staged": "15.0.2",
+    "lint-staged": "15.5.1",
     "mocha": "9.2.2",
     "mysql2": "3.2.0",
     "pg": "latest",
     "pg-hstore": "latest",
     "prettier": "2.8.8",
-    "semver": "7.5.4",
-    "sequelize": "6.33.0",
+    "semver": "7.7.1",
+    "sequelize": "6.37.7",
     "sqlite3": "latest",
     "through2": "4.0.2"
   },

src/commands/database.js

@@ -4,7 +4,7 @@ import { logMigrator } from '../core/migrator';
 
 import helpers from '../helpers';
 import { cloneDeep, defaults, pick } from 'lodash';
-import clc from 'cli-color';
+import colors from 'picocolors';
 
 const Sequelize = helpers.generic.getSequelize();
 
@@ -61,7 +61,11 @@ exports.handler = async function (args) {
         })
         .catch((e) => helpers.view.error(e));
 
-      helpers.view.log('Database', clc.blueBright(config.database), 'created.');
+      helpers.view.log(
+        'Database',
+        colors.blueBright(config.database),
+        'created.'
+      );
 
       break;
     case 'db:drop':
@@ -76,7 +80,11 @@ exports.handler = async function (args) {
         )
         .catch((e) => helpers.view.error(e));
 
-      helpers.view.log('Database', clc.blueBright(config.database), 'dropped.');
+      helpers.view.log(
+        'Database',
+        colors.blueBright(config.database),
+        'dropped.'
+      );
 
       break;
   }

src/commands/migration_generate.js

@@ -3,7 +3,7 @@ import { _baseOptions, _underscoreOption } from '../core/yargs';
 
 import helpers from '../helpers';
 import fs from 'fs';
-import clc from 'cli-color';
+import colors from 'picocolors';
 
 exports.builder = (yargs) =>
   _underscoreOption(
@@ -30,7 +30,7 @@ exports.handler = function (args) {
 
   helpers.view.log(
     'New migration was created at',
-    clc.blueBright(helpers.path.getMigrationPath(args.name)),
+    colors.blueBright(helpers.path.getMigrationPath(args.name)),
     '.'
   );
 

src/commands/model_generate.js

@@ -2,7 +2,7 @@ import process from 'process';
 import { _baseOptions, _underscoreOption } from '../core/yargs';
 
 import helpers from '../helpers';
-import clc from 'cli-color';
+import colors from 'picocolors';
 
 exports.builder = (yargs) =>
   _underscoreOption(
@@ -38,12 +38,12 @@ exports.handler = function (args) {
   helpers.migration.generateTableCreationFile(args);
   helpers.view.log(
     'New model was created at',
-    clc.blueBright(helpers.path.getModelPath(args.name)),
+    colors.blueBright(helpers.path.getModelPath(args.name)),
     '.'
   );
   helpers.view.log(
     'New migration was created at',
-    clc.blueBright(
+    colors.blueBright(
       helpers.path.getMigrationPath(
         helpers.migration.generateMigrationName(args)
       )
@@ -60,7 +60,7 @@ function ensureModelsFolder() {
       'Unable to find models path (' +
         helpers.path.getModelsPath() +
         '). Did you run ' +
-        clc.blueBright('sequelize init') +
+        colors.blueBright('sequelize init') +
         '?'
     );
   }
@@ -72,7 +72,7 @@ function ensureMigrationsFolder() {
       'Unable to find migrations path (' +
         helpers.path.getPath('migration') +
         '). Did you run ' +
-        clc.blueBright('sequelize init') +
+        colors.blueBright('sequelize init') +
         '?'
     );
   }

src/commands/seed_generate.js

@@ -3,7 +3,7 @@ import { _baseOptions } from '../core/yargs';
 
 import helpers from '../helpers';
 import fs from 'fs';
-import clc from 'cli-color';
+import colors from 'picocolors';
 
 exports.builder = (yargs) =>
   _baseOptions(yargs).option('name', {
@@ -28,7 +28,7 @@ exports.handler = function (args) {
 
   helpers.view.log(
     'New seed was created at',
-    clc.blueBright(helpers.path.getSeederPath(args.name)),
+    colors.blueBright(helpers.path.getSeederPath(args.name)),
     '.'
   );
 

src/helpers/view-helper.js

@@ -1,4 +1,4 @@
-import clc from 'cli-color';
+import colors from 'picocolors';
 import _ from 'lodash';
 import helpers from './index';
 import getYArgs from '../core/yargs';
@@ -15,7 +15,7 @@ module.exports = {
     ];
 
     this.log();
-    this.log(clc.underline('Sequelize CLI [' + versions.join(', ') + ']'));
+    this.log(colors.underline('Sequelize CLI [' + versions.join(', ') + ']'));
     this.log();
   },
 
@@ -36,27 +36,27 @@ module.exports = {
     }
 
     this.log();
-    console.error(`${clc.red('ERROR:')} ${message}`);
+    console.error(`${colors.red('ERROR:')} ${message}`);
     if (error.original && error.original.detail) {
-      console.error(`${clc.red('ERROR DETAIL:')} ${error.original.detail}`);
+      console.error(`${colors.red('ERROR DETAIL:')} ${error.original.detail}`);
     }
 
     extraMessages.forEach((message) =>
-      console.error(`${clc.red('EXTRA MESSAGE:')} ${message}`)
+      console.error(`${colors.red('EXTRA MESSAGE:')} ${message}`)
     );
     this.log();
 
     process.exit(1);
   },
 
   warn(message) {
-    this.log(`${clc.yellow('WARNING:')} ${message}`);
+    this.log(`${colors.yellow('WARNING:')} ${message}`);
   },
 
   notifyAboutExistingFile(file) {
     this.error(
       'The file ' +
-        clc.blueBright(file) +
+        colors.blueBright(file) +
         ' already exists. ' +
         'Run command with --force to overwrite it.'
     );