feat(typescript): update

.eslintrc

@@ -3,7 +3,7 @@
     "node": true,
     "es6": true
   },
-  "plugins": ["@typescript-eslint", "prettier"],
+  "plugins": ["prettier"],
   "extends": ["eslint:recommended", "prettier"],
   "rules": {
     "prettier/prettier": [

package.json

@@ -5,7 +5,7 @@
   "author": {
     "name": "Rodolphe Stoclin",
     "email": "rodolphe@2clics.net",
-    "url": "http://2clics.net"
+    "url": "https://www.2clics.net"
   },
   "license": "MIT",
   "private": true,
@@ -19,15 +19,16 @@
   "packageManager": "pnpm@7.18.0",
   "scripts": {
     "build": "lerna run build",
-    "clean:build": "pnpm dlx rimraf packages/*/lib",
+    "clean": "pnpm clean:build; pnpm clean:packages",
+    "clean:build": "pnpm dlx rimraf packages/*/dist",
     "clean:packages": "pnpm lerna clean -y",
     "clean:test": "pnpm dlx rimraf tests/tmp/*.{js,js.map,css,html}",
     "coverage": "vitest run --coverage",
     "eslint": "eslint --ignore-path .gitignore packages",
     "lerna": "lerna",
-    "lint": "npm run eslint || true",
-    "postcoverage": "npm run clean:test",
-    "pretest": "npm run build && npm run eslint",
+    "lint": "pnpm eslint || true",
+    "postcoverage": "pnpm clean:test",
+    "pretest": "pnpm build; pnpm eslint",
     "publish-latest": "NPM_CONFIG_OTP=xxx pnpm lerna publish --tag-version-prefix ''",
     "publish-next": "NPM_CONFIG_OTP=xxx pnpm lerna publish --tag-version-prefix '' --preid beta --npm-tag next",
     "prettier-project": "prettier --write './packages/**/{bin,src,__tests__}/**/*.js'",
@@ -54,7 +55,6 @@
     "@node-minify/utils": "workspace:*",
     "@node-minify/yui": "workspace:*",
     "@types/node": "18.11.10",
-    "@typescript-eslint/eslint-plugin": "5.45.1",
     "@vitest/coverage-c8": "0.25.3",
     "eslint": "8.29.0",
     "eslint-config-prettier": "8.5.0",
@@ -69,7 +69,7 @@
     "vitest": "0.25.3"
   },
   "lint-staged": {
-    "*.js": [
+    "*.ts": [
       "prettier --write",
       "git add"
     ]

packages/babel-minify/package.json

@@ -15,25 +15,25 @@
     "node": ">=14.0.0"
   },
   "directories": {
-    "lib": "lib",
+    "lib": "dist",
     "test": "__tests__"
   },
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/esm/types/index.d.ts",
-        "default": "./lib/esm/index.mjs"
+        "types": "./dist/esm/types/index.d.ts",
+        "default": "./dist/esm/index.js"
       },
       "require": {
-        "types": "./lib/cjs/types/index.d.ts",
-        "default": "./lib/cjs/index.js"
+        "types": "./dist/cjs/types/index.d.ts",
+        "default": "./dist/cjs/index.js"
       }
     }
   },
-  "types": "./lib/cjs/types/index.d.ts",
-  "main": "./lib/cjs/index.js",
+  "types": "./dist/cjs/types/index.d.ts",
+  "main": "./dist/cjs/index.js",
   "files": [
-    "lib/**/*"
+    "dist/**/*"
   ],
   "publishConfig": {
     "access": "public"
@@ -46,18 +46,17 @@
     "url": "https://github.com/srod/node-minify/issues"
   },
   "scripts": {
-    "clean": "pnpm dlx rimraf lib",
-    "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc -p ./tsconfig.esm.json && mv lib/esm/index.js lib/esm/index.mjs",
-    "build:cjs": "tsc -p ./tsconfig.cjs.json",
+    "clean": "pnpm dlx rimraf dist",
+    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@node-minify/utils": "^7.0.0",
+    "@node-minify/utils": "workspace:*",
     "babel-core": "6.26.3",
     "babel-preset-minify": "0.5.2"
   },
   "devDependencies": {
+    "@node-minify/types": "workspace:*",
     "@types/babel-core": "^6.25.7",
     "babel-preset-env": "1.7.0"
   }

