Merge stable into master

ckeditor · Aug 2, 2023 · b823341 · b823341
2 parents 054dc84 + 54b9c52
commit b823341
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 16 deletions.
diff --git a/docs/umberto.json b/docs/umberto.json
@@ -18,8 +18,8 @@
 	"extraScripts": "assets/buildwarningbanner.js",
 	"packagesDir": [
 		"packages/*",
-		"external/@(ckeditor5-internal|ckeditor5-commercial)/",
-		"external/@(ckeditor5-internal|ckeditor5-commercial)/packages/*"
+		"external/ckeditor5-commercial/",
+		"external/ckeditor5-commercial/packages/*"
 	],
 	"path": "docs",
 	"observablesdocs": "module:utils/observablemixin~Observable",

diff --git a/scripts/ci/check-dependencies-versions-match.js b/scripts/ci/check-dependencies-versions-match.js
@@ -28,8 +28,6 @@ console.log( chalk.blue( '🔍 Starting checking dependencies versions...' ) );
 const [ packageJsons, pathMappings ] = getPackageJsons( [
 	'package.json',
 	'packages/*/package.json',
-	'external/ckeditor5-internal/packages/*/package.json',
-	'external/ckeditor5-internal/package.json',
 	'external/ckeditor5-commercial/packages/*/package.json',
 	'external/ckeditor5-commercial/package.json'
 ] );

diff --git a/scripts/docs/buildapi.js b/scripts/docs/buildapi.js
@@ -38,26 +38,26 @@ function getConfig() {
 		sourceFiles: [
 			// CKEditor 5 sources.
 			'packages/ckeditor5-*/src/**/*.ts',
-			'external/@(ckeditor5-internal|ckeditor5-commercial)/packages/ckeditor5-*/src/**/*.ts',
+			'external/ckeditor5-commercial/packages/ckeditor5-*/src/**/*.ts',
 
 			// Ignore libraries or generated files.
 			'!packages/ckeditor5-*/src/lib/**/*.ts',
-			'!external/@(ckeditor5-internal|ckeditor5-commercial)/packages/ckeditor5-*/src/lib/**/*.ts',
+			'!external/ckeditor5-commercial/packages/ckeditor5-*/src/lib/**/*.ts',
 
 			// Ignore not a direct sources.
 			'!external/ckeditor5-commercial/packages/ckeditor5-operations-compressor/src/protobufdescriptions.ts',
 
 			// Ignore builds.
 			'!packages/ckeditor5-build-*/src/**/*.ts',
-			'!external/@(ckeditor5-internal|ckeditor5-commercial)/packages/ckeditor5-build-*/src/**/*.ts',
+			'!external/ckeditor5-commercial/packages/ckeditor5-build-*/src/**/*.ts',
 
 			// Ignore all declarations.
 			'!packages/ckeditor5-*/src/**/*.d.ts',
-			'!external/@(ckeditor5-internal|ckeditor5-commercial)/packages/ckeditor5-*/src/**/*.d.ts',
+			'!external/ckeditor5-commercial/packages/ckeditor5-*/src/**/*.d.ts',
 
 			// Ignore augmentation files.
 			'!packages/ckeditor5-*/src/augmentation.ts',
-			'!external/@(ckeditor5-internal|ckeditor5-commercial)/packages/ckeditor5-*/src/augmentation.ts'
+			'!external/ckeditor5-commercial/packages/ckeditor5-*/src/augmentation.ts'
 		]
 	};
 }
diff --git a/scripts/release/switchlatest.js b/scripts/release/switchlatest.js
@@ -18,7 +18,6 @@ const ROOT_DIRECTORY = upath.join( __dirname, '..', '..' );
 const GLOB_PATTERNS = [
 	'package.json',
 	'packages/*/package.json',
-	'external/ckeditor5-internal/packages/*/package.json',
 	'external/ckeditor5-commercial/packages/*/package.json'
 ];
 

diff --git a/scripts/release/utils/constants.js b/scripts/release/utils/constants.js
@@ -14,6 +14,5 @@ module.exports = {
 	PACKAGES_DIRECTORY: 'packages',
 	RELEASE_DIRECTORY: 'release',
 	CKEDITOR5_ROOT_PATH,
-	CKEDITOR5_INTERNAL_PATH: upath.resolve( CKEDITOR5_ROOT_PATH, 'external', 'ckeditor5-internal' ),
 	CKEDITOR5_COMMERCIAL_PATH: upath.resolve( CKEDITOR5_ROOT_PATH, 'external', 'ckeditor5-commercial' )
 };
diff --git a/scripts/release/utils/isckeditor5packagefactory.js b/scripts/release/utils/isckeditor5packagefactory.js
@@ -22,7 +22,6 @@ module.exports = async function isCKEditor5PackageFactory() {
 	const allPathsToPackageJson = await glob( [
 		'package.json',
 		'packages/*/package.json',
-		'external/ckeditor5-internal/packages/*/package.json',
 		'external/ckeditor5-commercial/packages/*/package.json'
 	], {
 		cwd: pathToCKEditor5,

diff --git a/tsconfig.docs.json b/tsconfig.docs.json
@@ -7,7 +7,6 @@
   "include": [
     "./typings/",
     "./packages/*/src/augmentation.ts",
-    "./external/ckeditor5-internal/packages/*/src/augmentation.ts",
     "./external/ckeditor5-commercial/packages/*/src/augmentation.ts"
   ]
 }
diff --git a/tsconfig.test.json b/tsconfig.test.json
@@ -17,7 +17,6 @@
   "include": [
     "./typings/",
     "./packages/*/src/augmentation.ts",
-    "./external/ckeditor5-internal/packages/*/src/augmentation.ts",
     "./external/ckeditor5-commercial/packages/*/src/augmentation.ts"
   ]
 }
diff --git a/tsconfig.typedoc.json b/tsconfig.typedoc.json
@@ -14,7 +14,6 @@
       ],
       "@ckeditor/*": [
         "packages/*",
-        "external/ckeditor5-internal/packages/*",
         "external/ckeditor5-commercial/packages/*"
       ],
       "@ckeditor/ckeditor-cloud-services-collaboration": [
@@ -27,7 +26,6 @@
   },
   "include": [
     "./packages/*/src/**/*.ts",
-    "./external/ckeditor5-internal/packages/*/src/**/*.ts",
     "./external/ckeditor5-commercial/packages/*/src/**/*.ts",
     "./typings/"
   ],