Revert border none

.config/karma.conf.js

@@ -1,185 +1,186 @@
-module.exports = function(config) {
-
-	var customLaunchers = {};
-
-	if (process.env.TARGET === 'browserstack') {
-
+module.exports = function (config) {
+	let customLaunchers = {
+		HeadlessFirefox: {
+			base: "Firefox",
+			flags: ["-headless"],
+		},
+		HeadlessChrome: {
+			base: "ChromeHeadless",
+			flags: [
+				"--disable-translate",
+				"--disable-extensions",
+				"--remote-debugging-port=9223",
+			],
+		},
+	};
+	if (process.env.TARGET === "browserstack") {
 		// define browsers
 		// https://www.browserstack.com/automate/capabilities
 		customLaunchers = {
-
 			// ios
-			bs_ios_ffox:{
-				base: 'BrowserStack',
-				os : 'OS X',
-				os_version : 'Catalina',
-				browser : 'Firefox',
-				browser_version : 'latest',
+			bs_ios_ffox: {
+				base: "BrowserStack",
+				os: "OS X",
+				os_version: "Catalina",
+				browser: "Firefox",
+				browser_version: "latest",
 			},
 
-			bs_ios_safari14:{
-				base: 'BrowserStack',
-				os : 'OS X',
-				os_version : 'Big Sur',
-				browser : 'Safari',
-				browser_version : 'latest',
+			bs_ios_safari14: {
+				base: "BrowserStack",
+				os: "OS X",
+				os_version: "Big Sur",
+				browser: "Safari",
+				browser_version: "latest",
 			},
 
-			bs_ios_safari13:{
-				base: 'BrowserStack',
-				os : 'OS X',
-				os_version : 'Catalina',
-				browser : 'Safari',
-				browser_version : 'latest',
+			bs_ios_safari13: {
+				base: "BrowserStack",
+				os: "OS X",
+				os_version: "Catalina",
+				browser: "Safari",
+				browser_version: "latest",
 			},
 
-			bs_ios_safari12:{
-				base: 'BrowserStack',
-				os : 'OS X',
-				os_version : 'Mojave',
-				browser : 'Safari',
-				browser_version : 'latest',
+			bs_ios_safari12: {
+				base: "BrowserStack",
+				os: "OS X",
+				os_version: "Mojave",
+				browser: "Safari",
+				browser_version: "latest",
 			},
 
-			iphone11:{
-				base: 'BrowserStack',
-				os: 'iOS',
-				os_version: '14',
-				device: 'iPhone 11',
-				browser: 'iPhone',
-				real_mobile: 'true',
+			iphone11: {
+				base: "BrowserStack",
+				os: "iOS",
+				os_version: "14",
+				device: "iPhone 11",
+				browser: "iPhone",
+				real_mobile: "true",
 			},
 
-
 			// win
-			bs_win10_edge:{
-				base: 'BrowserStack',
-				os : 'Windows',
-				os_version : '10',
-				browser : 'Edge',
-				browser_version : 'latest',
+			bs_win10_edge: {
+				base: "BrowserStack",
+				os: "Windows",
+				os_version: "10",
+				browser: "Edge",
+				browser_version: "latest",
 			},
 
-			bs_win7_edge:{
-				base: 'BrowserStack',
-				os : 'Windows',
-				os_version : '7',
-				browser : 'Edge',
-				browser_version : '80.0',
+			bs_win7_edge: {
+				base: "BrowserStack",
+				os: "Windows",
+				os_version: "7",
+				browser: "Edge",
+				browser_version: "80.0",
 			},
 
-			bs_win10_chrome:{
-				base: 'BrowserStack',
-				os : 'Windows',
-				os_version : '10',
-				browser : 'Chrome',
-				browser_version : 'latest',
+			bs_win10_chrome: {
+				base: "BrowserStack",
+				os: "Windows",
+				os_version: "10",
+				browser: "Chrome",
+				browser_version: "latest",
 			},
 
 			// android
-			bs_android:{
-				base: 'BrowserStack',
-				os : 'Android',
-				os_version : '10.0',
-				device : 'Samsung Galaxy S20',
-				real_mobile : 'true',
-				browser : 'Android',
+			bs_android: {
+				base: "BrowserStack",
+				os: "Android",
+				os_version: "10.0",
+				device: "Samsung Galaxy S20",
+				real_mobile: "true",
+				browser: "Android",
 			},
-
-
 		};
-
-	}else{
-		customLaunchers['HeadlessFirefox'] = {
-										base: 'Firefox',
-										flags: [
-											'-headless',
-										]
-									};
-
-		customLaunchers['HeadlessChrome'] = {
-										base: 'ChromeHeadless',
-										flags: [
-											'--disable-translate',
-											'--disable-extensions',
-											'--remote-debugging-port=9223'
-										]
-									};
 	}
 
-	var targets = {
-		'browserstack': Object.keys(customLaunchers),
-		'HeadlessFirefox': ['HeadlessFirefox'],
-		'HeadlessChrome': ['HeadlessChrome']
+	const targets = {
+		browserstack: Object.keys(customLaunchers),
+		HeadlessFirefox: ["HeadlessFirefox"],
+		HeadlessChrome: ["HeadlessChrome"],
 	};
 
-	var reporters = ['mocha','coverage','aChecker'];
-	if( process.env.TRAVIS_CI ){
-		reporters = ['mocha', 'coverage', 'coveralls','aChecker']
+	const reporters = [
+		"mocha",
+		"coverage",
+		// "aChecker"
+	];
+	if (process.env.TRAVIS_CI) {
+		reporters.push("coveralls");
 	}
 
-	var target = process.env.TARGET;
-	if( !target ){
-		target = 'HeadlessChrome';
-		process.env.CHROME_BIN = require('puppeteer').executablePath();
-	}
-
-
-	var browsers = targets[target];
-	if( process.env.BROWSERS ){
-		browsers = process.env.BROWSERS.split(',');
+	const target = process.env.TARGET || "HeadlessChrome";
+	if (target === "HeadlessChrome") {
+		process.env.CHROME_BIN = require("puppeteer").executablePath();
 	}
 
+	const browsers = process.env.BROWSERS
+		? process.env.BROWSERS.split(",")
+		: targets[target];
 
-	config.set({
-		basePath: '../',
-		frameworks: ['mocha', 'chai','aChecker'],
+	const builtConfig = {
+		browsers,
+		reporters,
+		basePath: "../",
+		customLaunchers: customLaunchers,
+		colors: true,
+		logLevel: config.LOG_INFO,
+		singleRun: true,
+		browserDisconnectTolerance: 3,
+		browserDisconnectTimeout: 15000,
+		browserNoActivityTimeout: 120000,
+		concurrency: 3,
+		plugins: [
+			require("karma-coverage"),
+			"karma-mocha-reporter",
+			"karma-mocha",
+			require("karma-chai"),
+			require("karma-firefox-launcher"),
+			require("karma-chrome-launcher"),
+			"karma-sourcemap-loader",
+		],
+		frameworks: [
+			"mocha",
+			"chai",
+			// "aChecker"
+		],
 		files: [
 			{
-				pattern: 'test/tests/esm-module.js',
-				type: 'module',
+				pattern: "test/tests/esm-module.js",
+				type: "module",
 				included: true,
 			},
 
-			'build/js/tom-select.complete.js',
-			'node_modules/syn/dist/global/syn.js',
-			'node_modules/jquery/dist/jquery.js',
-			'build/css/tom-select.default.css',
-			'test/support/*.js',
-			config.test_one ? 'test/tests/interaction.js' : 'test/tests/**/*.js',
+			"build/js/tom-select.complete.js",
+			"node_modules/syn/dist/global/syn.js",
+			"node_modules/jquery/dist/jquery.js",
+			"build/css/tom-select.default.css",
+			"test/support/*.js",
+			config.test_one
+				? "test/tests/interaction.js"
+				: "test/tests/**/*.js",
 
 			{
-				pattern: 'build/**/*',
+				pattern: "build/**/*",
 				included: false,
 			},
-
 		],
 		preprocessors: {
-			'build/**/*.js': ['sourcemap','coverage'],
+			"build/**/*.js": ["sourcemap", "coverage"],
 		},
 		coverageReporter: {
-			reporters:[
-				{type: 'lcov'},
-				{type: 'text-summary'},
-
-			],
-			dir: 'coverage/'
+			reporters: [{ type: "lcov" }, { type: "text-summary" }],
+			dir: "coverage/",
 		},
 		browserStack: {
 			tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
 			build: process.env.TRAVIS_BUILD_NUMBER,
-			project: process.env.TRAVIS_CI ? 'tom-select': '',
-			name:  process.env.TRAVIS_CI ? 'tom-select': '',
+			project: process.env.TRAVIS_CI ? "tom-select" : "",
+			name: process.env.TRAVIS_CI ? "tom-select" : "",
 		},
-		customLaunchers: customLaunchers,
-		reporters: reporters,
-		colors: true,
-		logLevel: config.LOG_INFO,
-		browsers: browsers,
-		singleRun: true,
-		browserDisconnectTolerance: 3,
-		browserDisconnectTimeout: 15000,
-		browserNoActivityTimeout: 120000,
-		concurrency: 3,
-	});
+	};
+
+	config.set(builtConfig);
 };

.github/workflows/stylelint.yml

@@ -0,0 +1,34 @@
+name: StyleLint
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - main
+
+jobs:
+  prettier:
+    name: StyleLint Check Action
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Setup Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: '16.x'
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+    - uses: actions/cache@v1
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+    - name: Yarn install
+      run: yarn
+    - name: Run Stylelint Check
+      run: yarn stylelint

.gitignore

@@ -3,7 +3,6 @@
 node_modules
 *.log
 *.tmp.*
-package-lock.json
 *.lock
 build/*
 build-docs/*
@@ -14,3 +13,5 @@ coverage/
 stats/
 src/tom-select.custom.ts
 dist
+/vendor/
+/.idea/

.stylelintrc.json

@@ -0,0 +1,12 @@
+{
+  "extends": [
+    "stylelint-config-standard-scss",
+    "stylelint-config-prettier-scss"
+  ],
+
+  "rules": {
+    "selector-class-pattern": null,
+    "scss/no-global-function-names": null,
+    "scss/dollar-variable-pattern": null
+  }
+}

CHANGELOG

@@ -0,0 +1,10 @@
+Version 2.2.23 (17 July 2023)
+=============================
+ - Merge [PR #534](https://github.com/orchidjs/tom-select/pull/534) from original repo.
+   - Fix SCSS Warnings - from @MatthewKennedy
+ - Merge [PR #601](https://github.com/orchidjs/tom-select/pull/601) from original repo.
+   - Adapt Bootstrap 5 SCSS for Bootstrap 5.3+ = from @czj
+ - Update syntax to allow SASS to compile properly from @Robert430404
+ - Refactored the karma configs to properly load plugins locally from @Robert430404
+ - Added package lock to pin the versions of packages from @Robert430404
+ - Disabled a11y tests due to non-conformance from @Robert430404