umberto 4.4.0 → 4.4.1

package/themes/umberto/src/css/styles.scss

@@ -3,23 +3,24 @@
 
 // Division using / is deprecated, math.div() has to be used instead.
 // See: https://sass-lang.com/documentation/breaking-changes/slash-div
-@use 'sass:math';
 
 @use '~tippy.js/dist/tippy.css';
 @use '~tippy.js/themes/light-border.css';
 @use '~tippy.js/animations/scale.css';
-
-@import 'helpers/globals';
-@import 'helpers/font';
-@import 'helpers/reset';
-@import 'helpers/color';
-@import 'helpers/spacing';
+@use 'font-external';
+@use 'helpers/color';
+@use 'helpers/font';
+@use 'helpers/globals';
+@use 'helpers/reset';
+@use 'helpers/spacing';
+@use 'sass:math';
+@use 'sass:meta';
 
 @mixin u-std-font {
 	font-weight: 400;
-	line-height: $u-line-height-base;
-	font-family: $u-font-face;
-	font-size: $u-font-size-base;
+	line-height: font.$u-line-height-base;
+	font-family: font.$u-font-face;
+	font-size: font.$u-font-size-base;
 }
 
 body, html {
@@ -32,11 +33,11 @@ body, html {
 }
 
 body {
-	padding: $u-top-height 0 0;
-	color: u-color( text, 10% );
+	padding: globals.$u-top-height 0 0;
+	color: color.u-color( text, 10% );
 
-	@include u-responsive-tablet {
-		padding: $u-top-main 0 0;
+	@include globals.u-responsive-tablet {
+		padding: globals.$u-top-main 0 0;
 	}
 }
 
@@ -45,7 +46,7 @@ button, input {
 }
 
 a {
-	color: u-color( 'link' );
+	color: color.u-color( 'link' );
 	text-decoration: none;
 
 	&:hover {
@@ -57,60 +58,60 @@ a {
 	display: none;
 }
 
-@import 'tree';
-@import 'top';
-@import 'main';
-@import 'formatted';
-@import 'collapsinglist';
-@import 'footer';
-@import 'toggler';
-@import 'badge';
-@import 'dropdown';
-@import 'secondary-navigation';
-@import 'docsearch';
-@import 'loading-spinner';
+@include meta.load-css('tree');
+@include meta.load-css('top');
+@include meta.load-css('main');
+@include meta.load-css('formatted');
+@include meta.load-css('collapsinglist');
+@include meta.load-css('footer');
+@include meta.load-css('toggler');
+@include meta.load-css('badge');
+@include meta.load-css('dropdown');
+@include meta.load-css('secondary-navigation');
+@include meta.load-css('docsearch');
+@include meta.load-css('loading-spinner');
 // PAGES
 
 // GUIDES
-@import 'notice';
-@import 'guide-sdk-tree';
-@import 'guide-content';
+@include meta.load-css('notice');
+@include meta.load-css('guide-sdk-tree');
+@include meta.load-css('guide-content');
 
 // API
-@import 'api-content';
-@import 'api-info-box';
-@import 'api-props-filter';
-@import 'api-tree';
-@import 'api-subheader';
-@import 'api-see-source';
+@include meta.load-css('api-content');
+@include meta.load-css('api-info-box');
+@include meta.load-css('api-props-filter');
+@include meta.load-css('api-tree');
+@include meta.load-css('api-subheader');
+@include meta.load-css('api-see-source');
 
 // RWD
-@import 'rwd-menu';
-@import 'rwd-breadcrumbs';
+@include meta.load-css('rwd-menu');
+@include meta.load-css('rwd-breadcrumbs');
 
 // SDK
-@import 'pages/sdk';
+@include meta.load-css('pages/sdk');
 
 // External Styles
-@import 'prism';
+@include meta.load-css('prism');
 
 // Dark mode
-@import 'theme-dark';
+@include meta.load-css('theme-dark');
 
 // Dedicated print styles
-@import 'print';
+@include meta.load-css('print');
 
 // Components
-@import 'feedback-widget';
+@include meta.load-css('feedback-widget');
 
 // Lightbox plugin for {@img ... } element
-@import 'components/lightbox';
+@include meta.load-css('components/lightbox');
 
 // Toolbar icons inside guides.
-@import "editor-icon";
+@include meta.load-css("editor-icon");
 
 // The warning banner feature (displayed in the header).
-@import "warning-banner";
+@include meta.load-css("warning-banner");
 
 // The code switcher component
-@import "code-switcher";
+@include meta.load-css("code-switcher");

package/themes/umberto/src/js/_codeswitcherbuttons.js

@@ -17,19 +17,29 @@ const codeSwitcherToolbarClass = 'code-switcher__toolbar';
 
 function switchSnippetContent( originalSnippetContent, newType ) {
 	let newSnippetContent;
+	const gplComment = ' // Or \'GPL\'.';
+	const licenseKey = 'licenseKey: \'<YOUR_LICENSE_KEY>\',';
 
 	if ( newType === type.cloud ) {
 		newSnippetContent = originalSnippetContent
 			.replace( /import {/g, 'const {' )
 			.replace( /} from/g, '} =' )
 			.replace( /'ckeditor5';/g, 'CKEDITOR;' )
-			.replace( /'ckeditor5-premium-features'/g, 'CKEDITOR_PREMIUM_FEATURES' );
+			.replace( /'ckeditor5-premium-features'/g, 'CKEDITOR_PREMIUM_FEATURES' )
+			.replace( `${ licenseKey }${ gplComment }`, licenseKey );
 	} else if ( newType === type.selfHosted ) {
 		newSnippetContent = originalSnippetContent
 			.replace( /const {/g, 'import {' )
 			.replace( /} =/g, '} from' )
 			.replace( /CKEDITOR;/g, '\'ckeditor5\';' )
-			.replace( /CKEDITOR_PREMIUM_FEATURES/g, '\'ckeditor5-premium-features\'' );
+			.replace( /CKEDITOR_PREMIUM_FEATURES/g, '\'ckeditor5-premium-features\'' )
+			.replace( licenseKey, ( match, _, wholeString ) => {
+				if ( wholeString.includes( gplComment ) ) {
+					return match;
+				} else {
+					return `${ match }${ gplComment }`;
+				}
+			} );
 	}
 
 	return newSnippetContent;