@brightspace-ui-labs/facet-filter-sort 5.5.1 → 5.6.0

package/README.md

@@ -191,41 +191,8 @@ npm run test:headless
 npm run test:headless:watch
 ```
 
-## Versioning & Releasing
+### Versioning and Releasing
 
-> TL;DR: Commits prefixed with `fix:` and `feat:` will trigger patch and minor releases when merged to `main`. Read on for more details...
+This repo is configured to use `semantic-release`. Commits prefixed with `fix:` and `feat:` will trigger patch and minor releases when merged to `main`.
 
-The [semantic-release GitHub Action](https://github.com/BrightspaceUI/actions/tree/main/semantic-release) is called from the `release.yml` GitHub Action workflow to handle version changes and releasing.
-
-### Version Changes
-
-All version changes should obey [semantic versioning](https://semver.org/) rules:
-1. **MAJOR** version when you make incompatible API changes,
-2. **MINOR** version when you add functionality in a backwards compatible manner, and
-3. **PATCH** version when you make backwards compatible bug fixes.
-
-The next version number will be determined from the commit messages since the previous release. Our semantic-release configuration uses the [Angular convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular) when analyzing commits:
-* Commits which are prefixed with `fix:` or `perf:` will trigger a `patch` release. Example: `fix: validate input before using`
-* Commits which are prefixed with `feat:` will trigger a `minor` release. Example: `feat: add toggle() method`
-* To trigger a MAJOR release, include `BREAKING CHANGE:` with a space or two newlines in the footer of the commit message
-* Other suggested prefixes which will **NOT** trigger a release: `build:`, `ci:`, `docs:`, `style:`, `refactor:` and `test:`. Example: `docs: adding README for new component`
-
-To revert a change, add the `revert:` prefix to the original commit message. This will cause the reverted change to be omitted from the release notes. Example: `revert: fix: validate input before using`.
-
-### Releases
-
-When a release is triggered, it will:
-* Update the version in `package.json`
-* Tag the commit
-* Create a GitHub release (including release notes)
-* Deploy a new package to NPM
-
-### Releasing from Maintenance Branches
-
-Occasionally you'll want to backport a feature or bug fix to an older release. `semantic-release` refers to these as [maintenance branches](https://semantic-release.gitbook.io/semantic-release/usage/workflow-configuration#maintenance-branches).
-
-Maintenance branch names should be of the form: `+([0-9])?(.{+([0-9]),x}).x`.
-
-Regular expressions are complicated, but this essentially means branch names should look like:
-* `1.15.x` for patch releases on top of the `1.15` release (after version `1.16` exists)
-* `2.x` for feature releases on top of the `2` release (after version `3` exists)
+To learn how to create major releases and release from maintenance branches, refer to the [semantic-release GitHub Action](https://github.com/BrightspaceUI/actions/tree/main/semantic-release) documentation.

package/components/filter-dropdown/filter-dropdown.js

@@ -114,7 +114,7 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 				}
 			</style>
 			<d2l-dropdown-button-subtle
-				text="[[_getOpenerText(totalSelectedOptionCount, disableOpenerTextVariation, openerText, openerTextSingle, openerTextMultiple)]]"
+				text="[[_getOpenerText(totalSelectedOptionCount, disableOpenerTextVariation, openerText, openerTextSingle, openerTextMultiple, localize, resources)]]"
 				disabled="[[disabled]]">
 				<d2l-dropdown-tabs
 					min-width="[[minWidth]]"
@@ -123,7 +123,7 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 					no-padding-footer$="[[noPaddingFooter]]"
 					render-content>
 					<div class="d2l-labs-filter-dropdown-content-header">
-						<span>[[_localizeOrAlt(headerText, 'filterBy')]]</span>
+						<span>[[_localizeOrAlt(headerText, 'filterBy', localize, resources)]]</span>
 						<d2l-button-subtle text="[[localize('clear')]]" hidden$="[[!totalSelectedOptionCount]]" on-click="clearFilters"></d2l-button-subtle>
 					</div>
 					<d2l-tabs>
@@ -170,6 +170,8 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 	}
 
 	_getOpenerText(totalSelectedOptionCount, disableOpenerTextVariation, openerText, openerTextSingle, openerTextMultiple) {
+		if (!this.localize || !this.resources) return;
+
 		if (totalSelectedOptionCount === 0 || disableOpenerTextVariation) {
 			return this._localizeOrAlt(openerText, 'filter');
 		}
@@ -197,6 +199,7 @@ class D2LLabsFilterDropdown extends mixinBehaviors([LocalizeBehavior], PolymerEl
 	}
 
 	_localizeOrAlt(altText, ...args) {
+		if (!this.localize || !this.resources) return;
 		return altText ? altText : this.localize(...args);
 	}
 

package/components/localize-behavior.js

@@ -1,49 +1,8 @@
 import '@brightspace-ui/localize-behavior/d2l-localize-behavior.js';
-import ar from '../lang/ar.js';
-import cy from '../lang/cy.js';
-import da from '../lang/da.js';
-import de from '../lang/de.js';
-import en from '../lang/en.js';
-import es from '../lang/es.js';
-import eses from '../lang/es-es.js';
-import fr from '../lang/fr.js';
-import frfr from '../lang/fr-fr.js';
-import hi from '../lang/hi.js';
-import ja from '../lang/ja.js';
-import ko from '../lang/ko.js';
-import nl from '../lang/nl.js';
-import pt from '../lang/pt.js';
-import sv from '../lang/sv.js';
-import tr from '../lang/tr.js';
-import zhcn from '../lang/zh-cn.js';
-import zhtw from '../lang/zh-tw.js';
 
 const LocalizeBehaviorImpl = {
-	properties: {
-		resources: {
-			value: function() {
-				return {
-					'ar': ar,
-					'cy': cy,
-					'da': da,
-					'de': de,
-					'en': en,
-					'es': es,
-					'es-es': eses,
-					'fr': fr,
-					'fr-fr': frfr,
-					'hi': hi,
-					'ja': ja,
-					'ko': ko,
-					'nl': nl,
-					'pt': pt,
-					'sv': sv,
-					'tr': tr,
-					'zh-cn': zhcn,
-					'zh-tw': zhtw
-				};
-			}
-		}
+	localizeConfig: {
+		importFunc: async lang => (await import(`../lang/${lang}.js`)).default
 	}
 };
 

package/components/sort-by-dropdown/sort-by-dropdown.js

@@ -36,18 +36,14 @@ class LabsSortByDropdown extends mixinBehaviors(
 			*/
 			_selectedOptionText: {
 				type: String,
+				computed: '_computeSelectedOptionText(_text, localize, resources)'
 			},
 			/**
 			* The text of the currently selected option
 			*/
 			_text: {
 				type: String,
-				value: '',
-				observer: function(selection) {
-					this._selectedOptionText = this.compact
-						? this.localize('sort')
-						: this.localize('sortWithOption', 'option', selection);
-				}
+				value: ''
 			},
 
 			/**
@@ -143,6 +139,13 @@ class LabsSortByDropdown extends mixinBehaviors(
 			this._boundListeners._onItemSelect);
 	}
 
+	_computeSelectedOptionText(selection, localize, resources) {
+		if (!selection || !localize || !resources) return;
+		return this.compact
+			? this.localize('sort')
+			: this.localize('sortWithOption', 'option', selection);
+	}
+
 	_onItemSelect(e) {
 		this._text = e.target.text;
 		this.value = e.detail.value;

package/package.json

@@ -22,8 +22,7 @@
     "lint:style": "stylelint \"**/*.{js,html}\"",
     "start": "web-dev-server --node-resolve --watch --open --app-index demo/index.html",
     "test": "npm run lint && npm run test:headless",
-    "test:headless": "web-test-runner --group default",
-    "test:headless:watch": "web-test-runner --group default --watch"
+    "test:headless": "d2l-test-runner"
   },
   "author": "D2L Corporation",
   "license": "Apache-2.0",
@@ -31,20 +30,19 @@
     "@babel/core": "^7",
     "@babel/eslint-parser": "^7",
     "@brightspace-ui/stylelint-config": "^0.8",
-    "@open-wc/testing": "^3",
+    "@brightspace-ui/testing": "^1",
     "@web/dev-server": "^0.3",
-    "@web/test-runner": "^0.15",
     "eslint": "^8",
     "eslint-config-brightspace": "^0.25",
     "lit-analyzer": "^1",
     "stylelint": "^15"
   },
-  "version": "5.5.1",
+  "version": "5.6.0",
   "dependencies": {
+    "@brightspace-ui-labs/multi-select": "^6",
     "@brightspace-ui/core": "^2",
     "@brightspace-ui/localize-behavior": "^2",
-    "@brightspace-ui-labs/multi-select": "^6",
-    "lit": "^2",
-    "@polymer/polymer": "^3"
+    "@polymer/polymer": "^3",
+    "lit": "^2"
   }
 }