feat(typescript): using tsup

package.json

@@ -50,6 +50,7 @@
     "@node-minify/run": "workspace:*",
     "@node-minify/sqwish": "workspace:*",
     "@node-minify/terser": "workspace:*",
+    "@node-minify/types": "workspace:*",
     "@node-minify/uglify-es": "workspace:*",
     "@node-minify/uglify-js": "workspace:*",
     "@node-minify/utils": "workspace:*",
@@ -65,6 +66,7 @@
     "node-notifier": "10.0.1",
     "prettier": "2.8.0",
     "rimraf": "3.0.2",
+    "tsup": "6.5.0",
     "typescript": "4.9.3",
     "vitest": "0.25.3"
   },

packages/babel-minify/package.json

@@ -18,20 +18,14 @@
     "lib": "dist",
     "test": "__tests__"
   },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/types/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/types/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      }
-    }
-  },
-  "types": "./dist/cjs/types/index.d.ts",
-  "main": "./dist/cjs/index.js",
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs",
+    "types": "./dist/index.d.ts"
+  },
   "files": [
     "dist/**/*"
   ],
@@ -47,8 +41,8 @@
   },
   "scripts": {
     "clean": "pnpm dlx rimraf dist",
-    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
-    "prepack": "npm run build"
+    "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@node-minify/utils": "workspace:*",

packages/clean-css/__tests__/clean-css.test.ts

@@ -4,11 +4,12 @@
  * MIT Licensed
  */
 
-import { afterAll, beforeAll, describe, expect, test } from 'vitest';
+import { describe, expect, test } from 'vitest';
 import minify from '../../core/src';
 import cleanCss from '../src';
 import { filesCSS } from '../../../tests/files-path';
 import { runOneTest, tests } from '../../../tests/fixtures';
+import { Options } from '../../../tests/types';
 
 const compressorLabel = 'clean-css';
 const compressor = cleanCss;
@@ -20,21 +21,21 @@ describe('Package: clean-css', () => {
   tests.commoncss.forEach(options => {
     runOneTest({ options, compressorLabel, compressor, sync: true });
   });
-  test('should compress with some options', () =>
-    new Promise(done => {
-      const options = {};
-      options.minify = {
-        compressor,
-        input: filesCSS.fileCSS,
-        output: filesCSS.fileCSSOut,
-        options: {
-          sourceMap: {
-            filename: filesCSS.fileCSSSourceMaps,
-            url: filesCSS.fileCSSSourceMaps
+  test('should compress with some options', (): Promise<void> =>
+    new Promise<void>(done => {
+      const options: Options = {
+        minify: {
+          compressor,
+          input: filesCSS.fileCSS,
+          output: filesCSS.fileCSSOut,
+          options: {
+            sourceMap: {
+              filename: filesCSS.fileCSSSourceMaps,
+              url: filesCSS.fileCSSSourceMaps
+            }
           }
         }
       };
-
       options.minify.callback = (err, min) => {
         expect(err).toBeNull();
         expect(min).not.toBeNull();

packages/clean-css/package.json

@@ -18,20 +18,14 @@
     "lib": "dist",
     "test": "__tests__"
   },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/types/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/types/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      }
-    }
-  },
-  "types": "./dist/cjs/types/index.d.ts",
-  "main": "./dist/cjs/index.js",
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs",
+    "types": "./dist/index.d.ts"
+  },
   "files": [
     "dist/**/*"
   ],
@@ -47,8 +41,8 @@
   },
   "scripts": {
     "clean": "pnpm dlx rimraf dist",
-    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
-    "prepack": "npm run build"
+    "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@node-minify/utils": "workspace:*",

packages/cli/__tests__/cli.test.ts

@@ -6,9 +6,10 @@
 
 import { afterAll, beforeAll, describe, expect, test, vi } from 'vitest';
 import childProcess from 'child_process';
+import { Settings } from '@node-minify/types';
 import * as cli from '../src';
 import { filesJS } from '../../../tests/files-path';
-import { TESTS_TIMEOUT } from '../../../constants';
+import { TESTS_TIMEOUT } from '../../../tests/constants';
 
 describe(
   'Package: cli',
@@ -39,7 +40,7 @@ describe(
     });
     test('should minify to throw with yui error', () => {
       const spy = vi.spyOn(cli, 'run');
-      const options = {
+      const options: Settings = {
         compressor: 'yui',
         input: filesJS.oneFile,
         output: filesJS.fileJSOut

packages/cli/package.json

@@ -20,20 +20,14 @@
     "lib": "dist",
     "test": "__tests__"
   },
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
   "exports": {
-    ".": {
-      "import": {
-        "types": "./dist/esm/types/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/types/index.d.ts",
-        "default": "./dist/cjs/index.js"
-      }
-    }
+    "require": "./dist/index.js",
+    "import": "./dist/index.mjs",
+    "types": "./dist/index.d.ts"
   },
-  "types": "./dist/cjs/types/index.d.ts",
-  "main": "./dist/cjs/index.js",
   "files": [
     "bin",
     "dist/**/*"
@@ -50,8 +44,8 @@
   },
   "scripts": {
     "clean": "pnpm dlx rimraf dist",
-    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
-    "prepack": "npm run build"
+    "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@node-minify/core": "workspace:*",

packages/cli/src/index.ts

@@ -10,7 +10,7 @@
 import chalk from 'chalk';
 import { compress } from './compress';
 import { spinnerStart, spinnerStop, spinnerError } from './spinner';
-import { Cli, Settings, Result } from '@node-minify/types';
+import { Settings, Result } from '@node-minify/types';
 
 // export interface Options {
 //   compressorLabel: string | Function;
@@ -46,15 +46,15 @@ let silence = false;
 /**
  * Run one compressor.
  */
-const runOne = (cli: Cli): Promise<Result> => {
+const runOne = (cli: Settings): Promise<Result> => {
   return new Promise<Result>((resolve, reject) => {
     const compressor =
       typeof cli.compressor === 'string' ? require(`@node-minify/${cli.compressor}`).default : cli.compressor;
 
     const options: Settings = {
       compressorLabel: cli.compressor,
       compressor,
-      input: cli.input.split(','),
+      input: typeof cli.input === 'string' ? cli.input.split(',') : '',
       output: cli.output
     };
 
@@ -85,7 +85,7 @@ const runOne = (cli: Cli): Promise<Result> => {
 /**
  * Run cli.
  */
-const run = (cli: Cli) => {
+const run = (cli: Settings) => {
   silence = !!cli.silence;
 
   if (!silence) {