fix ci error with core type missing

recruit-tech · Aug 27, 2023 · 2d32b66 · 2d32b66
1 parent ba04279
commit 2d32b66
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 11 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -21,6 +21,6 @@ jobs:
           version: 8
           run_install: false
       - name: Install packages
-        run: pnpm install
+        run: pnpm i --ignore-scripts
       - name: Check project
         run: pnpm check
diff --git a/packages/location-state-core/package.json b/packages/location-state-core/package.json
@@ -1,21 +1,25 @@
 {
   "name": "@location-state/core",
   "version": "0.0.0-alpha",
+  "files": [
+    "dist",
+    "src",
+    "package.json"
+  ],
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs",
+      "types": "./src/index.ts"
     },
     "./unsafe-navigation": {
       "require": "./dist/unsafe-navigation.js",
-      "import": "./dist/unsafe-navigation.js",
-      "types": "./dist/unsafe-navigation.d.ts"
+      "import": "./dist/unsafe-navigation.mjs",
+      "types": "./src/unsafe-navigation.ts"
     }
   },
-  "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsup src/index.ts src/unsafe-navigation.ts --dts",
+    "build": "tsup src/index.ts src/unsafe-navigation.ts",
     "typecheck": "tsc --noEmit",
     "test": "jest",
     "lint": "eslint . --ext .ts,.tsx"

diff --git a/packages/location-state-core/tsup.config.ts b/packages/location-state-core/tsup.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  target: "es2020",
+  format: ["cjs", "esm"],
+  clean: true,
+  // CI上ではdts生成より先にbuildが進んでしまうため、以下のissue解消後有効化
+  // https://github.com/egoist/tsup/issues/921
+  dts: false,
+});
diff --git a/packages/location-state-next/package.json b/packages/location-state-next/package.json
@@ -1,16 +1,20 @@
 {
   "name": "@location-state/next",
   "version": "0.0.0-alpha",
+  "files": [
+    "dist",
+    "src",
+    "package.json"
+  ],
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": "./dist/index.mjs",
+      "types": "./src/index.ts"
     }
   },
-  "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsup src/index.ts --dts",
+    "build": "tsup src/index.ts",
     "typecheck": "tsc --noEmit",
     "lint": "eslint . --ext .ts,.tsx"
   },

diff --git a/packages/location-state-next/tsup.config.ts b/packages/location-state-next/tsup.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  target: "es2020",
+  format: ["cjs", "esm"],
+  clean: true,
+  // CI上ではdts生成より先にbuildが進んでしまうため、以下のissue解消後有効化
+  // https://github.com/egoist/tsup/issues/921
+  dts: false,
+});
diff --git a/packages/test-utils/tsup.config.ts b/packages/test-utils/tsup.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  target: "es2020",
+  clean: true,
+  // CI上ではdts生成より先にbuildが進んでしまうため、以下のissue解消後有効化
+  // https://github.com/egoist/tsup/issues/921
+  dts: false,
+});