Revamp builds

.config/rollup.config.mjs

@@ -39,50 +39,6 @@ var resolve_config = nodeResolve({
 });
 
 
-// esm & cjs
-const inputs = [
-	'tom-select.ts',
-	'tom-select.complete.ts',
-	'tom-select.popular.ts',
-	'utils.ts',
-];
-
-inputs.forEach((slug)=>{
-
-	let input = path.resolve(__dirname,'../src',slug)
-
-	// esm
-	configs.push({
-		input: input,
-		output:{
-			//file: path.resolve(__dirname,'../build/esm',slug),
-			dir: path.resolve(__dirname,'../build/esm'),
-			format: 'esm',
-			preserveModules: false,
-			sourcemap: true,
-			banner: banner,
-		},
-		plugins:[babel_config,resolve_config,],
-	});
-
-	// cjs
-	configs.push({
-		input: input,
-		output:{
-			dir: path.resolve(__dirname,'../build/cjs'),
-			format: 'cjs',
-			preserveModules: false,
-			sourcemap: true,
-			banner: banner,
-			exports: "auto",
-		},
-		plugins:[babel_config,resolve_config],
-	});
-
-});
-
-
-
 var terser_config = terser({
   mangle: true,
   //toplevel: true, // removes tomSelect footer
@@ -128,7 +84,7 @@ function configCore( input, filename, plugins ){
 
 	var output = {
 		name: 'TomSelect',
-		file: `build/js/${filename}`,
+		file: `dist/js/${filename}`,
 		footer: 'var tomSelect=function(el,opts){return new TomSelect(el,opts);} ',
 	};
 
@@ -156,15 +112,15 @@ var plugin_dir = path.resolve(__dirname,'../src/plugins');
 var files = fs.readdirSync( plugin_dir );
 files.map(function(file){
 	let input	= path.resolve(__dirname,'../src/plugins',file,'plugin.ts');
-	let output	= {file:`build/js/plugins/${file}.js`,'name':file};
+	let output	= {file:`dist/js/plugins/${file}.js`,'name':file};
 	pluginConfig( input, output);
 
 
 	// esm
 	configs.push({
 		input: input,
 		output:{
-			file: path.resolve(__dirname,'../build/esm/plugins',file,'plugin.js'),
+			file: path.resolve(__dirname,'../dist/esm/plugins',file,'plugin.js'),
 			format: 'esm',
 			preserveModules: false,
 			sourcemap: true,

.config/tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"module": "CommonJS",
+		"moduleResolution": "Node",
+		"outDir": "../dist/cjs"
+	}
+}

.config/tsconfig.esm.json

@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"module": "NodeNext",
+		"outDir": "../dist/esm"
+	}
+}

.config/tsconfig.json

@@ -5,23 +5,19 @@
 		"checkJs": true,
 		"strict": true,
 		"target": "ES6",
-		"module": "esnext",
-		"noUnusedLocals": true,
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
 		"alwaysStrict": true,
-	    "strictNullChecks": true,
-	    "noImplicitReturns": true,
-	    "noUnusedLocals": true,
-	    "allowUnreachableCode": false,
-	    "noUncheckedIndexedAccess": true,
-
-		"lib": [
-	      "ESNext",
-	      "dom"
-	    ],
-
+		"strictNullChecks": true,
+		"noImplicitReturns": true,
+		"noUnusedLocals": true,
+		"allowUnreachableCode": false,
+		"noUncheckedIndexedAccess": true,
 		"declaration": true,
-		"declarationDir": "../dist/types",
 		"isolatedModules": true,
-		"moduleResolution": "node"
+		"sourceMap": true,
+		"rewriteRelativeImportExtensions": true,
+
+		"lib": ["ESNext", "dom"],
 	},
 }

.config/tsconfig.types.json

@@ -0,0 +1,11 @@
+{
+	// This exists for backwards compatibility. In the wild, folks are importing
+	// paths like `tom-select/dist/types/...`.
+	//
+	// Consider removing this in the next major version.
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "../dist/types",
+		"emitDeclarationOnly": true
+	}
+}

.editorconfig

@@ -2,6 +2,14 @@
 indent_style = tab
 tab_width = 4
 
+[package.json]
+indent_style = space
+indent_size = 2
+
+[.github/workflows/*]
+indent_style = space
+indent_size = 2
+
 [*.yml]
 indent_style = space
-indent_size = 2
+indent_size = 2

.github/workflows/ci.yaml

@@ -0,0 +1,27 @@
+name: Node.js CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: ['18.x', '20.x', '22.x']
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm ci
+      - run: npm run build
+      - run: npm run test
+      - run: npm run test:types
+      - run: npm run stylelint

.gitignore

@@ -1,9 +1,9 @@
 .DS_Store
+.vscode
 .DAV
 node_modules
 *.log
 *.tmp.*
-package-lock.json
 *.lock
 build/*
 build-docs/*

.husky/pre-commit

@@ -1,5 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run test:typescript
+npm run build:types
 npm run stylelint

Gruntfile.js → Gruntfile.cjs

@@ -149,7 +149,7 @@ module.exports = function(grunt) {
 	var matched_files = grunt.file.expand(['src/plugins/*/plugin.scss']);
 	for (var i = 0, n = matched_files.length; i < n; i++) {
 		var plugin_name = matched_files[i].match(/src\/plugins\/(.+?)\//)[1];
-		scss_plugin_files.push({src: matched_files[i], dest: 'build/scss/plugins/' + plugin_name + '.scss'});
+		scss_plugin_files.push({src: matched_files[i], dest: 'dist/scss/plugins/' + plugin_name + '.scss'});
 	}
 
 
@@ -177,22 +177,22 @@ module.exports = function(grunt) {
 	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
 
-		// delete old build files
+		// delete old files
 		clean: {
-			library: ['build/scss/*','build/js/*','build/esm/*','build/css/*','build/cjs/*'],
+			library: ['dist/*'],
 			builddocs: ['build-docs/*']
 		},
 
 		// copy scss files to build folder
 		copy: {
 			scss:{
 				files: [{
-					'build/scss/tom-select.scss': ['src/scss/tom-select.scss'],
-					'build/scss/tom-select.default.scss': ['src/scss/tom-select.default.scss'],
-					'build/scss/tom-select.bootstrap4.scss': ['src/scss/tom-select.bootstrap4.scss'],
-					'build/scss/tom-select.bootstrap5.scss': ['src/scss/tom-select.bootstrap5.scss'],
-					'build/scss/_dropdown.scss': ['src/scss/_dropdown.scss'],
-					'build/scss/_items.scss': ['src/scss/_items.scss'],
+					'dist/scss/tom-select.scss': ['src/scss/tom-select.scss'],
+					'dist/scss/tom-select.default.scss': ['src/scss/tom-select.default.scss'],
+					'dist/scss/tom-select.bootstrap4.scss': ['src/scss/tom-select.bootstrap4.scss'],
+					'dist/scss/tom-select.bootstrap5.scss': ['src/scss/tom-select.bootstrap5.scss'],
+					'dist/scss/_dropdown.scss': ['src/scss/_dropdown.scss'],
+					'dist/scss/_items.scss': ['src/scss/_items.scss'],
 				}]
 			},
 			scss_plugins:{
@@ -206,8 +206,8 @@ module.exports = function(grunt) {
 			css_post: {
 				options: version_replace_options,
 				files: [
-					{expand: true, flatten: false, src: ['build/css/*.css'], dest: ''},
-					{expand: true, flatten: false, src: ['build/scss/*.scss'], dest: ''},
+					{expand: true, flatten: false, src: ['dist/css/*.css'], dest: ''},
+					{expand: true, flatten: false, src: ['dist/scss/*.scss'], dest: ''},
 				]
 			},
 			builddocs:{
@@ -219,7 +219,7 @@ module.exports = function(grunt) {
 			},
 			scss_plugin_paths: {
 				options: scss_plugin_path_replace_options,
-				files: [{expand: true, flatten: false, src: ['build/scss/tom-select.scss'], dest: ''}]
+				files: [{expand: true, flatten: false, src: ['dist/scss/tom-select.scss'], dest: ''}]
 			},
 		},
 
@@ -232,10 +232,10 @@ module.exports = function(grunt) {
 			},
 			build: {
 				files: [{
-					'build/css/tom-select.css': ['src/scss/tom-select.scss'],
-					'build/css/tom-select.default.css': ['src/scss/tom-select.default.scss'],
-					'build/css/tom-select.bootstrap4.css': ['src/scss/-tom-select.bootstrap4.scss'],
-					'build/css/tom-select.bootstrap5.css': ['src/scss/-tom-select.bootstrap5.scss'],
+					'dist/css/tom-select.css': ['src/scss/tom-select.scss'],
+					'dist/css/tom-select.default.css': ['src/scss/tom-select.default.scss'],
+					'dist/css/tom-select.bootstrap4.css': ['src/scss/-tom-select.bootstrap4.scss'],
+					'dist/css/tom-select.bootstrap5.css': ['src/scss/-tom-select.bootstrap5.scss'],
 				}]
 			},
 			builddocs: {
@@ -261,7 +261,7 @@ module.exports = function(grunt) {
 						autoprefixer,
 					]
 				},
-				files: [{expand: true, flatten: false, src: ['build/css/*.css'], dest: ''}],
+				files: [{expand: true, flatten: false, src: ['dist/css/*.css'], dest: ''}],
 			},
 			min: {
 				options: {
@@ -273,10 +273,10 @@ module.exports = function(grunt) {
 					]
 				},
 				files: [{
-					'build/css/tom-select.min.css': ['build/css/tom-select.css'],
-					'build/css/tom-select.default.min.css': ['build/css/tom-select.default.css'],
-					'build/css/tom-select.bootstrap4.min.css': ['build/css/tom-select.bootstrap4.css'],
-					'build/css/tom-select.bootstrap5.min.css': ['build/css/tom-select.bootstrap5.css'],
+					'dist/css/tom-select.min.css': ['dist/css/tom-select.css'],
+					'dist/css/tom-select.default.min.css': ['dist/css/tom-select.default.css'],
+					'dist/css/tom-select.bootstrap4.min.css': ['dist/css/tom-select.bootstrap4.css'],
+					'dist/css/tom-select.bootstrap5.min.css': ['dist/css/tom-select.bootstrap5.css'],
 				}]
 			},
 			builddocs:{
@@ -316,7 +316,7 @@ module.exports = function(grunt) {
 				command: 'npx rollup -c .config/rollup.docs.mjs',
 			},
 			buildjs: {
-				command: 'npx rollup -c .config/rollup.config.mjs',
+				command: 'npm run build:js',
 			},
 		},
 

doc_src/pages/docs/plugins.md

@@ -49,9 +49,9 @@ If you don't need any plugins, or want to load plugins individually, use <code>t
 Add plugins to your project by including their js files and calling `TomSelect.define`.
 
 ```js
-import TomSelect from 'tom-select/dist/js/tom-select.base.js';
-import TomSelect_remove_button from 'tom-select/dist/js/plugins/remove_button.js';
-import TomSelect_dropdown_header from 'tom-select/dist/js/plugins/dropdown_header.js';
+import TomSelect from 'tom-select/base';
+import TomSelect_remove_button from 'tom-select/plugins/remove_button.js';
+import TomSelect_dropdown_header from 'tom-select/dropdown_header.js';
 
 TomSelect.define('remove_button', TomSelect_remove_button);
 TomSelect.define('dropdown_header', TomSelect_dropdown_header);
@@ -60,10 +60,10 @@ TomSelect.define('dropdown_header', TomSelect_dropdown_header);
 Alternatively you can `require` plugins directly if your build tool supports it.
 
 ```js
-import TomSelect from 'tom-select/dist/js/tom-select.base.js';
+import TomSelect from 'tom-select/base';
 
-TomSelect.define('remove_button', require('tom-select/dist/js/plugins/remove_button.js'));
-TomSelect.define('dropdown_header', require('tom-select/dist/js/plugins/dropdown_header.js'));
+TomSelect.define('remove_button', require('tom-select/plugins/remove_button.js'));
+TomSelect.define('dropdown_header', require('tom-select/plugins/dropdown_header.js'));
 ```