Skip to content

Commit a901be4

Browse files
jens-meisnerjens-meisner
committed
patch ckeditor5 version 42.0.2 + fix build outputDir + revert shared-jest-config
1 parent 3cec951 commit a901be4

File tree

30 files changed

+125
-118
lines changed

30 files changed

+125
-118
lines changed

‎package.json

+5
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,10 @@
8585
"typedoc": "^0.25.13",
8686
"typescript": "5.4.5",
8787
"validate-peer-dependencies": "^2.2.0"
88+
},
89+
"pnpm": {
90+
"patchedDependencies": {
91+
"[email protected]": "patches/[email protected]"
92+
}
8893
}
8994
}

‎packages/ckeditor5-bbcode/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"./types"
77
],
88
"compilerOptions": {
9-
"outDir": "./dist/src",
9+
"outDir": "./dist",
1010
"paths": {
1111
"@bbob/core/*": [
1212
"./types/@bbob/core/*"

‎packages/ckeditor5-common/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-core-common/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./src"

‎packages/ckeditor5-coremedia-blocklist/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__mocks__",

‎packages/ckeditor5-coremedia-content-clipboard/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./src",

‎packages/ckeditor5-coremedia-content/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./src"

‎packages/ckeditor5-coremedia-differencing/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-coremedia-example-data/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-coremedia-images/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./src",

‎packages/ckeditor5-coremedia-link/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__mocks__",

‎packages/ckeditor5-coremedia-richtext-support/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-coremedia-richtext/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-coremedia-studio-essentials/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./src"

‎packages/ckeditor5-coremedia-studio-integration-mock/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-coremedia-studio-integration/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-data-facade/__tests__/toDelete1.test.ts

-11
This file was deleted.

‎packages/ckeditor5-data-facade/__tests__/toDelete2.test.ts

-6
This file was deleted.

‎packages/ckeditor5-data-facade/__tests__/toDelete3.test.ts

-4
This file was deleted.

‎packages/ckeditor5-data-facade/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__mocks__",

‎packages/ckeditor5-dataprocessor-support/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-dialog-visibility/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./src"

‎packages/ckeditor5-dom-converter/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-dom-support/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-font-mapper/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎packages/ckeditor5-jest-test-helpers/shared-jest.config.js

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const babelConfig = require("@coremedia-internal/ckeditor5-babel-config");
2+
13
module.exports = {
24
testEnvironment: require.resolve("jest-environment-jsdom"),
35
// Don't detect utility files as tests, i.e. require `test` in name.
@@ -6,18 +8,20 @@ module.exports = {
68
moduleNameMapper: {
79
// https://www.npmjs.com/package/jest-transform-stub
810
"^.+\\.(css|less|sass|scss|gif|png|jpg|ttf|eot|woff|woff2|svg)$": require.resolve("jest-transform-stub"),
9-
// https://stackoverflow.com/questions/76608600/jest-tests-are-failing-because-of-an-unknown-unexpected-token-export
10-
"^blurhash": require.resolve("blurhash"),
1111
},
12-
preset: "ts-jest/presets/default-esm",
1312
transform: {
14-
"^.+.tsx?$": [
13+
// '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
14+
// '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
15+
"^.+\\.tsx?$": [
1516
"ts-jest",
1617
{
17-
useESM: true,
18+
// ts-jest configuration goes here
1819
},
1920
],
21+
// Required, e.g., for CKEditor 5 Dependencies.
22+
"^.+\\.jsx?$": [require.resolve("babel-jest"), babelConfig],
23+
// https://www.npmjs.com/package/jest-transform-stub
24+
"^.+\\.(css|less|sass|scss|gif|png|jpg|ttf|eot|woff|woff2|svg)$": require.resolve("jest-transform-stub"),
2025
},
21-
extensionsToTreatAsEsm: [".ts"],
22-
transformIgnorePatterns: ["node_modules/.pnpm/(?!@bbob|lodash-es|rxjs|vanilla-colorful)"],
26+
transformIgnorePatterns: ["node_modules/.pnpm/(?!@ckeditor|@bbob|lodash-es|rxjs|ckeditor5|vanilla-colorful)"],
2327
};

‎packages/ckeditor5-link-common/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./src"

‎packages/ckeditor5-logging/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "./dist/src"
4+
"outDir": "./dist"
55
},
66
"include": [
77
"./__tests__",

‎patches/[email protected]

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/package.json b/package.json
2+
index 24c71866b40459089344354843e1460a12206246..93f32574eb3d8120cc290ef8557d4fb7c935e356 100644
3+
--- a/package.json
4+
+++ b/package.json
5+
@@ -26,7 +26,8 @@
6+
"exports": {
7+
".": {
8+
"types": "./dist/index.d.ts",
9+
- "import": "./dist/ckeditor5.js"
10+
+ "import": "./dist/ckeditor5.js",
11+
+ "default": "./dist/ckeditor5.js"
12+
},
13+
"./*": "./dist/*",
14+
"./browser/*": null,

0 commit comments

Comments
 (0)