packages/babel-minify/src/index.ts

@@ -10,7 +10,7 @@
 import { transform } from 'babel-core';
 import minify from 'babel-preset-minify';
 import { utils } from '@node-minify/utils';
-import { Options, Settings, MinifierOptions } from '../../../types';
+import { MinifierOptions } from '@node-minify/types';
 
 // interface Options {
 //   sourceMap?: boolean;
@@ -48,11 +48,11 @@ const minifyBabel = ({ settings, content, callback, index }: MinifierOptions) =>
     presets: []
   };
 
-  if (settings.options.babelrc) {
+  if (settings && settings.options && settings.options.babelrc) {
     babelOptions = JSON.parse(utils.readFile(settings.options.babelrc));
   }
 
-  if (settings.options.presets) {
+  if (settings && settings.options && settings.options.presets) {
     const babelrcPresets = babelOptions.presets || [];
     babelOptions.presets = babelrcPresets.concat(settings.options.presets);
   }
@@ -61,8 +61,8 @@ const minifyBabel = ({ settings, content, callback, index }: MinifierOptions) =>
     babelOptions.presets = babelOptions.presets.concat([minify]);
   }
 
-  const contentMinified = transform(content, babelOptions);
-  if (!settings.content) {
+  const contentMinified = transform(content || '', babelOptions);
+  if (settings && !settings.content) {
     utils.writeFile({ file: settings.output, content: contentMinified.code, index });
   }
   if (callback) {

packages/babel-minify/tsconfig-cjs.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist/cjs",
+    "target": "es2015"
+  },
+  "include": ["./src"]
+}

packages/babel-minify/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "outDir": "dist/esm",
+    "target": "esnext"
+  },
+  "include": ["./src"]
+}

packages/clean-css/package.json

@@ -15,25 +15,25 @@
     "node": ">=14.0.0"
   },
   "directories": {
-    "lib": "lib",
+    "lib": "dist",
     "test": "__tests__"
   },
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/esm/types/index.d.ts",
-        "default": "./lib/esm/index.mjs"
+        "types": "./dist/esm/types/index.d.ts",
+        "default": "./dist/esm/index.js"
       },
       "require": {
-        "types": "./lib/cjs/types/index.d.ts",
-        "default": "./lib/cjs/index.js"
+        "types": "./dist/cjs/types/index.d.ts",
+        "default": "./dist/cjs/index.js"
       }
     }
   },
-  "types": "./lib/cjs/types/index.d.ts",
-  "main": "./lib/cjs/index.js",
+  "types": "./dist/cjs/types/index.d.ts",
+  "main": "./dist/cjs/index.js",
   "files": [
-    "lib/**/*"
+    "dist/**/*"
   ],
   "publishConfig": {
     "access": "public"
@@ -46,17 +46,16 @@
     "url": "https://github.com/srod/node-minify/issues"
   },
   "scripts": {
-    "clean": "pnpm dlx rimraf lib",
-    "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc -p ./tsconfig.esm.json && mv lib/esm/index.js lib/esm/index.mjs",
-    "build:cjs": "tsc -p ./tsconfig.cjs.json",
+    "clean": "pnpm dlx rimraf dist",
+    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@node-minify/utils": "^7.0.0",
+    "@node-minify/utils": "workspace:*",
     "clean-css": "5.3.1"
   },
   "devDependencies": {
+    "@node-minify/types": "workspace:*",
     "@types/clean-css": "^4.2.6"
   }
 }

packages/clean-css/src/index.ts

@@ -9,7 +9,7 @@
  */
 import CleanCSS from 'clean-css';
 import { utils } from '@node-minify/utils';
-import { Options, Settings, MinifierOptions } from '../../../types';
+import { MinifierOptions } from '@node-minify/types';
 
 // interface Options {
 //   sourceMap?: boolean;
