Skip to content

Commit

Permalink
Merge pull request #1014 from ckeditor/i/3773-upgrade-deps
Browse files Browse the repository at this point in the history
Internal: Upgraded several dependencies of all packages in the repository.
  • Loading branch information
pomek authored Sep 23, 2024
2 parents 980c0ed + c584a84 commit 2358a19
Show file tree
Hide file tree
Showing 46 changed files with 192 additions and 208 deletions.
3 changes: 3 additions & 0 deletions .circleci/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions packages/ckeditor5-dev-build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/ckeditor5-dev-bump-year/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lib"
],
"dependencies": {
"chalk": "^4.1.0",
"glob": "^10.2.5"
"chalk": "^5.0.0",
"glob": "^10.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/ckeditor5-dev-ci/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/ckeditor5-dev-dependency-checker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-dev-docs/lib/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions packages/ckeditor5-dev-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.';

Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions packages/ckeditor5-dev-release-tools/lib/utils/getcommits.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 )
Expand All @@ -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/ ) ) {
Expand All @@ -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 ) ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand All @@ -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}
*/
Original file line number Diff line number Diff line change
Expand Up @@ -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+\)$/;

Expand Down
28 changes: 14 additions & 14 deletions packages/ckeditor5-dev-release-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,30 @@
],
"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"
},
"devDependencies": {
"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",
Expand Down
Loading

0 comments on commit 2358a19

Please sign in to comment.