Merge pull request #107 from uvarov-frontend/fix/minified_js_file

Fix minified js file
uvarov-frontend · Sep 14, 2023 · 52957b7 · 52957b7
2 parents efac346 + 18bf724
commit 52957b7
Show file tree

Hide file tree

Showing 10 changed files with 1,698 additions and 28 deletions.
diff --git a/package.config.ts → config/assets.config.ts b/package.config.ts → config/assets.config.ts
@@ -2,7 +2,6 @@
 import { resolve } from 'path';
 import { defineConfig } from 'vite';
 import banner from 'vite-plugin-banner';
-import eslint from 'vite-plugin-eslint';
 
 export default defineConfig({
 	publicDir: './package/public',
@@ -11,12 +10,11 @@ export default defineConfig({
 		assetsDir: '',
 		outDir: './package/build',
 		cssCodeSplit: true,
-		minify: 'terser',
+		minify: true,
+		emptyOutDir: false,
 		rollupOptions: {
 			output: {
 				inlineDynamicImports: false,
-				format: 'cjs',
-				entryFileNames: '[name].min.js',
 				assetFileNames: (assetInfo) => {
 					if (assetInfo.name && ['light.css', 'dark.css'].includes(assetInfo.name)) {
 						return 'themes/[name].min.[ext]';
@@ -25,9 +23,9 @@ export default defineConfig({
 				},
 			},
 			input: {
-				light: resolve(__dirname, './package/src/styles/themes/light.css'),
-				dark: resolve(__dirname, './package/src/styles/themes/dark.css'),
-				'vanilla-calendar': resolve(__dirname, './package/src/vanilla-calendar.ts'),
+				light: resolve(__dirname, '../package/src/styles/themes/light.css'),
+				dark: resolve(__dirname, '../package/src/styles/themes/dark.css'),
+				'vanilla-calendar': resolve(__dirname, '../package/src/styles/vanilla-calendar.css'),
 			},
 		},
 	},
@@ -36,6 +34,5 @@ export default defineConfig({
 			outDir: './package/build',
 			content: 'name: @uvarov.frontend/vanilla-calendar | url: https://github.com/uvarov-frontend/vanilla-calendar',
 		}),
-		eslint(),
 	],
 });
diff --git a/config/js.config.ts b/config/js.config.ts
@@ -0,0 +1,26 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+import banner from 'vite-plugin-banner';
+import eslint from 'vite-plugin-eslint';
+
+export default defineConfig({
+	build: {
+		target: 'ES6',
+		assetsDir: '',
+		outDir: './package/build',
+		minify: 'terser',
+		lib: {
+			name: 'VanillaCalendar',
+			fileName(format, entryName) { return `${entryName}.min${format === 'es' ? '.mjs' : '.js'}`; },
+			entry: resolve(__dirname, '../package/src/scripts/vanilla-calendar.ts'),
+		},
+	},
+	plugins: [
+		banner({
+			outDir: './package/build',
+			content: 'name: @uvarov.frontend/vanilla-calendar | url: https://github.com/uvarov-frontend/vanilla-calendar',
+		}),
+		eslint(),
+	],
+});
diff --git a/demo/main.ts b/demo/main.ts
@@ -2,8 +2,9 @@
 import '@/package/src/styles/vanilla-calendar.css';
 import '@/package/src/styles/themes/light.css';
 import '@/package/src/styles/themes/dark.css';
-import VanillaCalendar from '@/package/src/scripts/main';
-import { Options } from '@/package/src';
+// import VanillaCalendar from '@/package/build/vanilla-calendar.min';
+import VanillaCalendar from '@/package/src/scripts/vanilla-calendar';
+import IVanillaCalendar, { Options } from '@/package/src';
 
 const config: Options = {
 	settings: {
@@ -16,6 +17,6 @@ const config: Options = {
 
 document.addEventListener('DOMContentLoaded', () => {
 	// @ts-ignore: VanillaCalendar config
-	const calendar = new VanillaCalendar('#calendar', config);
+	const calendar: IVanillaCalendar<string, Options> = new VanillaCalendar('#calendar', config);
 	calendar.init();
 });
diff --git a/demo/pages/multiple/main.ts b/demo/pages/multiple/main.ts
@@ -2,8 +2,9 @@
 import '@/package/src/styles/vanilla-calendar.css';
 import '@/package/src/styles/themes/light.css';
 import '@/package/src/styles/themes/dark.css';
-import VanillaCalendar from '@/package/src/scripts/main';
-import { Options } from '@/package/src';
+// import VanillaCalendar from '@/package/build/vanilla-calendar.min';
+import VanillaCalendar from '@/package/src/scripts/vanilla-calendar';
+import IVanillaCalendar, { Options } from '@/package/src';
 
 const config: Options = {
 	type: 'multiple',
@@ -20,6 +21,6 @@ const config: Options = {
 
 document.addEventListener('DOMContentLoaded', () => {
 	// @ts-ignore: VanillaCalendar config
-	const calendar = new VanillaCalendar('#calendar', config);
+	const calendar: IVanillaCalendar<string, Options> = new VanillaCalendar('#calendar', config);
 	calendar.init();
 });
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
 		]
 	},
 	"scripts": {
-		"package": "tsc && vite build --config package.config.ts",
+		"package": "tsc && vite build --config config/js.config.ts && vite build --config config/assets.config.ts",
 		"build": "tsc && vite build",
 		"start": "tsc && vite",
 		"lint": "eslint --ext .js,.ts package/src cypress examples",

diff --git a/package/build/vanilla-calendar.min.js b/package/build/vanilla-calendar.min.js