Parcourir la source

Merge branch 'master' into i/5696

Aleksander Nowodzinski il y a 6 ans
Parent
commit
22018cc5f8

+ 1 - 1
.github/ISSUE_TEMPLATE/5-task.md

@@ -9,7 +9,7 @@ assignees: ''
 
 ## Provide a description of the task
 
-*What steps should be taken to fulfil the task?*
+*What steps should be taken to fulfill the task?*
 
 ## 📃 Other details
 

+ 1 - 1
docs/_snippets/framework/tutorials/using-react-in-widget.js

@@ -63,7 +63,7 @@ class ProductPreviewEditing extends Plugin {
 	_defineConverters() {
 		const editor = this.editor;
 		const conversion = editor.conversion;
-		const renderProduct = editor.config.get( 'products' ).productRenderer;
+		const renderProduct = editor.config.get( 'products.productRenderer' );
 
 		// <productPreview> converters ((data) view → model)
 		conversion.for( 'upcast' ).elementToElement( {

+ 98 - 66
docs/builds/guides/integration/content-styles.md

@@ -48,12 +48,18 @@ Below there is a full list of content styles used by the editor features. You ca
 
 ```css
 /*
- * CKEditor 5 (v12.4.0) content styles.
- * Generated on Mon, 21 Oct 2019 11:34:56 GMT.
+ * CKEditor 5 (v15.0.0) content styles.
+ * Generated on Tue, 29 Oct 2019 08:39:09 GMT.
  * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/content-styles.html
  */
 
 :root {
+	--ck-highlight-marker-blue: #72cdfd;
+	--ck-highlight-marker-green: #63f963;
+	--ck-highlight-marker-pink: #fc7999;
+	--ck-highlight-marker-yellow: #fdfd77;
+	--ck-highlight-pen-green: #118800;
+	--ck-highlight-pen-red: #e91313;
 	--ck-image-style-spacing: 1.5em;
 	--ck-todo-list-checkmark-size: 16px;
 }
@@ -64,20 +70,6 @@ Below there is a full list of content styles used by the editor features. You ca
 	padding: .15em;
 	border-radius: 2px;
 }
-/* ckeditor5-image/theme/image.css */
-.ck-content .image {
-	display: table;
-	clear: both;
-	text-align: center;
-	margin: 1em auto;
-}
-/* ckeditor5-image/theme/image.css */
-.ck-content .image > img {
-	display: block;
-	margin: 0 auto;
-	max-width: 100%;
-	min-width: 50px;
-}
 /* ckeditor5-image/theme/imagecaption.css */
 .ck-content .image > figcaption {
 	display: table-caption;
@@ -103,12 +95,19 @@ Below there is a full list of content styles used by the editor features. You ca
 .ck-content .image.image_resized > figcaption {
 	display: block;
 }
-/* ckeditor5-media-embed/theme/mediaembed.css */
-.ck-content .media {
+/* ckeditor5-image/theme/image.css */
+.ck-content .image {
+	display: table;
 	clear: both;
-	margin: 1em 0;
+	text-align: center;
+	margin: 1em auto;
+}
+/* ckeditor5-image/theme/image.css */
+.ck-content .image > img {
 	display: block;
-	min-width: 15em;
+	margin: 0 auto;
+	max-width: 100%;
+	min-width: 50px;
 }
 /* ckeditor5-list/theme/todolist.css */
 .ck-content .todo-list {
@@ -177,28 +176,39 @@ Below there is a full list of content styles used by the editor features. You ca
 .ck-content .todo-list .todo-list__label .todo-list__label__description {
 	vertical-align: middle;
 }
-/* ckeditor5-table/theme/table.css */
-.ck-content .table {
-	margin: 1em auto;
-	display: table;
+/* ckeditor5-media-embed/theme/mediaembed.css */
+.ck-content .media {
+	clear: both;
+	margin: 1em 0;
+	display: block;
+	min-width: 15em;
 }
-/* ckeditor5-table/theme/table.css */
-.ck-content .table table {
-	border-collapse: collapse;
-	border-spacing: 0;
-	border: 1px double hsl(0, 0%, 70%);
+/* ckeditor5-image/theme/imagestyle.css */
+.ck-content .image-style-side,
+.ck-content .image-style-align-left,
+.ck-content .image-style-align-center,
+.ck-content .image-style-align-right {
+	max-width: 50%;
 }
-/* ckeditor5-table/theme/table.css */
-.ck-content .table table td,
-.ck-content .table table th {
-	min-width: 2em;
-	padding: .4em;
-	border-color: hsl(0, 0%, 85%);
+/* ckeditor5-image/theme/imagestyle.css */
+.ck-content .image-style-side {
+	float: right;
+	margin-left: var(--ck-image-style-spacing);
 }
-/* ckeditor5-table/theme/table.css */
-.ck-content .table table th {
-	font-weight: bold;
-	background: hsl(0, 0%, 98%);
+/* ckeditor5-image/theme/imagestyle.css */
+.ck-content .image-style-align-left {
+	float: left;
+	margin-right: var(--ck-image-style-spacing);
+}
+/* ckeditor5-image/theme/imagestyle.css */
+.ck-content .image-style-align-center {
+	margin-left: auto;
+	margin-right: auto;
+}
+/* ckeditor5-image/theme/imagestyle.css */
+.ck-content .image-style-align-right {
+	float: right;
+	margin-left: var(--ck-image-style-spacing);
 }
 /* ckeditor5-page-break/theme/pagebreak.css */
 .ck-content .page-break {
@@ -236,33 +246,6 @@ Below there is a full list of content styles used by the editor features. You ca
 	-ms-user-select: none;
 	user-select: none;
 }
-/* ckeditor5-image/theme/imagestyle.css */
-.ck-content .image-style-side,
-.ck-content .image-style-align-left,
-.ck-content .image-style-align-center,
-.ck-content .image-style-align-right {
-	max-width: 50%;
-}
-/* ckeditor5-image/theme/imagestyle.css */
-.ck-content .image-style-side {
-	float: right;
-	margin-left: var(--ck-image-style-spacing);
-}
-/* ckeditor5-image/theme/imagestyle.css */
-.ck-content .image-style-align-left {
-	float: left;
-	margin-right: var(--ck-image-style-spacing);
-}
-/* ckeditor5-image/theme/imagestyle.css */
-.ck-content .image-style-align-center {
-	margin-left: auto;
-	margin-right: auto;
-}
-/* ckeditor5-image/theme/imagestyle.css */
-.ck-content .image-style-align-right {
-	float: right;
-	margin-left: var(--ck-image-style-spacing);
-}
 /* ckeditor5-block-quote/theme/blockquote.css */
 .ck-content blockquote {
 	overflow: hidden;
@@ -285,6 +268,55 @@ Below there is a full list of content styles used by the editor features. You ca
 	border-color: hsl(0, 0%, 37%);
 	margin: 0;
 }
+/* ckeditor5-table/theme/table.css */
+.ck-content .table {
+	margin: 1em auto;
+	display: table;
+}
+/* ckeditor5-table/theme/table.css */
+.ck-content .table table {
+	border-collapse: collapse;
+	border-spacing: 0;
+	border: 1px double hsl(0, 0%, 70%);
+}
+/* ckeditor5-table/theme/table.css */
+.ck-content .table table td,
+.ck-content .table table th {
+	min-width: 2em;
+	padding: .4em;
+	border-color: hsl(0, 0%, 85%);
+}
+/* ckeditor5-table/theme/table.css */
+.ck-content .table table th {
+	font-weight: bold;
+	background: hsl(0, 0%, 98%);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-yellow {
+	background-color: var(--ck-highlight-marker-yellow);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-green {
+	background-color: var(--ck-highlight-marker-green);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-pink {
+	background-color: var(--ck-highlight-marker-pink);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-blue {
+	background-color: var(--ck-highlight-marker-blue);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-red {
+	color: var(--ck-highlight-pen-red);
+	background-color: transparent;
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-green {
+	color: var(--ck-highlight-pen-green);
+	background-color: transparent;
+}
 @media print {
 	/* ckeditor5-page-break/theme/pagebreak.css */
 	.ck-content .page-break {

Fichier diff supprimé car celui-ci est trop grand
+ 155 - 74
docs/builds/guides/migrate.md


+ 1 - 1
docs/framework/guides/tutorials/using-react-in-a-widget.md

@@ -1130,7 +1130,7 @@ export default class ProductPreviewEditing extends Plugin {
 	_defineConverters() {
 		const editor = this.editor;
 		const conversion = editor.conversion;
-		const renderProduct = editor.config.get( 'products' ).productRenderer;
+		const renderProduct = editor.config.get( 'products.productRenderer' );
 
 		// <productPreview> converters ((data) view → model)
 		conversion.for( 'upcast' ).elementToElement( {

+ 0 - 1
package.json

@@ -87,7 +87,6 @@
     "css-loader": "^1.0.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^2.0.0",
-    "file-loader": "^4.1.0",
     "glob": "^7.1.2",
     "husky": "^1.3.1",
     "lint-staged": "^7.0.0",

+ 0 - 18
scripts/docs/snippetadapter.js

@@ -365,24 +365,6 @@ function getWebpackConfig( snippets, config ) {
 							} )
 						}
 					]
-				},
-				// `file-loader` is used to handle assets introduced by 3rd party plugins.
-				// All guides in the documentation that could use images should be named as follow: `guide-type/guide-name`
-				//
-				// NOTE: You cannot use more than single slash `/` in the guide name.
-				// All images will be saved in the `snippets/` directory as `assets/images/[file]`.
-				// Unfortunately, compiled JS/CSS file that requires images will be looking for those assets in:
-				// `snippets/[guide-type/guide-name]/assets/images/` so we need to manually go up twice.
-				// ATM there is no easy way to find the number how many directories we need to go up so the assumption about names of
-				// the guides seems to be a safer solution.
-				{
-					test: /\.(png|jpe?g|gif)$/,
-					loader: 'file-loader',
-					options: {
-						name: config.production ? '[sha512:hash:base64:7].[ext]' : '[name].[ext]',
-						outputPath: path.join( 'assets', 'images' ),
-						publicPath: [ '..', '..', 'assets', 'images' ].join( '/' )
-					},
 				}
 			]
 		}

+ 1 - 9
yarn.lock

@@ -4476,14 +4476,6 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-loader@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz#5fb124d2369d7075d70a9a5abecd12e60a95215e"
-  integrity sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==
-  dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.0.0"
-
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -10152,7 +10144,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.0, schema-utils@^2.0.1:
+schema-utils@^2.0.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f"
   integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==