Skip to content

Commit

Permalink
Merge origin/main with Jest updates
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/main' into test/jest-playwright-kickoff

Prior to continue with first Jest Playwright tests, ensure that
we incorporate the changes from main.
  • Loading branch information
mmichaelis committed May 16, 2022
2 parents da0c223 + d2679c6 commit a2664ea
Show file tree
Hide file tree
Showing 48 changed files with 1,225 additions and 2,205 deletions.
2 changes: 1 addition & 1 deletion .release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.0
5.0.1-rc.0
16 changes: 8 additions & 8 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@coremedia/ckeditor5-app",
"description": "A custom CKEditor 5 build made by the CKEditor 5 online builder.",
"version": "5.0.0",
"version": "5.0.1-rc.0",
"engines": {
"node": ">=14.0.0"
},
Expand Down Expand Up @@ -33,13 +33,13 @@
"@ckeditor/ckeditor5-typing": "32.0.0",
"@ckeditor/ckeditor5-ui": "32.0.0",
"@ckeditor/ckeditor5-utils": "32.0.0",
"@coremedia/ckeditor5-coremedia-content-clipboard": "^5.0.0",
"@coremedia/ckeditor5-coremedia-link": "^5.0.0",
"@coremedia/ckeditor5-coremedia-images": "^5.0.0",
"@coremedia/ckeditor5-coremedia-richtext": "^5.0.0",
"@coremedia/ckeditor5-coremedia-studio-integration-mock": "^5.0.0",
"@coremedia/ckeditor5-studio-essentials": "^5.0.0",
"@coremedia/ckeditor5-symbol-on-paste-mapper": "^5.0.0",
"@coremedia/ckeditor5-coremedia-content-clipboard": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-link": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-images": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-richtext": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-studio-integration-mock": "5.0.1-rc.0",
"@coremedia/ckeditor5-studio-essentials": "5.0.1-rc.0",
"@coremedia/ckeditor5-symbol-on-paste-mapper": "5.0.1-rc.0",
"@coremedia/service-agent": "^1.0.0",
"xml-formatter": "^2.5.1"
},
Expand Down
25 changes: 25 additions & 0 deletions packages/ckeditor5-babel-config/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "@coremedia-internal/ckeditor5-babel-config",
"version": "1.0.0",
"description": "babel config",
"private": true,
"license": "Apache-2.0",
"dependencies": {
"@babel/core": "^7.16.0",
"@babel/plugin-transform-parameters": "^7.16.3",
"@babel/plugin-transform-computed-properties": "^7.16.0",
"@babel/plugin-transform-shorthand-properties": "^7.16.0",
"@babel/plugin-transform-arrow-functions": "^7.16.0",
"@babel/plugin-transform-for-of": "^7.16.0",
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@babel/preset-typescript": "^7.16.0"
},
"exports": {
".": "./shared-babel.config.js"
},
"engines": {
"node": ">=14.0.0",
"npm": ">=5.7.1"
}
}
16 changes: 16 additions & 0 deletions packages/ckeditor5-babel-config/shared-babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module.exports = {
"plugins": [
[require.resolve("@babel/plugin-transform-typescript"), {"allowDeclareFields": true, "allowNamespaces": true}],
[require.resolve("@babel/plugin-transform-parameters"), {"loose": true}],
[require.resolve("@babel/plugin-transform-computed-properties"), {"loose": true}],
[require.resolve("@babel/plugin-transform-shorthand-properties"), {"loose": true}],
[require.resolve("@babel/plugin-transform-arrow-functions"), {"spec": false}],
[require.resolve("@babel/plugin-transform-for-of"), {"assumeArray": true}],
[require.resolve("@babel/plugin-proposal-class-properties"), {}],
],
"presets": [[require.resolve("@babel/preset-env"), {
"targets": {
"node": 12
}
}]]
};
2 changes: 1 addition & 1 deletion packages/ckeditor5-common/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const sharedBabelConf = require('../../shared-babel.config');
const sharedBabelConf = require('@coremedia-internal/ckeditor5-babel-config');

