From 23fdf4dc2f0fb408187c9b5472c45c3c62000fb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 22:26:50 +0000 Subject: [PATCH 1/2] Bump highlight.js from 11.2.0 to 11.5.0 Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 11.2.0 to 11.5.0. - [Release notes](https://github.com/highlightjs/highlight.js/releases) - [Changelog](https://github.com/highlightjs/highlight.js/blob/main/CHANGES.md) - [Commits](https://github.com/highlightjs/highlight.js/compare/11.2.0...11.5.0) --- updated-dependencies: - dependency-name: highlight.js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 +++------------- package.json | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdc70f49e..bdadd85ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4999,16 +4999,6 @@ "css-tree": "^1.1.2" } }, - "d": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/d/download/d-1.0.1.tgz", - "integrity": "sha1-hpgJU3LVjb7jRv/Qxwk/mfj561o=", - "dev": true, - "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, "dargs": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz", @@ -6209,9 +6199,9 @@ "dev": true }, "highlight.js": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.2.0.tgz", - "integrity": "sha512-JOySjtOEcyG8s4MLR2MNbLUyaXqUunmSnL2kdV/KuGJOmHZuAR5xC54Ko7goAXBWNhf09Vy3B+U7vR62UZ/0iw==" + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.0.tgz", + "integrity": "sha512-SM6WDj5/C+VfIY8pZ6yW6Xa0Fm1tniYVYWYW1Q/DcMnISZFrC3aQAZZZFAAZtybKNrGId3p/DNbFTtcTXXgYBw==" }, "highlight.js-async-webpack": { "version": "1.0.4", diff --git a/package.json b/package.json index a302d7d9e..d769b3b51 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "bootstrap-sass": "^3.3.7", "echarts": "^5.2.1", "chart.js": "^3.5.1", - "highlight.js": "^11.2.0", + "highlight.js": "^11.5.0", "jquery": "^3.6.0", "js-md5": "^0.7.3", "lodash": "^4.17.21", From fb0fc766264d2f2ab7c4f9872a63cc7cadf86359 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 14 Mar 2022 22:27:10 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- scripts/travis-ci-settings.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/travis-ci-settings.php b/scripts/travis-ci-settings.php index 429f5cd61..5262314b1 100644 --- a/scripts/travis-ci-settings.php +++ b/scripts/travis-ci-settings.php @@ -3,6 +3,22 @@ declare(strict_types=1); +/* + * +----------------------------------------------------------------------+ + * | ThinkSNS Plus | + * +----------------------------------------------------------------------+ + * | Copyright (c) 2016-Present ZhiYiChuangXiang Technology Co., Ltd. | + * +----------------------------------------------------------------------+ + * | This source file is subject to enterprise private license, that is | + * | bundled with this package in the file LICENSE, and is available | + * | through the world-wide-web at the following url: | + * | https://github.com/slimkit/plus/blob/master/LICENSE | + * +----------------------------------------------------------------------+ + * | Author: Slim Kit Group | + * | Homepage: www.thinksns.com | + * +----------------------------------------------------------------------+ + */ + $db = $argv[1] ?? 'mysql'; $connection = []; switch ($db) {