umberto 2.1.0 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umberto",
-  "version": "2.1.0",
+  "version": "2.1.3",
   "description": "CKSource Documentation builder",
   "main": "src/index.js",
   "files": [

package/src/api-builder/api-builder.js

@@ -437,8 +437,10 @@ module.exports = class ApiBuilder {
 					getLinkToSource: githubUrlUtils.getFullGithubLink.bind( this ),
 					docSearchConfig: getDocSearchConfig( this._docSearch, {
 						groups: this._groups,
+						slug: this._projectSlug,
 						customRanking: this._projectConfig.docsearch ? this._projectConfig.docsearch.customRanking : []
-					} )
+					} ),
+					projectVersion: this._projectConfig.version
 				};
 				const view = new HtmlFile(
 					this._tmplCol.renderTemplate(

package/src/helpers/get-docsearch-config.js

@@ -10,6 +10,7 @@ const { cloneDeep } = require( 'lodash' );
 
 module.exports = ( searchConfig, {
 	groups = [],
+	slug = '',
 	customRanking = []
 } = {} ) => {
 	if ( !searchConfig ) {
@@ -53,7 +54,7 @@ module.exports = ( searchConfig, {
 		].join( '\n' )
 	};
 
-	const transformDataFunctions = getTransformDataFns( groups );
+	const transformDataFunctions = getTransformDataFns( groups, slug );
 
 	if ( transformDataFunctions ) {
 		for ( const tag of Object.keys( transformDataFunctions ) ) {
@@ -86,7 +87,7 @@ module.exports = ( searchConfig, {
 	return docSearchConfig;
 };
 
-function getTransformDataFns( groups ) {
+function getTransformDataFns( groups, slug ) {
 	if ( !Array.isArray( groups ) || groups.length === 0 ) {
 		return null;
 	}
@@ -114,7 +115,7 @@ function getTransformDataFns( groups ) {
 
 			`hitsGrouped[ '${ g.slug }' ] = hits`,
 			'.filter( function( h ) {',
-			`return h.tags.includes( '${ g.slug }' );`,
+			`return h.tags.includes( '${ slug }' ) && h.tags.includes( '${ g.slug }' );`,
 			'} )',
 			'.slice( 0, 7 )',
 			'.map( function( item, idx ) {',
@@ -127,7 +128,7 @@ function getTransformDataFns( groups ) {
 			`if ( tag !== '${ g.slug }' ) {`,
 			'hitsGrouped[ tag ] = hits',
 			'.filter( function( h ) {',
-			'return h.tags.includes( tag );',
+			`return h.tags.includes( '${ slug }' ) && h.tags.includes( tag );`,
 			'} )',
 			'.slice( 0, 10 )',
 			'.map( function( item, idx ) {',
@@ -188,7 +189,7 @@ function getTransformDataFns( groups ) {
 		'tags.forEach( function( tag ) {',
 		'hitsGrouped[ tag ] = hits',
 		'.filter( function( h ) {',
-		'return h.tags.includes( tag );',
+		`return h.tags.includes( '${ slug }' ) && h.tags.includes( tag );`,
 		'} )',
 		'.slice( 0, 10 )',
 		'.map( function( item, idx ) {',

package/src/hexo/filter/project-locals.js

@@ -63,11 +63,13 @@ module.exports = ( ctx, {
 				disableSearch: config.docsearch === false,
 				docSearchConfig: getDocSearchConfig( docSearch, {
 					groups: config.groups,
+					slug: config.slug,
 					customRanking: config.docsearch ? config.docsearch.customRanking : []
 				} ),
 				repoUrl: config.repoUrl,
 				og: config.og,
 				projectSlug: config.slug,
+				projectVersion: config.version,
 				navigationShowEmptyCategories
 			};
 		}

package/src/sdk-builder/sdk-builder.js

@@ -156,6 +156,7 @@ module.exports = class SdkBuilder {
 				projectSlug,
 				docSearchConfig: getDocSearchConfig( this._docSearch, {
 					groups: this.projectConfig.groups,
+					slug: this.projectConfig.slug,
 					customRanking: this.projectConfig.docsearch ? this.projectConfig.docsearch.customRanking : []
 				} )
 			};

package/themes/umberto/layout/_partial/report-issue-widget.pug

@@ -2,6 +2,7 @@
 - const shortPageUrl = page.path.split( '/' ).slice( 2 ).join( '/' )
 - const githubUrl = new URL( page.reportIssueWidget );
 - githubUrl.searchParams.set( 'title', 'Docs issue report from "' + shortPageUrl + '"' );
+- githubUrl.searchParams.set( 'project-version', projectLocals.projectVersion );
 
 div.info-box.notice.notice__feedback
     p