module.exports = sharedBabelConf;
21 changes: 5 additions & 16 deletions packages/ckeditor5-common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coremedia/ckeditor5-common",
"version": "5.0.0",
"version": "5.0.1-rc.0",
"description": "tooling to help with CKEditor 5 Plugin implementations.",
"keywords": [
"coremedia"
Expand All @@ -16,30 +16,19 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-arrow-functions": "^7.16.0",
"@babel/plugin-transform-computed-properties": "^7.16.0",
"@babel/plugin-transform-for-of": "^7.16.0",
"@babel/plugin-transform-parameters": "^7.16.3",
"@babel/plugin-transform-shorthand-properties": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@babel/preset-typescript": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@types/jest": "^27.0.2",
"@typescript-eslint/eslint-plugin": "^5.9.1",
"@typescript-eslint/parser": "^5.9.1",
"babel-jest": "^27.3.1",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-tsdoc": "^0.2.14",
"jest": "^27.3.1",
"jest": "^28.0.2",
"jest-config": "^27.3.1",
"jest-transform-stub": "^2.0.0",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
"typescript": "^4.4.4"
Expand All @@ -48,7 +37,7 @@
"@ckeditor/ckeditor5-core": "^32.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-logging": "^5.0.0"
"@coremedia/ckeditor5-logging": "5.0.1-rc.0"
},
"scripts": {
"clean": "rimraf ./dist",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const sharedBabelConf = require("../../shared-babel.config");
const sharedBabelConf = require("@coremedia-internal/ckeditor5-babel-config");

module.exports = sharedBabelConf;
35 changes: 12 additions & 23 deletions packages/ckeditor5-coremedia-content-clipboard/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coremedia/ckeditor5-coremedia-content-clipboard",
"version": "5.0.0",
"version": "5.0.1-rc.0",
"engines": {
"node": ">=14.0.0"
},
Expand All @@ -17,40 +17,29 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-arrow-functions": "^7.16.0",
"@babel/plugin-transform-computed-properties": "^7.16.0",
"@babel/plugin-transform-for-of": "^7.16.0",
"@babel/plugin-transform-parameters": "^7.16.3",
"@babel/plugin-transform-shorthand-properties": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@babel/preset-typescript": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-html-support": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-undo": "^32.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-engine": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-html-support": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-utils": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-undo": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-engine": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-html-support": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-utils": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-undo": "5.0.1-rc.0",
"@coremedia/service-agent": "^1.0.0",
"@types/jest": "^27.0.2",
"@typescript-eslint/eslint-plugin": "^5.3.1",
"@typescript-eslint/parser": "^5.3.1",
"babel-jest": "^27.3.1",
"eslint": "^8.2.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-tsdoc": "^0.2.14",
"jest": "^27.3.1",
"jest-each": "^27.3.1",
"jest-transform-stub": "^2.0.0",
"jest": "^28.0.2",
"jest-each": "^28.0.2",
"jest-xml-matcher": "^1.2.0",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
Expand All @@ -69,8 +58,8 @@
"@coremedia/service-agent": "^1.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-common": "^5.0.0",
"@coremedia/ckeditor5-logging": "^5.0.0",
"@coremedia/ckeditor5-coremedia-studio-integration": "^5.0.0"
"@coremedia/ckeditor5-common": "5.0.1-rc.0",
"@coremedia/ckeditor5-logging": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-studio-integration": "5.0.1-rc.0"
}
}
2 changes: 1 addition & 1 deletion packages/ckeditor5-coremedia-images/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const sharedBabelConf = require('../../shared-babel.config');
const sharedBabelConf = require('@coremedia-internal/ckeditor5-babel-config');

