Merge branch 'master' into ck/11721-build-API-from-typedoc

CHANGELOG.md

@@ -1,6 +1,54 @@
 Changelog
 =========
 
+## [31.1.13](https://github.com/ckeditor/ckeditor5-dev/compare/v31.1.12...v31.1.13) (2022-11-25)
+
+### Bug fixes
+
+* **[webpack-plugin](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-webpack-plugin)**: Fixed generating source maps after switching the order of loaders in the CKEditor 5 translations webpack plugin. The source loader should pass through the source map object to avoid generating a new one. Closes [ckeditor/ckeditor5#12928](https://github.com/ckeditor/ckeditor5/issues/12928). ([commit](https://github.com/ckeditor/ckeditor5-dev/commit/3ca5eeddda995bb4257afbe5dca88a7d8860fc9a))
+
+### Released packages
+
+Check out the [Versioning policy](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/support/versioning-policy.html) guide for more information.
+
+<details>
+<summary>Released packages (summary)</summary>
+
+Other releases:
+
+* [@ckeditor/ckeditor5-dev-docs](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-docs): v31.1.12 => v31.1.13
+* [@ckeditor/ckeditor5-dev-env](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-env): v31.1.12 => v31.1.13
+* [@ckeditor/ckeditor5-dev-tests](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-tests): v31.1.12 => v31.1.13
+* [@ckeditor/ckeditor5-dev-utils](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-utils): v31.1.12 => v31.1.13
+* [@ckeditor/ckeditor5-dev-webpack-plugin](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-webpack-plugin): v31.1.12 => v31.1.13
+* [@ckeditor/jsdoc-plugins](https://www.npmjs.com/package/@ckeditor/jsdoc-plugins): v31.1.12 => v31.1.13
+</details>
+
+
+## [31.1.12](https://github.com/ckeditor/ckeditor5-dev/compare/v31.1.11...v31.1.12) (2022-11-24)
+
+### Bug fixes
+
+* **[webpack-plugin](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-webpack-plugin)**: Proper detection of webpack 4. Closes [ckeditor/ckeditor5#12887](https://github.com/ckeditor/ckeditor5/issues/12887). ([commit](https://github.com/ckeditor/ckeditor5-dev/commit/2f8b91bc5087eff9a2a703c984f4458fe8a939b0))
+
+### Released packages
+
+Check out the [Versioning policy](https://ckeditor.com/docs/ckeditor5/latest/framework/guides/support/versioning-policy.html) guide for more information.
+
+<details>
+<summary>Released packages (summary)</summary>
+
+Other releases:
+
+* [@ckeditor/ckeditor5-dev-docs](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-docs): v31.1.11 => v31.1.12
+* [@ckeditor/ckeditor5-dev-env](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-env): v31.1.11 => v31.1.12
+* [@ckeditor/ckeditor5-dev-tests](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-tests): v31.1.11 => v31.1.12
+* [@ckeditor/ckeditor5-dev-utils](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-utils): v31.1.11 => v31.1.12
+* [@ckeditor/ckeditor5-dev-webpack-plugin](https://www.npmjs.com/package/@ckeditor/ckeditor5-dev-webpack-plugin): v31.1.11 => v31.1.12
+* [@ckeditor/jsdoc-plugins](https://www.npmjs.com/package/@ckeditor/jsdoc-plugins): v31.1.11 => v31.1.12
+</details>
+
+
 ## [31.1.11](https://github.com/ckeditor/ckeditor5-dev/compare/v31.1.10...v31.1.11) (2022-11-22)
 
 ### Bug fixes

package.json

@@ -1,9 +1,9 @@
 {
   "name": "ckeditor5-dev",
-  "version": "31.1.11",
+  "version": "31.1.13",
   "private": true,
   "dependencies": {
-    "@ckeditor/ckeditor5-dev-env": "^31.1.11"
+    "@ckeditor/ckeditor5-dev-env": "^31.1.13"
   },
   "devDependencies": {
     "eslint": "^7.0.0",

packages/ckeditor5-dev-docs/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ckeditor/ckeditor5-dev-docs",
-  "version": "31.1.11",
+  "version": "31.1.13",
   "description": "Tasks used to build and verify the documentation for CKEditor 5.",
   "keywords": [],
   "main": "lib/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-dev-utils": "^31.1.11",
+    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
     "@ckeditor/typedoc-plugins": "^0.0.1",
     "chalk": "^4.1.0",
     "fast-glob": "^3.2.4",

packages/ckeditor5-dev-env/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ckeditor/ckeditor5-dev-env",
-  "version": "31.1.11",
+  "version": "31.1.13",
   "description": "Tasks used during development of CKEditor 5.",
   "keywords": [],
   "main": "lib/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-dev-utils": "^31.1.11",
+    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
     "@octokit/rest": "^17.9.2",
     "@transifex/api": "^4.2.1",
     "chalk": "^4.0.0",

packages/ckeditor5-dev-tests/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ckeditor/ckeditor5-dev-tests",
-  "version": "31.1.11",
+  "version": "31.1.13",
   "description": "Testing environment for CKEditor 5.",
   "keywords": [],
   "main": "lib/index.js",
   "dependencies": {
     "@babel/core": "^7.15.8",
-    "@ckeditor/ckeditor5-dev-utils": "^31.1.11",
-    "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.11",
+    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
+    "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
     "@ckeditor/ckeditor5-inspector": "^4.0.0",
     "assertion-error": "^1.1.0",
     "babel-core": "^6.26.3",

packages/ckeditor5-dev-utils/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ckeditor/ckeditor5-dev-utils",
-  "version": "31.1.11",
+  "version": "31.1.13",
   "description": "Utils for CKEditor 5 development tools packages.",
   "keywords": [],
   "main": "lib/index.js",
   "dependencies": {
     "@babel/parser": "^7.18.9",
     "@babel/traverse": "^7.18.9",
-    "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.11",
+    "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
     "chalk": "^3.0.0",
     "cli-cursor": "^3.1.0",
     "cli-spinners": "^2.6.1",

packages/ckeditor5-dev-webpack-plugin/lib/servetranslations.js

@@ -9,7 +9,6 @@ const chalk = require( 'chalk' );
 const rimraf = require( 'rimraf' );
 const fs = require( 'fs' );
 const path = require( 'path' );
-const semver = require( 'semver' );
 const { RawSource, ConcatSource } = require( 'webpack-sources' );
 
 /**
@@ -194,7 +193,7 @@ function getPathToPackage( cwd, resource, packageNamePattern ) {
 }
 
 /**
- * Returns an object with the compilation hooks depending on the Webpack version.
+ * Returns an object with the compilation hooks depending on the webpack version.
  *
  * @param {webpack.Compiler} compiler
  * @param {webpack.Compilation} compilation
@@ -203,7 +202,8 @@ function getPathToPackage( cwd, resource, packageNamePattern ) {
 function getCompilationHooks( compiler, compilation ) {
 	const { webpack } = compiler;
 
-	if ( semver.major( webpack.version ) === 4 ) {
+	// Webpack is not available in a compiler instance (webpack 4).
+	if ( !webpack ) {
 		return compilation.hooks.normalModuleLoader;
 	}
 

packages/ckeditor5-dev-webpack-plugin/lib/translatesourceloader.js

@@ -9,9 +9,11 @@
  * Very simple loader that runs the translateSource function only on the source.
  * translateSource is provided by the CKEditorWebpackPlugin.
  *
- * @param {String} source Source which will be translated.
- * @returns {String}
+ * @param {String} source Content of the resource file
+ * @param {Object} map A source map consumed by the `source-map` package.
  */
-module.exports = function translateSourceLoader( source ) {
-	return this.query.translateSource( source, this.resourcePath );
+module.exports = function translateSourceLoader( source, map ) {
+	const output = this.query.translateSource( source, this.resourcePath );
+
+	this.callback( null, output, map );
 };

packages/ckeditor5-dev-webpack-plugin/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@ckeditor/ckeditor5-dev-webpack-plugin",
-  "version": "31.1.11",
+  "version": "31.1.13",
   "description": "CKEditor 5 plugin for webpack.",
   "keywords": [],
   "main": "lib/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-dev-utils": "^31.1.11",
+    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
     "chalk": "^4.0.0",
     "rimraf": "^3.0.2",
-    "semver": "^7.3.4",
     "webpack-sources": "^2.0.1"
   },
   "devDependencies": {

packages/ckeditor5-dev-webpack-plugin/tests/translatesourceloader.js

@@ -21,14 +21,19 @@ describe( 'webpack-plugin/translateSourceLoader()', () => {
 			query: {
 				translateSource: sandbox.spy( () => 'output' )
 			},
-			resourcePath: 'file.js'
+			resourcePath: 'file.js',
+			callback: sinon.stub()
 		};
 
-		const result = translateSourceLoader.call( ctx, 'Source' );
+		const map = {};
+		translateSourceLoader.call( ctx, 'Source', map );
 
 		sinon.assert.calledOnce( ctx.query.translateSource );
 		sinon.assert.calledWithExactly( ctx.query.translateSource, 'Source', 'file.js' );
 
-		expect( result ).to.equal( 'output' );
+		expect( ctx.callback.calledOnce ).to.equal( true );
+		expect( ctx.callback.firstCall.args[ 0 ] ).to.equal( null );
+		expect( ctx.callback.firstCall.args[ 1 ] ).to.equal( 'output' );
+		expect( ctx.callback.firstCall.args[ 2 ] ).to.equal( map );
 	} );
 } );

packages/jsdoc-plugins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/jsdoc-plugins",
-  "version": "31.1.11",
+  "version": "31.1.13",
   "description": "Various JSDoc plugins developed by the CKEditor 5 team.",
   "keywords": [
     "jsdoc",