fix: support moduleResolution: node

fix #578
oazapfts · Feb 16, 2024 · ef1be3f · ef1be3f
1 parent 3604bbb
commit ef1be3f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -3,8 +3,8 @@
   "compilerOptions": {
     "noEmit": true,
     "paths": {
-      "@oazapfts/runtime": ["../packages/runtime/dist"],
-      "@oazapfts/runtime/*": ["../packages/runtime/dist/*"]
+      "@oazapfts/runtime": ["../packages/runtime/src"],
+      "@oazapfts/runtime/*": ["../packages/runtime/src/*"]
     }
   },
   "include": ["./*.ts"]

diff --git a/packages/codegen/.gitignore b/packages/codegen/.gitignore
@@ -0,0 +1,8 @@
+# dist is moved to root upon publish
+*.cjs
+*.cjs.map
+*.js
+*.js.map
+*.d.ts
+
+!typings.d.ts
diff --git a/packages/codegen/.npmignore b/packages/codegen/.npmignore
@@ -1,5 +1,5 @@
 src/
-misc/
+template/
 vite.config.ts
 tsconfig.json
 typings.d.ts

diff --git a/packages/codegen/package.json b/packages/codegen/package.json
@@ -27,7 +27,8 @@
     }
   },
   "scripts": {
-    "build": "rm -rf dist && tsc && vite build --mode esm && vite build --mode cjs && chmod +x dist/cli.js && chmod +x dist/cli.cjs"
+    "build": "rm -rf dist && tsc && vite build --mode esm && vite build --mode cjs && chmod +x dist/cli.js && chmod +x dist/cli.cjs",
+    "prepack": "sed -i 's|dist/||g' package.json && mv dist/* ."
   },
   "release": {
     "extends": "semantic-release-monorepo",

diff --git a/packages/codegen/src/index.test.ts b/packages/codegen/src/index.test.ts
@@ -29,12 +29,8 @@ async function checkForTypeErrors(source: string) {
       noEmit: true,
       target: ScriptTarget.ESNext,
       paths: {
-        "@oazapfts/runtime": [
-          path.resolve(__dirname, "../../packages/runtime/dist"),
-        ],
-        "@oazapfts/runtime/*": [
-          path.join(__dirname, "../../packages/runtime/dist/*"),
-        ],
+        "@oazapfts/runtime": [path.resolve(__dirname, "../../runtime/src")],
+        "@oazapfts/runtime/*": [path.join(__dirname, "../../runtime/src/*")],
       },
     },
   });

diff --git a/packages/runtime/.gitignore b/packages/runtime/.gitignore
@@ -0,0 +1,8 @@
+# dist is moved to root upon publish
+*.cjs
+*.cjs.map
+*.js
+*.js.map
+*.d.ts
+
+!typings.d.ts
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -34,7 +34,8 @@
     "directory": "packages/runtime"
   },
   "scripts": {
-    "build": "rm -rf dist && tsc && vite build --mode esm && vite build --mode cjs"
+    "build": "rm -rf dist && tsc && vite build --mode esm && vite build --mode cjs",
+    "prepack": "sed -i 's|dist/||g' package.json && mv dist/* ."
   },
   "release": {
     "extends": "semantic-release-monorepo",