diff --git a/.circleci/template.yml b/.circleci/template.yml index 3d9356d8c..2baccf359 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -119,6 +119,9 @@ jobs: then circleci-agent step halt fi + - run: + name: Install the "coveralls" package + command: yarn add --ignore-workspace-root-check coveralls - run: name: Upload code coverage command: cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js diff --git a/package.json b/package.json index 5e01b0379..bd13fd982 100644 --- a/package.json +++ b/package.json @@ -18,18 +18,16 @@ "@ckeditor/ckeditor5-dev-ci": "^44.0.0-alpha.0", "@ckeditor/ckeditor5-dev-release-tools": "^44.0.0-alpha.0", "@ckeditor/ckeditor5-dev-bump-year": "^44.0.0-alpha.0", - "coveralls": "^3.1.1", "eslint": "^8.21.0", "eslint-config-ckeditor5": "^7.0.0", - "fs-extra": "^11.2.0", - "glob": "^10.2.5", + "fs-extra": "^11.0.0", + "glob": "^10.0.0", "husky": "^8.0.2", "js-yaml": "^4.1.0", - "lint-staged": "^10.2.4", - "listr2": "^6.5.0", + "lint-staged": "^15.0.0", + "listr2": "^8.0.0", "minimist": "^1.2.8", - "nyc": "^15.1.0", - "semver": "^7.5.3", + "semver": "^7.6.3", "upath": "^2.0.1" }, "scripts": { diff --git a/packages/ckeditor5-dev-build-tools/package.json b/packages/ckeditor5-dev-build-tools/package.json index e56d508a5..87bbc1219 100644 --- a/packages/ckeditor5-dev-build-tools/package.json +++ b/packages/ckeditor5-dev-build-tools/package.json @@ -35,17 +35,17 @@ "@rollup/plugin-typescript": "^11.1.6", "@rollup/pluginutils": "^5.1.0", "@swc/core": "^1.4.8", - "chalk": "^5.3.0", - "cssnano": "^7.0.4", + "chalk": "^5.0.0", + "cssnano": "^7.0.0", "cssnano-preset-lite": "^4.0.1", "estree-walker": "^3.0.3", - "glob": "^10.3.10", + "glob": "^10.0.0", "lodash-es": "^4.17.21", "magic-string": "^0.30.6", "pofile": "^1.1.4", "postcss": "^8.0.0", - "postcss-mixins": "^9.0.4", - "postcss-nesting": "^12.0.2", + "postcss-mixins": "^11.0.0", + "postcss-nesting": "^13.0.0", "purgecss": "^6.0.0", "rollup": "^4.9.5", "rollup-plugin-styles": "^4.0.0", diff --git a/packages/ckeditor5-dev-bump-year/package.json b/packages/ckeditor5-dev-bump-year/package.json index d267b5bc3..b5ad92091 100644 --- a/packages/ckeditor5-dev-bump-year/package.json +++ b/packages/ckeditor5-dev-bump-year/package.json @@ -22,7 +22,7 @@ "lib" ], "dependencies": { - "chalk": "^4.1.0", - "glob": "^10.2.5" + "chalk": "^5.0.0", + "glob": "^10.0.0" } } diff --git a/packages/ckeditor5-dev-ci/package.json b/packages/ckeditor5-dev-ci/package.json index 8253a9607..992ae3cc3 100644 --- a/packages/ckeditor5-dev-ci/package.json +++ b/packages/ckeditor5-dev-ci/package.json @@ -34,7 +34,7 @@ "ckeditor5-dev-ci-circle-enable-auto-cancel-builds": "bin/circle-enable-auto-cancel-builds.js" }, "dependencies": { - "@octokit/rest": "^19.0.0", + "@octokit/rest": "^21.0.0", "minimist": "^1.2.8", "slack-notify": "^2.0.6" }, diff --git a/packages/ckeditor5-dev-dependency-checker/package.json b/packages/ckeditor5-dev-dependency-checker/package.json index c659926ee..175bc3e84 100644 --- a/packages/ckeditor5-dev-dependency-checker/package.json +++ b/packages/ckeditor5-dev-dependency-checker/package.json @@ -26,10 +26,10 @@ }, "dependencies": { "@ckeditor/ckeditor5-dev-utils": "^44.0.0-alpha.0", - "chalk": "^4.1.0", + "chalk": "^5.0.0", "depcheck": "^1.3.1", - "fs-extra": "^11.2.0", - "glob": "^10.2.5", + "fs-extra": "^11.0.0", + "glob": "^10.0.0", "minimist": "^1.2.8", "upath": "^2.0.1" } diff --git a/packages/ckeditor5-dev-docs/lib/build.js b/packages/ckeditor5-dev-docs/lib/build.js index b920fe6e1..0254464f9 100644 --- a/packages/ckeditor5-dev-docs/lib/build.js +++ b/packages/ckeditor5-dev-docs/lib/build.js @@ -3,7 +3,7 @@ * For licensing, see LICENSE.md. */ -import glob from 'fast-glob'; +import { glob } from 'glob'; import TypeDoc from 'typedoc'; import typedocPlugins from '@ckeditor/typedoc-plugins'; diff --git a/packages/ckeditor5-dev-docs/package.json b/packages/ckeditor5-dev-docs/package.json index 236172be2..fc8d79faa 100644 --- a/packages/ckeditor5-dev-docs/package.json +++ b/packages/ckeditor5-dev-docs/package.json @@ -24,8 +24,8 @@ "dependencies": { "@ckeditor/ckeditor5-dev-utils": "^44.0.0-alpha.0", "@ckeditor/typedoc-plugins": "^44.0.0-alpha.0", - "fast-glob": "^3.2.4", - "fs-extra": "^11.2.0", + "glob": "^10.0.0", + "fs-extra": "^11.0.0", "tmp": "^0.2.1", "typedoc": "^0.23.15", "typedoc-plugin-rename-defaults": "0.6.6" diff --git a/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogformonorepository.js b/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogformonorepository.js index 34c34777c..aba420bba 100644 --- a/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogformonorepository.js +++ b/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogformonorepository.js @@ -415,9 +415,9 @@ export default async function generateChangelogForMonoRepository( options ) { date: options.formatDate ? options.formatDate( new Date() ) : getFormattedDate() }; - const writerOptions = getWriterOptions( { + const writerOptions = getWriterOptions( commit => { // We do not allow modifying the commit hash value by the generator itself. - hash: hash => hash + return commit; } ); writerOptions.commitsSort = sortFunctionFactory( 'rawScope' ); diff --git a/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogforsinglepackage.js b/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogforsinglepackage.js index 3a2604fae..ab18ddba5 100644 --- a/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogforsinglepackage.js +++ b/packages/ckeditor5-dev-release-tools/lib/tasks/generatechangelogforsinglepackage.js @@ -110,9 +110,9 @@ export default async function generateChangelogForSinglePackage( options = {} ) date: options.formatDate ? options.formatDate( new Date() ) : getFormattedDate() }; - const writerOptions = getWriterOptions( { + const writerOptions = getWriterOptions( commit => { // We do not allow modifying the commit hash value by the generator itself. - hash: hash => hash + return commit; } ); const publicCommits = [ ...allCommits ] diff --git a/packages/ckeditor5-dev-release-tools/lib/utils/generatechangelog.js b/packages/ckeditor5-dev-release-tools/lib/utils/generatechangelog.js index ce38601c3..a0906993c 100644 --- a/packages/ckeditor5-dev-release-tools/lib/utils/generatechangelog.js +++ b/packages/ckeditor5-dev-release-tools/lib/utils/generatechangelog.js @@ -5,7 +5,7 @@ import { Readable } from 'stream'; import { stream } from '@ckeditor/ckeditor5-dev-utils'; -import conventionalChangelogWriter from 'conventional-changelog-writer'; +import { writeChangelogStream } from 'conventional-changelog-writer'; const UPDATED_TRANSLATION_COMMIT = '* Updated translations.'; @@ -49,7 +49,7 @@ export default function generateChangelog( commits, context, options ) { return new Promise( ( resolve, reject ) => { commitStream - .pipe( conventionalChangelogWriter( context, options ) ) + .pipe( writeChangelogStream( context, options ) ) .pipe( stream.noop( changes => { changes = mergeUpdateTranslationsCommits( changes.toString(), { skipCommitsLink: context.skipCommitsLink diff --git a/packages/ckeditor5-dev-release-tools/lib/utils/getcommits.js b/packages/ckeditor5-dev-release-tools/lib/utils/getcommits.js index b6fedbd83..e1135ce4e 100644 --- a/packages/ckeditor5-dev-release-tools/lib/utils/getcommits.js +++ b/packages/ckeditor5-dev-release-tools/lib/utils/getcommits.js @@ -3,9 +3,9 @@ * For licensing, see LICENSE.md. */ -import conventionalCommitsParser from 'conventional-commits-parser'; -import conventionalCommitsFilter from 'conventional-commits-filter'; -import gitRawCommits from 'git-raw-commits'; +import { parseCommitsStream } from 'conventional-commits-parser'; +import { filterRevertedCommitsSync } from 'conventional-commits-filter'; +import { getRawCommitsStream } from 'git-raw-commits'; import concat from 'concat-stream'; import parserOptions from './parseroptions.js'; import { tools } from '@ckeditor/ckeditor5-dev-utils'; @@ -45,7 +45,7 @@ export default function getCommits( transformCommit, options = {} ) { // 1. Commits from the last release and to the point where the release branch was created (the merge-base commit). findCommits( { from: options.from, to: baseCommit } ), // 2. Commits from the merge-base commit to HEAD. - findCommits( { from: baseCommit } ) + findCommits( { from: baseCommit, to: 'HEAD' } ) ]; return Promise.all( commitPromises ) @@ -60,7 +60,7 @@ export default function getCommits( transformCommit, options = {} ) { } ); return new Promise( ( resolve, reject ) => { - const stream = gitRawCommits( gitRawCommitsOpts ) + const stream = getRawCommitsStream( gitRawCommitsOpts ) .on( 'error', err => { /* istanbul ignore else */ if ( err.message.match( /'HEAD': unknown/ ) ) { @@ -74,9 +74,9 @@ export default function getCommits( transformCommit, options = {} ) { } } ); - stream.pipe( conventionalCommitsParser( parserOptions ) ) + stream.pipe( parseCommitsStream( parserOptions ) ) .pipe( concat( data => { - const commits = conventionalCommitsFilter( data ) + const commits = [ ...filterRevertedCommitsSync( data ) ] .map( commit => transformCommit( commit ) ) .reduce( ( allCommits, commit ) => { if ( Array.isArray( commit ) ) { diff --git a/packages/ckeditor5-dev-release-tools/lib/utils/getpackagespaths.js b/packages/ckeditor5-dev-release-tools/lib/utils/getpackagespaths.js index 2530f55df..3f41ed1a8 100644 --- a/packages/ckeditor5-dev-release-tools/lib/utils/getpackagespaths.js +++ b/packages/ckeditor5-dev-release-tools/lib/utils/getpackagespaths.js @@ -4,7 +4,7 @@ */ import path from 'path'; -import minimatch from 'minimatch'; +import { minimatch } from 'minimatch'; import { tools } from '@ckeditor/ckeditor5-dev-utils'; import getPackageJson from './getpackagejson.js'; diff --git a/packages/ckeditor5-dev-release-tools/lib/utils/getwriteroptions.js b/packages/ckeditor5-dev-release-tools/lib/utils/getwriteroptions.js index be6cb971b..f60b58664 100644 --- a/packages/ckeditor5-dev-release-tools/lib/utils/getwriteroptions.js +++ b/packages/ckeditor5-dev-release-tools/lib/utils/getwriteroptions.js @@ -14,7 +14,7 @@ const __dirname = path.dirname( __filename ); const templatePath = path.join( __dirname, '..', 'templates' ); /** - * @param {Function|Object} transform + * @param {WriterOptionsTransformCallback} transform * @returns {Object} */ export default function getWriterOptions( transform ) { @@ -34,3 +34,9 @@ export default function getWriterOptions( transform ) { function sortFunction( a, b ) { return getTypeOrder( a.title ) - getTypeOrder( b.title ); } + +/** + * @callback WriterOptionsTransformCallback + * @param {Commit} + * @returns {Commit} + */ diff --git a/packages/ckeditor5-dev-release-tools/lib/utils/transformcommitfactory.js b/packages/ckeditor5-dev-release-tools/lib/utils/transformcommitfactory.js index 075503ebb..f8b91ce96 100644 --- a/packages/ckeditor5-dev-release-tools/lib/utils/transformcommitfactory.js +++ b/packages/ckeditor5-dev-release-tools/lib/utils/transformcommitfactory.js @@ -3,12 +3,10 @@ * For licensing, see LICENSE.md. */ -import lodash from 'lodash'; +import { cloneDeepWith } from 'lodash-es'; import * as utils from './transformcommitutils.js'; import getChangedFilesForCommit from './getchangedfilesforcommit.js'; -const { cloneDeepWith } = lodash; - // Squash commit follows the pattern: "A pull request title (#{number})". const SQUASH_COMMIT_REGEXP = /^[\W\w]+ \(#\d+\)$/; diff --git a/packages/ckeditor5-dev-release-tools/package.json b/packages/ckeditor5-dev-release-tools/package.json index 0df96d8bb..9dd9cac26 100644 --- a/packages/ckeditor5-dev-release-tools/package.json +++ b/packages/ckeditor5-dev-release-tools/package.json @@ -23,22 +23,22 @@ ], "dependencies": { "@ckeditor/ckeditor5-dev-utils": "^44.0.0-alpha.0", - "@octokit/rest": "^19.0.0", - "chalk": "^4.0.0", + "@octokit/rest": "^21.0.0", + "chalk": "^5.0.0", "cli-columns": "^4.0.0", "compare-func": "^2.0.0", "concat-stream": "^2.0.0", - "conventional-changelog-writer": "^6.0.0", - "conventional-commits-filter": "^3.0.0", - "conventional-commits-parser": "^4.0.0", - "date-fns": "^2.30.0", - "fs-extra": "^11.2.0", - "git-raw-commits": "^3.0.0", - "glob": "^10.2.5", - "inquirer": "^7.1.0", - "lodash": "^4.17.15", - "minimatch": "^3.0.4", - "semver": "^7.5.3", + "conventional-changelog-writer": "^8.0.0", + "conventional-commits-filter": "^5.0.0", + "conventional-commits-parser": "^6.0.0", + "date-fns": "^4.0.0", + "fs-extra": "^11.0.0", + "git-raw-commits": "^5.0.0", + "glob": "^10.0.0", + "inquirer": "^11.0.0", + "lodash-es": "^4.17.21", + "minimatch": "^9.0.0", + "semver": "^7.6.3", "shell-escape": "^0.2.0", "upath": "^2.0.1" }, @@ -46,7 +46,7 @@ "jest-extended": "^4.0.2", "vitest": "^2.0.5", "handlebars": "^4.7.6", - "mock-fs": "^5.1.2" + "mock-fs": "^5.2.0" }, "scripts": { "test": "vitest run --config vitest.config.js", diff --git a/packages/ckeditor5-dev-release-tools/tests/utils/generatechangelog.js b/packages/ckeditor5-dev-release-tools/tests/utils/generatechangelog.js index 02ac72518..8d85feb05 100644 --- a/packages/ckeditor5-dev-release-tools/tests/utils/generatechangelog.js +++ b/packages/ckeditor5-dev-release-tools/tests/utils/generatechangelog.js @@ -41,9 +41,7 @@ describe( 'generateChangelog()', () => { commit: 'commit' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -93,9 +91,7 @@ describe( 'generateChangelog()', () => { commit: 'commit' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -145,9 +141,7 @@ describe( 'generateChangelog()', () => { commit: 'commit' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -204,9 +198,7 @@ describe( 'generateChangelog()', () => { commit: 'commit' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -265,9 +257,7 @@ describe( 'generateChangelog()', () => { skipCommitsLink: true }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -301,9 +291,7 @@ describe( 'generateChangelog()', () => { skipCompareLink: true }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( [], context, options ) .then( changes => { @@ -360,9 +348,7 @@ describe( 'generateChangelog()', () => { commit: 'commit' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -428,9 +414,7 @@ describe( 'generateChangelog()', () => { commit: 'c' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 2 ) - } ); + const options = getWriterOptions( transformCommitCallback( 2 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -493,9 +477,7 @@ describe( 'generateChangelog()', () => { skipCommitsLink: true }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 2 ) - } ); + const options = getWriterOptions( transformCommitCallback( 2 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -576,9 +558,7 @@ describe( 'generateChangelog()', () => { commit: 'c' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 2 ) - } ); + const options = getWriterOptions( transformCommitCallback( 2 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -661,9 +641,7 @@ describe( 'generateChangelog()', () => { commit: 'c' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 2 ) - } ); + const options = getWriterOptions( transformCommitCallback( 2 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -734,9 +712,7 @@ describe( 'generateChangelog()', () => { commit: 'c' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 2 ) - } ); + const options = getWriterOptions( transformCommitCallback( 2 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -794,9 +770,7 @@ describe( 'generateChangelog()', () => { commit: 'commit' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -846,9 +820,7 @@ describe( 'generateChangelog()', () => { isInternalRelease: true }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( commits, context, options ) .then( changes => { @@ -876,9 +848,7 @@ describe( 'generateChangelog()', () => { commit: 'commit' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( [], context, options ) .then( changes => { @@ -969,9 +939,7 @@ describe( 'generateChangelog()', () => { commit: 'c' }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 2 ) - } ); + const options = getWriterOptions( transformCommitCallback( 2 ) ); const sortFunction = compareFunc( item => { if ( Array.isArray( item.scope ) ) { @@ -1047,9 +1015,7 @@ describe( 'generateChangelog()', () => { skipCompareLink: true }; - const options = getWriterOptions( { - hash: hash => hash.slice( 0, 7 ) - } ); + const options = getWriterOptions( transformCommitCallback( 7 ) ); return generateChangelog( [], context, options ) .then( changes => { @@ -1072,3 +1038,14 @@ describe( 'generateChangelog()', () => { function replaceDates( changelog ) { return changelog.replace( /\d{4}-\d{2}-\d{2}/g, '0000-00-00' ); } + +/** + * @param {Number} length + * @returns {WriterOptionsTransformCallback} + */ +function transformCommitCallback( length ) { + return commit => ( { + ...commit, + hash: commit.hash.slice( 0, length ) + } ); +} diff --git a/packages/ckeditor5-dev-release-tools/tests/utils/getcommits.js b/packages/ckeditor5-dev-release-tools/tests/utils/getcommits.js index 641057e37..0dcee0018 100644 --- a/packages/ckeditor5-dev-release-tools/tests/utils/getcommits.js +++ b/packages/ckeditor5-dev-release-tools/tests/utils/getcommits.js @@ -7,7 +7,7 @@ import { describe, it, expect, vi, beforeAll, afterAll, beforeEach, afterEach } import { fileURLToPath } from 'url'; import fs from 'fs'; import path from 'path'; -import gitRawCommits from 'git-raw-commits'; +import { getRawCommitsStream } from 'git-raw-commits'; import { tools } from '@ckeditor/ckeditor5-dev-utils'; const __filename = fileURLToPath( import.meta.url ); @@ -36,13 +36,13 @@ describe( 'getCommits()', () => { } vi.doMock( 'git-raw-commits', () => ( { - default: vi.fn( gitRawCommits ) + getRawCommitsStream: vi.fn( getRawCommitsStream ) } ) ); vi.doMock( '@ckeditor/ckeditor5-dev-utils' ); stubs = { - gitRawCommits: ( await import( 'git-raw-commits' ) ).default, + getRawCommitsStream: ( await import( 'git-raw-commits' ) ).getRawCommitsStream, devTools: ( await import( '@ckeditor/ckeditor5-dev-utils' ) ).tools }; @@ -269,7 +269,7 @@ describe( 'getCommits()', () => { .then( commits => { expect( commits.length ).toEqual( 8 ); - expect( stubs.gitRawCommits ).toHaveBeenNthCalledWith( 1, { + expect( stubs.getRawCommitsStream ).toHaveBeenNthCalledWith( 1, { from: 'v1.0.0', to: baseCommit, format: '%B%n-hash-%n%H', @@ -277,7 +277,7 @@ describe( 'getCommits()', () => { firstParent: true } ); - expect( stubs.gitRawCommits ).toHaveBeenNthCalledWith( 2, { + expect( stubs.getRawCommitsStream ).toHaveBeenNthCalledWith( 2, { to: 'HEAD', from: baseCommit, format: '%B%n-hash-%n%H', diff --git a/packages/ckeditor5-dev-stale-bot/package.json b/packages/ckeditor5-dev-stale-bot/package.json index c339f3305..f56ed340b 100644 --- a/packages/ckeditor5-dev-stale-bot/package.json +++ b/packages/ckeditor5-dev-stale-bot/package.json @@ -26,13 +26,13 @@ }, "dependencies": { "@ckeditor/ckeditor5-dev-utils": "^44.0.0-alpha.0", - "chalk": "^4.1.0", - "date-fns": "^2.30.0", - "fs-extra": "^11.2.0", + "chalk": "^5.0.0", + "date-fns": "^4.0.0", + "fs-extra": "^11.0.0", "graphql": "^16.8.1", - "graphql-request": "^6.1.0", + "graphql-request": "^7.0.0", "minimist": "^1.2.8", - "ora": "^5.2.0", + "ora": "^8.0.0", "upath": "^2.0.1" }, "devDependencies": { diff --git a/packages/ckeditor5-dev-tests/lib/tasks/runautomatedtests.js b/packages/ckeditor5-dev-tests/lib/tasks/runautomatedtests.js index a60467a7e..a51534de3 100644 --- a/packages/ckeditor5-dev-tests/lib/tasks/runautomatedtests.js +++ b/packages/ckeditor5-dev-tests/lib/tasks/runautomatedtests.js @@ -10,8 +10,8 @@ import { logger } from '@ckeditor/ckeditor5-dev-utils'; import getKarmaConfig from '../utils/automated-tests/getkarmaconfig.js'; import chalk from 'chalk'; import { globSync } from 'glob'; -import minimatch from 'minimatch'; -import mkdirp from 'mkdirp'; +import { minimatch } from 'minimatch'; +import { mkdirp } from 'mkdirp'; import karmaLogger from 'karma/lib/logger.js'; import karma from 'karma'; import transformFileOptionToTestGlob from '../utils/transformfileoptiontotestglob.js'; diff --git a/packages/ckeditor5-dev-tests/lib/utils/automated-tests/assertions/equal-markup.js b/packages/ckeditor5-dev-tests/lib/utils/automated-tests/assertions/equal-markup.js index 9dd6b42a0..73f1d7d1c 100644 --- a/packages/ckeditor5-dev-tests/lib/utils/automated-tests/assertions/equal-markup.js +++ b/packages/ckeditor5-dev-tests/lib/utils/automated-tests/assertions/equal-markup.js @@ -3,8 +3,8 @@ * For licensing, see LICENSE.md. */ -import AssertionError from 'assertion-error'; -import { html_beautify as beautify } from 'js-beautify/js/lib/beautify-html.js'; +import { AssertionError } from 'assertion-error'; +import { html_beautify as beautify } from 'js-beautify'; /** * Factory function that registers the `equalMarkup` assertion. diff --git a/packages/ckeditor5-dev-tests/lib/utils/manual-tests/compilehtmlfiles.js b/packages/ckeditor5-dev-tests/lib/utils/manual-tests/compilehtmlfiles.js index ee1eb102b..cad036e20 100644 --- a/packages/ckeditor5-dev-tests/lib/utils/manual-tests/compilehtmlfiles.js +++ b/packages/ckeditor5-dev-tests/lib/utils/manual-tests/compilehtmlfiles.js @@ -6,7 +6,7 @@ import path from 'path'; import fs from 'fs-extra'; import { globSync } from 'glob'; -import _ from 'lodash'; +import { uniq, debounce } from 'lodash-es'; import chalk from 'chalk'; import * as commonmark from 'commonmark'; import combine from 'dom-combiner'; @@ -40,7 +40,7 @@ export default function compileHtmlFiles( options ) { const sourceMDFiles = options.sourceFiles.map( jsFile => setExtension( jsFile, 'md' ) ); const sourceHtmlFiles = sourceMDFiles.map( mdFile => setExtension( mdFile, 'html' ) ); - const sourceDirs = _.uniq( sourceMDFiles.map( file => path.dirname( file ) ) ); + const sourceDirs = uniq( sourceMDFiles.map( file => path.dirname( file ) ) ); const sourceFilePathBases = sourceMDFiles.map( mdFile => getFilePathWithoutExtension( mdFile ) ); const staticFiles = sourceDirs @@ -183,7 +183,7 @@ function getFilePathWithoutExtension( file ) { function watchFiles( filePaths, onChange, onTestCompilationStatus ) { for ( const filePath of filePaths ) { - const debouncedOnChange = _.debounce( () => { + const debouncedOnChange = debounce( () => { onChange( filePath ); onTestCompilationStatus( 'finished' ); }, 500 ); diff --git a/packages/ckeditor5-dev-tests/lib/utils/manual-tests/removedir.js b/packages/ckeditor5-dev-tests/lib/utils/manual-tests/removedir.js index 8189e524c..8bce9e107 100644 --- a/packages/ckeditor5-dev-tests/lib/utils/manual-tests/removedir.js +++ b/packages/ckeditor5-dev-tests/lib/utils/manual-tests/removedir.js @@ -3,7 +3,7 @@ * For licensing, see LICENSE.md. */ -import del from 'del'; +import { deleteAsync } from 'del'; import { logger } from '@ckeditor/ckeditor5-dev-utils'; import chalk from 'chalk'; @@ -18,7 +18,7 @@ import chalk from 'chalk'; * @returns {Promise} */ export default function removeDir( dir, options = {} ) { - return del( dir ).then( () => { + return deleteAsync( dir ).then( () => { if ( !options.silent ) { logger().info( `Removed directory '${ chalk.cyan( dir ) }'` ); } diff --git a/packages/ckeditor5-dev-tests/package.json b/packages/ckeditor5-dev-tests/package.json index ef1121dc8..c1f52ae94 100644 --- a/packages/ckeditor5-dev-tests/package.json +++ b/packages/ckeditor5-dev-tests/package.json @@ -35,43 +35,43 @@ "@types/karma-sinon-chai": "^2.0.2", "@types/mocha": "^10.0.1", "@types/sinon": "^10.0.15", - "assertion-error": "^1.1.0", - "babel-plugin-istanbul": "^6.1.0", + "assertion-error": "^2.0.0", + "babel-plugin-istanbul": "^7.0.0", "buffer": "^6.0.3", - "chai": "^4.2.0", - "chalk": "^4.0.0", - "chokidar": "^3.4.0", + "chai": "^5.0.0", + "chalk": "^5.0.0", + "chokidar": "^4.0.0", "commonmark": "^0.29.1", - "del": "^5.1.0", + "del": "^7.0.0", "dom-combiner": "^0.1.3", - "fs-extra": "^11.2.0", - "glob": "^10.2.5", - "inquirer": "^7.1.0", - "is-interactive": "^1.0.0", - "is-wsl": "^2.2.0", + "fs-extra": "^11.0.0", + "glob": "^10.0.0", + "inquirer": "^11.0.0", + "is-interactive": "^2.0.0", + "is-wsl": "^3.0.0", "js-beautify": "^1.11.0", - "karma": "^6.3.17", + "karma": "^6.4.4", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^3.1.0", "karma-coverage": "^2.0.3", - "karma-firefox-launcher": "^1.3.0", + "karma-firefox-launcher": "^2.0.0", "karma-mocha": "^2.0.1", "karma-mocha-reporter": "^2.2.5", "karma-sinon": "^1.0.5", "karma-sinon-chai": "^2.0.2", - "karma-sourcemap-loader": "^0.3.8", + "karma-sourcemap-loader": "^0.4.0", "karma-webpack": "^5.0.0", - "lodash": "^4.17.15", - "minimatch": "^3.0.4", + "lodash-es": "^4.17.21", + "minimatch": "^9.0.0", "minimist": "^1.2.8", - "mkdirp": "^1.0.4", - "mocha": "^7.1.2", + "mkdirp": "^3.0.0", + "mocha": "^10.0.0", "node-notifier": "^10.0.1", "process": "^0.11.10", - "sinon": "^9.2.4", - "sinon-chai": "^3.5.0", + "sinon": "^19.0.0", + "sinon-chai": "^4.0.0", "socket.io": "^4.0.0", - "typescript": "^4.6.4", + "typescript": "5.0.4", "webpack": "^5.94.0" }, "devDependencies": { diff --git a/packages/ckeditor5-dev-tests/tests/tasks/runautomatedtests.js b/packages/ckeditor5-dev-tests/tests/tasks/runautomatedtests.js index 7cc0c9288..86e39f4b8 100644 --- a/packages/ckeditor5-dev-tests/tests/tasks/runautomatedtests.js +++ b/packages/ckeditor5-dev-tests/tests/tasks/runautomatedtests.js @@ -7,7 +7,7 @@ import path from 'path'; import fs from 'fs'; import { beforeEach, describe, expect, it, vi } from 'vitest'; import { globSync } from 'glob'; -import mkdirp from 'mkdirp'; +import { mkdirp } from 'mkdirp'; import chalk from 'chalk'; import karma from 'karma'; import karmaLogger from 'karma/lib/logger.js'; diff --git a/packages/ckeditor5-dev-tests/tests/utils/manual-tests/removedir.js b/packages/ckeditor5-dev-tests/tests/utils/manual-tests/removedir.js index 86758d0d3..dd07059f8 100644 --- a/packages/ckeditor5-dev-tests/tests/utils/manual-tests/removedir.js +++ b/packages/ckeditor5-dev-tests/tests/utils/manual-tests/removedir.js @@ -4,7 +4,7 @@ */ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import del from 'del'; +import { deleteAsync } from 'del'; import { logger } from '@ckeditor/ckeditor5-dev-utils'; import chalk from 'chalk'; import removeDir from '../../../lib/utils/manual-tests/removedir.js'; @@ -22,7 +22,7 @@ describe( 'removeDir()', () => { beforeEach( () => { logInfo = vi.fn(); - vi.mocked( del ).mockResolvedValue(); + vi.mocked( deleteAsync ).mockResolvedValue(); vi.mocked( chalk ).cyan.mockImplementation( input => input ); vi.mocked( logger ).mockReturnValue( { info: logInfo @@ -33,14 +33,14 @@ describe( 'removeDir()', () => { await removeDir( 'workspace/directory' ); expect( vi.mocked( chalk ).cyan ).toHaveBeenCalledOnce(); - expect( vi.mocked( del ) ).toHaveBeenCalledExactlyOnceWith( 'workspace/directory' ); + expect( vi.mocked( deleteAsync ) ).toHaveBeenCalledExactlyOnceWith( 'workspace/directory' ); expect( logInfo ).toHaveBeenCalledExactlyOnceWith( 'Removed directory \'workspace/directory\'' ); } ); it( 'should remove directory and does not inform about it', async () => { await removeDir( 'workspace/directory', { silent: true } ); - expect( vi.mocked( del ) ).toHaveBeenCalledExactlyOnceWith( 'workspace/directory' ); + expect( vi.mocked( deleteAsync ) ).toHaveBeenCalledExactlyOnceWith( 'workspace/directory' ); expect( vi.mocked( chalk ).cyan ).not.toHaveBeenCalled(); expect( logInfo ).not.toHaveBeenCalled(); diff --git a/packages/ckeditor5-dev-transifex/lib/createpotfiles.js b/packages/ckeditor5-dev-transifex/lib/createpotfiles.js index fdd009e61..00165f622 100644 --- a/packages/ckeditor5-dev-transifex/lib/createpotfiles.js +++ b/packages/ckeditor5-dev-transifex/lib/createpotfiles.js @@ -5,7 +5,7 @@ import path from 'path'; import fs from 'fs-extra'; -import del from 'del'; +import { deleteSync } from 'del'; import { logger as utilsLogger } from '@ckeditor/ckeditor5-dev-utils'; import { findMessages } from '@ckeditor/ckeditor5-dev-translations'; import { verifyProperties } from './utils.js'; @@ -229,7 +229,7 @@ function assertNoRepeatedContext( { packageContexts } ) { } function removeExistingPotFiles( translationsDirectory ) { - del.sync( translationsDirectory ); + deleteSync( translationsDirectory ); } /** diff --git a/packages/ckeditor5-dev-transifex/package.json b/packages/ckeditor5-dev-transifex/package.json index a4c39e763..540b7d3f2 100644 --- a/packages/ckeditor5-dev-transifex/package.json +++ b/packages/ckeditor5-dev-transifex/package.json @@ -22,13 +22,13 @@ "lib" ], "dependencies": { - "fs-extra": "^11.2.0", - "del": "^5.1.0", + "fs-extra": "^11.0.0", + "del": "^7.0.0", "@ckeditor/ckeditor5-dev-utils": "^44.0.0-alpha.0", "@ckeditor/ckeditor5-dev-translations": "^44.0.0-alpha.0", - "chalk": "^4.0.0", - "inquirer": "^7.1.0", - "@transifex/api": "^4.2.1", + "chalk": "^5.0.0", + "inquirer": "^11.0.0", + "@transifex/api": "^7.0.0", "cli-table": "^0.3.1" }, "devDependencies": { diff --git a/packages/ckeditor5-dev-transifex/tests/createpotfiles.js b/packages/ckeditor5-dev-transifex/tests/createpotfiles.js index 9441de44c..dec22caae 100644 --- a/packages/ckeditor5-dev-transifex/tests/createpotfiles.js +++ b/packages/ckeditor5-dev-transifex/tests/createpotfiles.js @@ -8,7 +8,7 @@ import createPotFiles from '../lib/createpotfiles.js'; import { findMessages } from '@ckeditor/ckeditor5-dev-translations'; import { verifyProperties } from '../lib/utils.js'; -import del from 'del'; +import { deleteSync } from 'del'; import fs from 'fs-extra'; import path from 'path'; @@ -53,8 +53,8 @@ describe( 'dev-transifex/createPotFiles()', () => { logger: loggerMocks } ); - expect( vi.mocked( del.sync ) ).toHaveBeenCalledTimes( 1 ); - expect( vi.mocked( del.sync ) ).toHaveBeenCalledWith( '/cwd/build/.transifex' ); + expect( vi.mocked( deleteSync ) ).toHaveBeenCalledTimes( 1 ); + expect( vi.mocked( deleteSync ) ).toHaveBeenCalledWith( '/cwd/build/.transifex' ); } ); it( 'should create a POT file entry for one message with a corresponding context', () => { diff --git a/packages/ckeditor5-dev-translations/lib/servetranslations.js b/packages/ckeditor5-dev-translations/lib/servetranslations.js index 1e058140e..57aef6946 100644 --- a/packages/ckeditor5-dev-translations/lib/servetranslations.js +++ b/packages/ckeditor5-dev-translations/lib/servetranslations.js @@ -7,7 +7,7 @@ import fs from 'fs-extra'; import path from 'path'; import { fileURLToPath } from 'url'; import chalk from 'chalk'; -import rimraf from 'rimraf'; +import { rimraf } from 'rimraf'; import webpackSources from 'webpack-sources'; const __filename = fileURLToPath( import.meta.url ); diff --git a/packages/ckeditor5-dev-translations/package.json b/packages/ckeditor5-dev-translations/package.json index 8803e9306..ef751ead3 100644 --- a/packages/ckeditor5-dev-translations/package.json +++ b/packages/ckeditor5-dev-translations/package.json @@ -24,10 +24,10 @@ "dependencies": { "@babel/parser": "^7.18.9", "@babel/traverse": "^7.18.9", - "chalk": "^4.0.0", - "fs-extra": "^11.2.0", - "rimraf": "^3.0.2", - "webpack-sources": "^2.0.1", + "chalk": "^5.0.0", + "fs-extra": "^11.0.0", + "rimraf": "^5.0.0", + "webpack-sources": "^3.0.0", "pofile": "^1.0.9" }, "devDependencies": { diff --git a/packages/ckeditor5-dev-utils/lib/tools/createspinner.js b/packages/ckeditor5-dev-utils/lib/tools/createspinner.js index b69118c9c..b025260e9 100644 --- a/packages/ckeditor5-dev-utils/lib/tools/createspinner.js +++ b/packages/ckeditor5-dev-utils/lib/tools/createspinner.js @@ -6,7 +6,7 @@ import readline from 'readline'; import isInteractive from 'is-interactive'; import cliSpinners from 'cli-spinners'; -import { show as cliCursorShow, hide as cliCursorHide } from 'cli-cursor'; +import cliCursor from 'cli-cursor'; // A size of default indent for a log. const INDENT_SIZE = 3; @@ -64,7 +64,7 @@ export default function createSpinner( title, options = {} ) { let index = 0; let shouldClearLastLine = false; - cliCursorHide(); + cliCursor.hide(); timerId = setInterval( () => { if ( index === frames.length ) { @@ -102,7 +102,7 @@ export default function createSpinner( title, options = {} ) { clearLastLine(); } - cliCursorShow(); + cliCursor.show(); console.log( `${ indent }${ finishEmoji } ${ title }` ); } }; diff --git a/packages/ckeditor5-dev-utils/package.json b/packages/ckeditor5-dev-utils/package.json index 57e07f697..9daf9d7d8 100644 --- a/packages/ckeditor5-dev-utils/package.json +++ b/packages/ckeditor5-dev-utils/package.json @@ -23,33 +23,30 @@ ], "dependencies": { "@ckeditor/ckeditor5-dev-translations": "^44.0.0-alpha.0", - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.6.1", - "css-loader": "^5.2.7", - "cssnano": "^6.0.3", - "del": "^5.0.0", - "esbuild-loader": "~3.0.1", - "fs-extra": "^11.2.0", - "is-interactive": "^1.0.0", - "javascript-stringify": "^1.6.0", + "chalk": "^5.0.0", + "cli-cursor": "^5.0.0", + "cli-spinners": "^3.0.0", + "css-loader": "^7.0.0", + "cssnano": "^7.0.0", + "esbuild-loader": "^4.0.0", + "fs-extra": "^11.0.0", + "is-interactive": "^2.0.0", "mini-css-extract-plugin": "^2.4.2", - "mocha": "^7.1.2", + "mocha": "^10.0.0", "postcss": "^8.4.12", - "postcss-import": "^14.1.0", - "postcss-loader": "^4.3.0", - "postcss-mixins": "^9.0.2", - "postcss-nesting": "^10.1.4", + "postcss-import": "^16.0.0", + "postcss-loader": "^8.0.0", + "postcss-mixins": "^11.0.0", + "postcss-nesting": "^13.0.0", "raw-loader": "^4.0.1", "shelljs": "^0.8.1", - "style-loader": "^2.0.0", - "terser-webpack-plugin": "^4.2.3", - "through2": "^3.0.1" + "style-loader": "^4.0.0", + "terser-webpack-plugin": "^5.0.0", + "through2": "^4.0.0" }, "devDependencies": { "jest-extended": "^4.0.2", - "handlebars": "^4.7.6", - "vinyl": "^2.1.0", + "vinyl": "^3.0.0", "vitest": "^2.0.5" }, "scripts": { diff --git a/packages/ckeditor5-dev-utils/tests/tools/createspinner.js b/packages/ckeditor5-dev-utils/tests/tools/createspinner.js index fd4e848e8..fb519392c 100644 --- a/packages/ckeditor5-dev-utils/tests/tools/createspinner.js +++ b/packages/ckeditor5-dev-utils/tests/tools/createspinner.js @@ -4,7 +4,7 @@ */ import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'; -import { show as cliCursorShow, hide as cliCursorHide } from 'cli-cursor'; +import cliCursor from 'cli-cursor'; import isInteractive from 'is-interactive'; import createSpinner from '../../lib/tools/createspinner.js'; import readline from 'readline'; @@ -128,7 +128,7 @@ describe( 'createSpinner()', () => { spinner.start(); - expect( vi.mocked( cliCursorHide ) ).toHaveBeenCalledOnce(); + expect( vi.mocked( cliCursor ).hide ).toHaveBeenCalledOnce(); } ); it( 'allows indenting messages by specifying the "options.indentLevel" option', () => { @@ -212,7 +212,7 @@ describe( 'createSpinner()', () => { spinner.start(); spinner.finish(); - expect( vi.mocked( cliCursorShow ) ).toHaveBeenCalledOnce(); + expect( vi.mocked( cliCursor ).show ).toHaveBeenCalledOnce(); } ); it( 'allows indenting messages by specifying the "options.indentLevel" option', () => { diff --git a/packages/ckeditor5-dev-web-crawler/lib/runcrawler.js b/packages/ckeditor5-dev-web-crawler/lib/runcrawler.js index a51b0c8d0..bb293c9a1 100644 --- a/packages/ckeditor5-dev-web-crawler/lib/runcrawler.js +++ b/packages/ckeditor5-dev-web-crawler/lib/runcrawler.js @@ -129,10 +129,14 @@ async function createBrowser( options ) { const browser = await puppeteer.launch( browserOptions ); - const [ defaultBlankPage ] = await browser.pages(); + // For unknown reasons, in order to be able to visit pages in Puppeteer on CI, we must close the default page that is opened when the + // browser starts. + if ( process.env.CI ) { + const [ defaultBlankPage ] = await browser.pages(); - if ( defaultBlankPage ) { - await defaultBlankPage.close(); + if ( defaultBlankPage ) { + await defaultBlankPage.close(); + } } return browser; diff --git a/packages/ckeditor5-dev-web-crawler/package.json b/packages/ckeditor5-dev-web-crawler/package.json index 04e201fe1..6170af640 100644 --- a/packages/ckeditor5-dev-web-crawler/package.json +++ b/packages/ckeditor5-dev-web-crawler/package.json @@ -22,9 +22,9 @@ "lib" ], "dependencies": { - "chalk": "^4.1.0", - "ora": "^5.2.0", - "puppeteer": "^19.7.5", - "strip-ansi": "^6.0.0" + "chalk": "^5.0.0", + "ora": "^8.0.0", + "puppeteer": "^23.4.0", + "strip-ansi": "^7.0.0" } } diff --git a/packages/typedoc-plugins/package.json b/packages/typedoc-plugins/package.json index 763885174..c60ec4678 100644 --- a/packages/typedoc-plugins/package.json +++ b/packages/typedoc-plugins/package.json @@ -22,8 +22,9 @@ ], "devDependencies": { "chai": "^4.2.0", - "fast-glob": "^3.2.4", - "mocha": "^7.1.2", + "glob": "^10.0.0", + "mocha": "^10.0.0", + "nyc": "^17.1.0", "sinon": "^9.2.4", "typedoc": "^0.23.15" }, diff --git a/packages/typedoc-plugins/tests/event-inheritance-fixer/index.js b/packages/typedoc-plugins/tests/event-inheritance-fixer/index.js index 1500d18d6..de90e31e9 100644 --- a/packages/typedoc-plugins/tests/event-inheritance-fixer/index.js +++ b/packages/typedoc-plugins/tests/event-inheritance-fixer/index.js @@ -4,7 +4,7 @@ */ const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' ); diff --git a/packages/typedoc-plugins/tests/event-param-fixer/index.js b/packages/typedoc-plugins/tests/event-param-fixer/index.js index 62ab39896..7f2ba9e02 100644 --- a/packages/typedoc-plugins/tests/event-param-fixer/index.js +++ b/packages/typedoc-plugins/tests/event-param-fixer/index.js @@ -5,7 +5,7 @@ const sinon = require( 'sinon' ); const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' ); diff --git a/packages/typedoc-plugins/tests/interface-augmentation-fixer/index.js b/packages/typedoc-plugins/tests/interface-augmentation-fixer/index.js index bde89ffd1..50779555f 100644 --- a/packages/typedoc-plugins/tests/interface-augmentation-fixer/index.js +++ b/packages/typedoc-plugins/tests/interface-augmentation-fixer/index.js @@ -4,7 +4,7 @@ */ const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' ); diff --git a/packages/typedoc-plugins/tests/module-fixer/index.js b/packages/typedoc-plugins/tests/module-fixer/index.js index a15a321d3..117505d78 100644 --- a/packages/typedoc-plugins/tests/module-fixer/index.js +++ b/packages/typedoc-plugins/tests/module-fixer/index.js @@ -4,7 +4,7 @@ */ const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' ); diff --git a/packages/typedoc-plugins/tests/purge-private-api-docs/index.js b/packages/typedoc-plugins/tests/purge-private-api-docs/index.js index 68fd7a68d..01da83b4a 100644 --- a/packages/typedoc-plugins/tests/purge-private-api-docs/index.js +++ b/packages/typedoc-plugins/tests/purge-private-api-docs/index.js @@ -4,7 +4,7 @@ */ const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' ); diff --git a/packages/typedoc-plugins/tests/symbol-fixer/index.js b/packages/typedoc-plugins/tests/symbol-fixer/index.js index 3fe5936ee..eb047c742 100644 --- a/packages/typedoc-plugins/tests/symbol-fixer/index.js +++ b/packages/typedoc-plugins/tests/symbol-fixer/index.js @@ -5,7 +5,7 @@ const { expect } = require( 'chai' ); const TypeDoc = require( 'typedoc' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const utils = require( '../utils' ); const { plugins } = require( '../../lib' ); diff --git a/packages/typedoc-plugins/tests/tag-error/index.js b/packages/typedoc-plugins/tests/tag-error/index.js index 530530b7d..71abd8335 100644 --- a/packages/typedoc-plugins/tests/tag-error/index.js +++ b/packages/typedoc-plugins/tests/tag-error/index.js @@ -4,7 +4,7 @@ */ const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' ); diff --git a/packages/typedoc-plugins/tests/tag-event/index.js b/packages/typedoc-plugins/tests/tag-event/index.js index c77fee64c..fa7f431d9 100644 --- a/packages/typedoc-plugins/tests/tag-event/index.js +++ b/packages/typedoc-plugins/tests/tag-event/index.js @@ -5,7 +5,7 @@ const sinon = require( 'sinon' ); const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' ); diff --git a/packages/typedoc-plugins/tests/tag-observable/index.js b/packages/typedoc-plugins/tests/tag-observable/index.js index 2e326f505..458b3a656 100644 --- a/packages/typedoc-plugins/tests/tag-observable/index.js +++ b/packages/typedoc-plugins/tests/tag-observable/index.js @@ -4,7 +4,7 @@ */ const { expect } = require( 'chai' ); -const glob = require( 'fast-glob' ); +const { glob } = require( 'glob' ); const TypeDoc = require( 'typedoc' ); const utils = require( '../utils' );