module.exports = sharedBabelConf;
33 changes: 11 additions & 22 deletions packages/ckeditor5-coremedia-images/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coremedia/ckeditor5-coremedia-images",
"version": "5.0.0",
"version": "5.0.1-rc.0",
"engines": {
"node": ">=14.0.0"
},
Expand All @@ -20,35 +20,24 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-arrow-functions": "^7.16.0",
"@babel/plugin-transform-computed-properties": "^7.16.0",
"@babel/plugin-transform-for-of": "^7.16.0",
"@babel/plugin-transform-parameters": "^7.16.3",
"@babel/plugin-transform-shorthand-properties": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@babel/preset-typescript": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-image": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia/service-agent": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-engine": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-image": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-engine": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-image": "5.0.1-rc.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@types/jest": "^27.0.2",
"@typescript-eslint/eslint-plugin": "^5.3.1",
"@typescript-eslint/parser": "^5.3.1",
"babel-jest": "^27.3.1",
"eslint": "^8.2.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"jest": "^27.3.1",
"jest-each": "^27.3.1",
"jest-transform-stub": "^2.0.0",
"jest": "^28.0.2",
"jest-each": "^28.0.2",
"jest-xml-matcher": "^1.2.0",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
Expand All @@ -62,10 +51,10 @@
"@coremedia/service-agent": "^1.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-common": "^5.0.0",
"@coremedia/ckeditor5-coremedia-studio-integration": "^5.0.0",
"@coremedia/ckeditor5-coremedia-content-clipboard": "^5.0.0",
"@coremedia/ckeditor5-logging": "^5.0.0",
"@coremedia/ckeditor5-common": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-studio-integration": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-content-clipboard": "5.0.1-rc.0",
"@coremedia/ckeditor5-logging": "5.0.1-rc.0",
"rxjs": "^6.5.4"
}
}
2 changes: 1 addition & 1 deletion packages/ckeditor5-coremedia-link/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const sharedBabelConf = require('../../shared-babel.config');
const sharedBabelConf = require('@coremedia-internal/ckeditor5-babel-config');

module.exports = sharedBabelConf;
41 changes: 15 additions & 26 deletions packages/ckeditor5-coremedia-link/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coremedia/ckeditor5-coremedia-link",
"version": "5.0.0",
"version": "5.0.1-rc.0",
"engines": {
"node": ">=14.0.0"
},
Expand All @@ -20,43 +20,32 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-arrow-functions": "^7.16.0",
"@babel/plugin-transform-computed-properties": "^7.16.0",
"@babel/plugin-transform-for-of": "^7.16.0",
"@babel/plugin-transform-parameters": "^7.16.3",
"@babel/plugin-transform-shorthand-properties": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@babel/preset-typescript": "^7.16.0",
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-link": "^32.0.0",
"@ckeditor/ckeditor5-typing": "^32.0.0",
"@ckeditor/ckeditor5-ui": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/service-agent": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-clipboard": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-engine": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-link": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-typing": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-ui": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-utils": "^5.0.0",
"@coremedia/types-ckeditor__ckeditor5-clipboard": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-engine": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-link": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-typing": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-ui": "5.0.1-rc.0",
"@coremedia/types-ckeditor__ckeditor5-utils": "5.0.1-rc.0",
"@types/jest": "^27.0.2",
"@typescript-eslint/eslint-plugin": "^5.9.1",
"@typescript-eslint/parser": "^5.9.1",
"babel-jest": "^27.3.1",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-tsdoc": "^0.2.14",
"jest": "^27.3.1",
"jest-each": "^27.3.1",
"jest-transform-stub": "^2.0.0",
"jest": "^28.0.2",
"jest-each": "^28.0.2",
"jest-xml-matcher": "^1.2.0",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
Expand All @@ -73,10 +62,10 @@
"@coremedia/service-agent": "^1.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-common": "^5.0.0",
"@coremedia/ckeditor5-coremedia-content-clipboard": "^5.0.0",
"@coremedia/ckeditor5-coremedia-studio-integration": "^5.0.0",
"@coremedia/ckeditor5-logging": "^5.0.0",
"@coremedia/ckeditor5-common": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-content-clipboard": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-studio-integration": "5.0.1-rc.0",
"@coremedia/ckeditor5-logging": "5.0.1-rc.0",
"rxjs": "^6.5.4"
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const sharedBabelConf = require("../../shared-babel.config");
const sharedBabelConf = require("@coremedia-internal/ckeditor5-babel-config");

module.exports = sharedBabelConf;
Loading

0 comments on commit a2664ea

Please sign in to comment.