@@ -37,13 +37,13 @@ import { Options, Settings, MinifierOptions } from '../../../types';
  * @param {Function} callback
  */
 const minifyCleanCSS = ({ settings, content, callback, index }: MinifierOptions) => {
-  if (settings.options.sourceMap) {
+  if (settings && settings.options && settings.options.sourceMap) {
     settings.options._sourceMap = settings.options.sourceMap;
     settings.options.sourceMap = true;
   }
-  const _cleanCSS = new CleanCSS(settings.options).minify(content);
+  const _cleanCSS = new CleanCSS(settings && settings.options).minify(content || '');
   const contentMinified = _cleanCSS.styles;
-  if (_cleanCSS.sourceMap && settings.options._sourceMap) {
+  if (_cleanCSS.sourceMap && settings && settings.options && settings.options._sourceMap) {
     utils.writeFile({
       file:
         settings.options._sourceMap !== true && settings.options._sourceMap.url
@@ -53,7 +53,7 @@ const minifyCleanCSS = ({ settings, content, callback, index }: MinifierOptions)
       index
     });
   }
-  if (!settings.content) {
+  if (settings && !settings.content) {
     utils.writeFile({ file: settings.output, content: contentMinified, index });
   }
   if (callback) {

packages/clean-css/tsconfig-cjs.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist/cjs",
+    "target": "es2015"
+  },
+  "include": ["./src"]
+}

packages/clean-css/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "outDir": "dist/esm",
+    "target": "esnext"
+  },
+  "include": ["./src"]
+}

packages/cli/package.json

@@ -17,26 +17,26 @@
     "node": ">=14.0.0"
   },
   "directories": {
-    "lib": "lib",
+    "lib": "dist",
     "test": "__tests__"
   },
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/esm/types/index.d.ts",
-        "default": "./lib/esm/index.mjs"
+        "types": "./dist/esm/types/index.d.ts",
+        "default": "./dist/esm/index.js"
       },
       "require": {
-        "types": "./lib/cjs/types/index.d.ts",
-        "default": "./lib/cjs/index.js"
+        "types": "./dist/cjs/types/index.d.ts",
+        "default": "./dist/cjs/index.js"
       }
     }
   },
-  "types": "./lib/cjs/types/index.d.ts",
-  "main": "./lib/cjs/index.js",
+  "types": "./dist/cjs/types/index.d.ts",
+  "main": "./dist/cjs/index.js",
   "files": [
     "bin",
-    "lib/**/*"
+    "dist/**/*"
   ],
   "publishConfig": {
     "access": "public"
@@ -49,21 +49,20 @@
     "url": "https://github.com/srod/node-minify/issues"
   },
   "scripts": {
-    "clean": "pnpm dlx rimraf lib",
-    "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc -p ./tsconfig.esm.json && mv lib/esm/index.js lib/esm/index.mjs",
-    "build:cjs": "tsc -p ./tsconfig.cjs.json",
+    "clean": "pnpm dlx rimraf dist",
+    "build": "npm run clean && tsc -p tsconfig.json && tsc -p tsconfig-cjs.json",
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@node-minify/core": "^7.0.0",
-    "@node-minify/utils": "^7.0.0",
+    "@node-minify/core": "workspace:*",
+    "@node-minify/utils": "workspace:*",
     "chalk": "4.1.2",
     "commander": "9.4.1",
     "ora": "5.4.1",
     "update-notifier": "6.0.2"
   },
   "devDependencies": {
+    "@node-minify/types": "workspace:*",
     "@types/chalk": "^2.2.0",
     "@types/ora": "^3.2.0"
   }

packages/cli/src/compress.ts

@@ -9,10 +9,7 @@
  */
 import minify from '@node-minify/core';
 import { utils } from '@node-minify/utils';
-// import { Options, Result } from './index';
-import { Settings, Result } from '../../../types';
-// import { Settings } from '../../core';
-// import { Result } from './index';
+import { Settings, Result } from '@node-minify/types';
 
 /**
  * Run compression.