From 7cc92d89c4ec662d0de9f459e76f15c15f344834 Mon Sep 17 00:00:00 2001
From: chenshenhai <cshenhai@gmail.com>
Date: Sun, 27 Feb 2022 15:56:32 +0800
Subject: [PATCH] build: add output esm/* to @idraw/util

---
 .gitignore                 |  2 ++
 package.json               |  2 +-
 packages/util/dev/main.js  |  2 +-
 packages/util/package.json |  4 +++-
 scripts/build-module.js    | 19 ++-----------------
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9aaa624..09dafc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,5 @@ __tests__/test-result
 # __tests__/snapshot
 
 reports/
+
+packages/*/esm/
diff --git a/package.json b/package.json
index 4ea7139..f6e6fce 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "e2e": "mocha --exit ./__tests__/e2e.test.js",
     "init": "lerna bootstrap",
     "init:cnpm": "lerna bootstrap --npm-client=cnpm",
-    "clear": "rm -rf ./packages/*/dist/ & rm -rf ./packages/*/node_modules/",
+    "clear": "rm -rf ./packages/*/dist/ && rm -rf ./packages/*/esm/ && rm -rf ./packages/*/node_modules/",
     "jest": "jest --config jest.config.js",
     "jest:update": "jest --update-snapshot --config jest.config.js",
     "cover": "jest --config jest.cover.js",
diff --git a/packages/util/dev/main.js b/packages/util/dev/main.js
index 9a3b675..1d36fde 100644
--- a/packages/util/dev/main.js
+++ b/packages/util/dev/main.js
@@ -1,4 +1,4 @@
-import util from './../src/index';
+import util from './../src/default';
 
 console.log('util =', util)
 
diff --git a/packages/util/package.json b/packages/util/package.json
index 4928866..fb59e94 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -11,7 +11,9 @@
   },
   "files": [
     "dist/*.ts",
-    "dist/*.js"
+    "dist/*.js",
+    "esm/*.js",
+    "esm/*.ts"
   ],
   "repository": {
     "type": "git",
diff --git a/scripts/build-module.js b/scripts/build-module.js
index c597816..0cef32d 100644
--- a/scripts/build-module.js
+++ b/scripts/build-module.js
@@ -1,5 +1,5 @@
 const ts = require('typescript');
-const babel = require('@babel/core');
+// const babel = require('@babel/core');
 const glob = require("glob");
 const { packages } = require('./config');
 const { resolvePackagePath, getTsConfig } = require('./util/project');
@@ -28,25 +28,10 @@ function buildPackage(dirName) {
     compilerOptions.target = ts.ScriptTarget.ES2015;
     compilerOptions.moduleResolution = ts.ModuleResolutionKind.NodeJs;
     compilerOptions.declaration = true;
-    compilerOptions.outDir = resolvePackagePath(dirName, 'dist', 'esm');
+    compilerOptions.outDir = resolvePackagePath(dirName, 'esm');
     compilerOptions.rootDir  = resolvePackagePath(dirName, 'src');
     const program = ts.createProgram(targetFiles, compilerOptions);
     program.emit();
   }
-
-  // build ts -> cjs
-  {
-    const tsConfig = getTsConfig();
-    const compilerOptions = tsConfig.compilerOptions;
-    compilerOptions.target = ts.ScriptTarget.ES5;
-    compilerOptions.moduleResolution = ts.ModuleResolutionKind.NodeJs;
-    compilerOptions.declaration = true;
-    compilerOptions.outDir = resolvePackagePath(dirName, 'dist', 'cjs');
-    compilerOptions.rootDir  = resolvePackagePath(dirName, 'src');
-    const program = ts.createProgram(targetFiles, compilerOptions);
-    program.emit();
-  }
-
-  // console.log('files ===', files);
 }