Skip to content

Commit

Permalink
Merge pull request #13871 from ckeditor/ck/13643-new-env
Browse files Browse the repository at this point in the history 
Other: Switched from `ts-loader` to `esbuild-loader` when processing the TypeScript sources. It significantly reduces the build time when processing automated and manual tests or preparing snippets in the documentation. Closes #13643.
  • Loading branch information
@pomek
pomek committed Apr 13, 2023
2 parents 179e8e7 + c349413 commit 48e90dc
Show file tree
Hide file tree
Showing 60 changed files with 156 additions and 411 deletions.
28 changes: 10 additions & 18 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-comments": ">=28.0.0",
"@ckeditor/ckeditor5-dev-bump-year": "^36.0.0",
"@ckeditor/ckeditor5-dev-ci": "^36.0.0",
"@ckeditor/ckeditor5-dev-dependency-checker": "^36.0.0",
"@ckeditor/ckeditor5-dev-docs": "^36.0.0",
"@ckeditor/ckeditor5-dev-release-tools": "^36.0.0",
"@ckeditor/ckeditor5-dev-tests": "^36.0.0",
"@ckeditor/ckeditor5-dev-transifex": "^36.0.0",
"@ckeditor/ckeditor5-dev-translations": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-web-crawler": "^36.0.0",
"@ckeditor/ckeditor5-dev-bump-year": "^37.0.0",
"@ckeditor/ckeditor5-dev-ci": "^37.0.0",
"@ckeditor/ckeditor5-dev-dependency-checker": "^37.0.0",
"@ckeditor/ckeditor5-dev-docs": "^37.0.0",
"@ckeditor/ckeditor5-dev-release-tools": "^37.0.0",
"@ckeditor/ckeditor5-dev-tests": "^37.0.0",
"@ckeditor/ckeditor5-dev-transifex": "^37.0.0",
"@ckeditor/ckeditor5-dev-translations": "^37.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-dev-web-crawler": "^37.0.0",
"@ckeditor/ckeditor5-export-pdf": ">=1.0.0",
"@ckeditor/ckeditor5-export-word": ">=1.0.0",
"@ckeditor/ckeditor5-import-word": ">=1.0.0",
Expand All @@ -111,41 +111,33 @@
"chalk": "^4.1.0",
"cli-table": "^0.3.1",
"coveralls": "^3.1.0",
"css-loader": "^5.2.7",
"eslint": "^7.19.0",
"eslint-config-ckeditor5": "^4.2.1",
"glob": "^7.1.6",
"http-server": "^14.1.1",
"husky": "^8.0.2",
"is-relative-url": "^3.0.0",
"lint-staged": "^12.0.0",
"mini-css-extract-plugin": "^2.4.2",
"minimatch": "^5.1.0",
"minimist": "^1.2.5",
"mkdirp": "^1.0.4",
"node-fetch": "^2.6.7",
"nyc": "^15.0.1",
"postcss-loader": "^4.3.0",
"raw-loader": "^4.0.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"rimraf": "^3.0.2",
"style-loader": "^2.0.0",
"sharp": "^0.31.3",
"stylelint": "^13.5.0",
"stylelint-config-ckeditor5": "^4.0.0",
"svgo": "^2.2.2",
"terser-webpack-plugin": "^4.2.3",
"ts-loader": "^9.3.0",
"umberto": "^3.0.0",
"upath": "^2.0.0",
"wait-on": "^6.0.1",
"webpack": "^5.58.1",
"wrapper-webpack-plugin": "^2.2.2"
},
"resolutions": {
"@typescript-eslint/eslint-plugin": "~5.43.0"
},
"engines": {
"node": ">=16.0.0",
"npm": ">=5.7.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-adapter-ckfinder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@ckeditor/ckeditor5-basic-styles": "^37.0.1",
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-clipboard": "^37.0.1",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-editor-classic": "^37.0.1",
"@ckeditor/ckeditor5-enter": "^37.0.1",
"@ckeditor/ckeditor5-heading": "^37.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-alignment/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"devDependencies": {
"@ckeditor/ckeditor5-block-quote": "^37.0.1",
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-editor-classic": "^37.0.1",
"@ckeditor/ckeditor5-engine": "^37.0.1",
"@ckeditor/ckeditor5-enter": "^37.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-autoformat/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@ckeditor/ckeditor5-block-quote": "^37.0.1",
"@ckeditor/ckeditor5-code-block": "^37.0.1",
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-editor-classic": "^37.0.1",
"@ckeditor/ckeditor5-engine": "^37.0.1",
"@ckeditor/ckeditor5-enter": "^37.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-autosave/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-editor-classic": "^37.0.1",
"@ckeditor/ckeditor5-paragraph": "^37.0.1",
"@ckeditor/ckeditor5-source-editing": "^37.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-basic-styles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-editor-classic": "^37.0.1",
"@ckeditor/ckeditor5-engine": "^37.0.1",
"@ckeditor/ckeditor5-essentials": "^37.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-block-quote/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"devDependencies": {
"@ckeditor/ckeditor5-basic-styles": "^37.0.1",
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-editor-classic": "^37.0.1",
"@ckeditor/ckeditor5-engine": "^37.0.1",
"@ckeditor/ckeditor5-enter": "^37.0.1",
Expand Down
9 changes: 2 additions & 7 deletions packages/ckeditor5-build-balloon-block/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,10 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-translations": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-translations": "^37.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-theme-lark": "^37.0.1",
"css-loader": "^5.2.7",
"postcss-loader": "^4.3.0",
"raw-loader": "^4.0.1",
"style-loader": "^2.0.0",
"terser-webpack-plugin": "^4.2.3",
"ts-loader": "^9.3.0",
"typescript": "^4.8.4",
"webpack": "^5.58.1",
"webpack-cli": "^4.9.0"
Expand Down
42 changes: 7 additions & 35 deletions packages/ckeditor5-build-balloon-block/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

const path = require( 'path' );
const webpack = require( 'webpack' );
const { bundler, styles } = require( '@ckeditor/ckeditor5-dev-utils' );
const { bundler, loaders } = require( '@ckeditor/ckeditor5-dev-utils' );
const { CKEditorTranslationsPlugin } = require( '@ckeditor/ckeditor5-dev-translations' );
const TerserPlugin = require( 'terser-webpack-plugin' );

Expand Down Expand Up @@ -59,40 +59,12 @@ module.exports = {

module: {
rules: [
{
test: /\.svg$/,
use: [ 'raw-loader' ]
},
{
test: /\.css$/,
use: [
{
loader: 'style-loader',
options: {
injectType: 'singletonStyleTag',
attributes: {
'data-cke': true
}
}
},
'css-loader',
{
loader: 'postcss-loader',
options: {
postcssOptions: styles.getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
}
}
]
},
{
test: /\.ts$/,
use: [ 'ts-loader' ]
}
loaders.getIconsLoader( { matchExtensionOnly: true } ),
loaders.getStylesLoader( {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' ),
minify: true
} ),
loaders.getTypeScriptLoader()
]
},

Expand Down
9 changes: 2 additions & 7 deletions packages/ckeditor5-build-balloon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,11 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-translations": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-translations": "^37.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-theme-lark": "^37.0.1",
"css-loader": "^5.2.7",
"postcss-loader": "^4.3.0",
"raw-loader": "^4.0.1",
"style-loader": "^2.0.0",
"terser-webpack-plugin": "^4.2.3",
"typescript": "^4.8.4",
"ts-loader": "^9.3.0",
"webpack": "^5.58.1",
"webpack-cli": "^4.9.0"
},
Expand Down
42 changes: 7 additions & 35 deletions packages/ckeditor5-build-balloon/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

const path = require( 'path' );
const webpack = require( 'webpack' );
const { bundler, styles } = require( '@ckeditor/ckeditor5-dev-utils' );
const { bundler, loaders } = require( '@ckeditor/ckeditor5-dev-utils' );
const { CKEditorTranslationsPlugin } = require( '@ckeditor/ckeditor5-dev-translations' );
const TerserPlugin = require( 'terser-webpack-plugin' );

Expand Down Expand Up @@ -59,40 +59,12 @@ module.exports = {

module: {
rules: [
{
test: /\.svg$/,
use: [ 'raw-loader' ]
},
{
test: /\.css$/,
use: [
{
loader: 'style-loader',
options: {
injectType: 'singletonStyleTag',
attributes: {
'data-cke': true
}
}
},
'css-loader',
{
loader: 'postcss-loader',
options: {
postcssOptions: styles.getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
}
}
]
},
{
test: /\.ts$/,
use: [ 'ts-loader' ]
}
loaders.getIconsLoader( { matchExtensionOnly: true } ),
loaders.getStylesLoader( {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' ),
minify: true
} ),
loaders.getTypeScriptLoader()
]
},

Expand Down
9 changes: 2 additions & 7 deletions packages/ckeditor5-build-classic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,10 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-translations": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-translations": "^37.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-theme-lark": "^37.0.1",
"css-loader": "^5.2.7",
"postcss-loader": "^4.3.0",
"raw-loader": "^4.0.1",
"style-loader": "^2.0.0",
"terser-webpack-plugin": "^4.2.3",
"ts-loader": "^9.3.0",
"typescript": "^4.8.4",
"webpack": "^5.58.1",
"webpack-cli": "^4.9.0"
Expand Down
42 changes: 7 additions & 35 deletions packages/ckeditor5-build-classic/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

const path = require( 'path' );
const webpack = require( 'webpack' );
const { bundler, styles } = require( '@ckeditor/ckeditor5-dev-utils' );
const { bundler, loaders } = require( '@ckeditor/ckeditor5-dev-utils' );
const { CKEditorTranslationsPlugin } = require( '@ckeditor/ckeditor5-dev-translations' );
const TerserPlugin = require( 'terser-webpack-plugin' );

Expand Down Expand Up @@ -59,40 +59,12 @@ module.exports = {

module: {
rules: [
{
test: /\.svg$/,
use: [ 'raw-loader' ]
},
{
test: /\.css$/,
use: [
{
loader: 'style-loader',
options: {
injectType: 'singletonStyleTag',
attributes: {
'data-cke': true
}
}
},
'css-loader',
{
loader: 'postcss-loader',
options: {
postcssOptions: styles.getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
}
}
]
},
{
test: /\.ts$/,
use: [ 'ts-loader' ]
}
loaders.getIconsLoader( { matchExtensionOnly: true } ),
loaders.getStylesLoader( {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' ),
minify: true
} ),
loaders.getTypeScriptLoader()
]
},

Expand Down
9 changes: 2 additions & 7 deletions packages/ckeditor5-build-decoupled-document/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,10 @@
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^37.0.1",
"@ckeditor/ckeditor5-dev-translations": "^36.0.0",
"@ckeditor/ckeditor5-dev-utils": "^36.0.0",
"@ckeditor/ckeditor5-dev-translations": "^37.0.0",
"@ckeditor/ckeditor5-dev-utils": "^37.0.0",
"@ckeditor/ckeditor5-theme-lark": "^37.0.1",
"css-loader": "^5.2.7",
"postcss-loader": "^4.3.0",
"raw-loader": "^4.0.1",
"style-loader": "^2.0.0",
"terser-webpack-plugin": "^4.2.3",
"ts-loader": "^9.3.0",
"typescript": "^4.8.4",
"webpack": "^5.58.1",
"webpack-cli": "^4.9.0"
Expand Down
Loading

0 comments on commit 48e90dc

Please sign in to comment.