Fix cpy and esm support (#49)

* bump all packages and fix esm support

* 1.8.9

* update readme

Author: a7ul

README.md

@@ -106,6 +106,8 @@ By default esbuild-node-tsc should work out of the box for your project since it
 
 But if things are not working as expected you can configure esbuild-node-tsc by adding `etsc.config.js` along side tsconfig.json.
 
+> You might need to install `esbuild-plugin-tsc` package too to use the esbuild tsc plugin
+
 Example `etsc.config.js`
 
 ```js
@@ -126,6 +128,26 @@ module.exports = {
 };
 ```
 
+or if you use ESM in your project then use
+
+```js
+import esbuildPluginTsc from "esbuild-plugin-tsc";
+
+export default {
+  outDir: "./dist",
+  esbuild: {
+    minify: false,
+    target: "es2015",
+    plugins: [esbuildPluginTsc()],
+  },
+  assets: {
+    baseDir: "src",
+    outDir: "./dist",
+    filePatterns: ["**/*.json"],
+  },
+};
+```
+
 All of the above fields are optional.
 
 If you want to use different config files for different types of builds you can do so using the param `--config`. Example:

package.json

@@ -1,7 +1,7 @@
 {
   "name": "esbuild-node-tsc",
   "description": "Build your Typescript Node.js projects using blazing fast esbuild",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "main": "./dist/index.js",
   "bin": {
     "esbuild-node-tsc": "dist/index.js",
@@ -23,10 +23,10 @@
     "typescript"
   ],
   "devDependencies": {
-    "@types/node": "^18.6.3",
+    "@types/node": "^18.7.3",
     "@types/rimraf": "^3.0.2",
-    "@types/yargs": "^17.0.10",
-    "esbuild": "^0.14.53",
+    "@types/yargs": "^17.0.11",
+    "esbuild": "^0.15.2",
     "typescript": "^4.7.4"
   },
   "dependencies": {

src/config.ts

@@ -1,17 +1,11 @@
-import fs from 'fs'
-import type { Plugin } from "esbuild";
+import fs from "fs";
+import type { BuildOptions as EsBuildOptions, Plugin } from "esbuild";
 
 export type Config = Partial<{
   outDir: string;
   clean?: boolean;
   tsConfigFile?: string;
-  esbuild: {
-    entryPoints?: string[];
-    minify?: boolean;
-    target?: string;
-    plugins?: Plugin[];
-    format?: "cjs" | "esm";
-  };
+  esbuild: EsBuildOptions;
   assets: {
     baseDir?: string;
     outDir?: string;
@@ -22,9 +16,9 @@ export type Config = Partial<{
 export async function readUserConfig(configPath: string): Promise<Config> {
   if (fs.existsSync(configPath)) {
     try {
-      return require(configPath);
-    }
-    catch (e) {
+      const { default: config } = await import(configPath);
+      return config;
+    } catch (e) {
       console.log("Config file has some errors:");
       console.error(e);
     }

src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import ts, { BuildOptions } from "typescript";
-import { build } from "esbuild";
+import ts from "typescript";
+import { build, BuildOptions as EsBuildOptions } from "esbuild";
 import cpy from "cpy";
 import path from "path";
 import rimraf from "rimraf";
@@ -58,27 +58,30 @@ function esBuildSourceMapOptions(tsConfig: TSConfig) {
 
 function getBuildMetadata(userConfig: Config) {
   const { tsConfig, tsConfigFile } = getTSConfig(userConfig.tsConfigFile);
-
-  const outDir = userConfig.outDir || tsConfig.options.outDir || "dist";
-
-  const esbuildEntryPoints = userConfig.esbuild?.entryPoints || [];
-  const srcFiles = [...tsConfig.fileNames, ...esbuildEntryPoints];
-  const sourcemap = esBuildSourceMapOptions(tsConfig);
+  const esbuildConfig = userConfig.esbuild || {};
+
+  const outDir =
+    userConfig.outDir ||
+    tsConfig.options.outDir ||
+    esbuildConfig.outdir ||
+    "dist";
+
+  const srcFiles = [
+    ...tsConfig.fileNames,
+    ...((esbuildConfig.entryPoints as string[]) ?? []),
+  ];
+  const sourcemap =
+    esBuildSourceMapOptions(tsConfig) || userConfig.esbuild?.sourcemap;
   const target =
-    userConfig.esbuild?.target ||
-    tsConfig?.raw?.compilerOptions?.target ||
-    "es6";
-  const minify = userConfig.esbuild?.minify || false;
-  const plugins = userConfig.esbuild?.plugins || [];
-  const format = userConfig.esbuild?.format || "cjs";
-
-  const esbuildOptions: BuildOptions = {
+    tsConfig?.raw?.compilerOptions?.target || esbuildConfig?.target || "es2015";
+  const format = esbuildConfig?.format || "cjs";
+
+  const esbuildOptions: EsBuildOptions = {
+    ...userConfig.esbuild,
     outdir: outDir,
     entryPoints: srcFiles,
     sourcemap,
     target,
-    minify,
-    plugins,
     tsconfig: tsConfigFile,
     format,
   };
@@ -88,13 +91,13 @@ function getBuildMetadata(userConfig: Config) {
   const assetsOptions = {
     baseDir: userConfig.assets?.baseDir || "src",
     outDir: userConfig.assets?.outDir || outDir,
-    patterns: [...assetPatterns, `!**/*.{ts,js,tsx,jsx}`],
+    patterns: [...assetPatterns, "!**/*.{ts,js,tsx,jsx}"],
   };
 
   return { outDir, esbuildOptions, assetsOptions };
 }
 
-async function buildSourceFiles(esbuildOptions: Partial<BuildOptions>) {
+async function buildSourceFiles(esbuildOptions: EsBuildOptions) {
   return await build({
     bundle: false,
     format: "cjs",
@@ -111,14 +114,12 @@ async function copyNonSourceFiles({
   patterns,
 }: AssetsOptions) {
   const relativeOutDir = path.relative(baseDir, outDir);
-  return await cpy(patterns, relativeOutDir, {
-    cwd: baseDir,
-  });
+  return await cpy(patterns, relativeOutDir, { cwd: baseDir });
 }
 
 async function main() {
   const configFilename = <string>(await argv)?.config || "etsc.config.js";
-  const clean = <boolean>(await argv)?.clean || false;
+  const clean = (await argv)?.clean;
   const config = await readUserConfig(path.resolve(cwd, configFilename));
 
   const { outDir, esbuildOptions, assetsOptions } = getBuildMetadata(config);

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
+    "target": "esnext",
+    "module": "esnext",
     "declaration": true,
     "sourceMap": true,
     "outDir": "./dist",