Remove tsup usage from libraries

GSA-TTS · Aug 8, 2024 · ffd5b9e · ffd5b9e
1 parent 5b9f253
commit ffd5b9e
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 28 deletions.
diff --git a/infra/core/package.json b/infra/core/package.json
@@ -4,10 +4,11 @@
   "description": "10x ATJ secrets storage backend",
   "type": "module",
   "license": "CC0",
-  "main": "src/index.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.js",
   "scripts": {
-    "build": "node ./build.js",
-    "dev": "tsup src/* --watch",
+    "build": "tsc",
+    "dev": "tsc --watch",
     "test": "vitest run --coverage"
   },
   "dependencies": {

diff --git a/infra/core/tsconfig.json b/infra/core/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
+    "emitDeclarationOnly": false,
     "outDir": "./dist",
-    "emitDeclarationOnly": true,
     "rootDir": "./src"
   },
   "include": ["./src"],

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -4,11 +4,11 @@
   "description": "10x ATJ shared resources",
   "type": "module",
   "license": "CC0",
-  "main": "dist/index.cjs",
-  "types": "src/index.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsup src/* --env.NODE_ENV production",
-    "dev": "tsup src/* --watch"
+    "build": "tsc",
+    "dev": "tsc --watch"
   },
   "dependencies": {}
 }
diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
@@ -1,8 +1,9 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
+    "emitDeclarationOnly": false,
     "outDir": "./dist",
-    "emitDeclarationOnly": true
+    "rootDir": "./src"
   },
   "include": ["./src"],
   "references": []

diff --git a/packages/docassemble/package.json b/packages/docassemble/package.json
@@ -4,10 +4,11 @@
   "description": "10x ATJ docassemble adapter",
   "type": "module",
   "license": "CC0",
-  "main": "src/index.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsup src/* --env.NODE_ENV production",
-    "dev": "tsup src/* --watch",
+    "build": "tsc",
+    "dev": "tsc --watch",
     "test:integration": "vitest run --coverage"
   },
   "dependencies": {

diff --git a/packages/docassemble/tsconfig.json b/packages/docassemble/tsconfig.json
@@ -1,9 +1,10 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
+    "emitDeclarationOnly": false,
     "module": "ESNext",
     "outDir": "./dist",
-    "emitDeclarationOnly": true
+    "rootDir": "./src"
   },
   "include": ["./src"],
   "references": []

diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -4,10 +4,11 @@
   "description": "10x ATJ form handling",
   "type": "module",
   "license": "CC0",
-  "main": "src/index.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsup src/* --env.NODE_ENV production",
-    "dev": "tsup src/* --watch",
+    "build": "tsc",
+    "dev": "tsc --watch",
     "test": "vitest run --coverage"
   },
   "dependencies": {

diff --git a/packages/forms/src/service/operations/add-form.ts b/packages/forms/src/service/operations/add-form.ts
@@ -1,5 +1,5 @@
 import { Result } from '@atj/common';
-import { Blueprint } from '../../..';
+import { Blueprint } from '../../index.js';
 
 import { addFormToStorage } from '../context/browser/form-repo';
 

diff --git a/packages/forms/src/service/operations/get-form.ts b/packages/forms/src/service/operations/get-form.ts
@@ -1,5 +1,5 @@
 import { Result } from '@atj/common';
-import { type Blueprint } from '../../..';
+import { type Blueprint } from '../../index.js';
 
 import { getFormFromStorage } from '../context/browser/form-repo';
 

diff --git a/packages/forms/src/service/operations/save-form.ts b/packages/forms/src/service/operations/save-form.ts
@@ -1,5 +1,5 @@
 import { Result } from '@atj/common';
-import { Blueprint } from '../../..';
+import { Blueprint } from '../../index.js';
 
 import { saveFormToStorage } from '../context/browser/form-repo';
 

diff --git a/packages/forms/src/service/operations/submit-form.test.ts b/packages/forms/src/service/operations/submit-form.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { createForm, createFormSession } from '../../..';
+import { createForm, createFormSession } from '../../index.js';
 import { createTestFormService } from '../context/test';
 
 describe('submitForm', () => {

diff --git a/packages/forms/src/service/operations/submit-form.ts b/packages/forms/src/service/operations/submit-form.ts
@@ -7,9 +7,9 @@ import {
   createFormOutputFieldData,
   fillPDF,
   sessionIsComplete,
-} from '../../..';
+} from '../../index.js';
 
-import { getFormFromStorage } from '../context/browser/form-repo';
+import { getFormFromStorage } from '../context/browser/form-repo.js';
 
 export const submitForm = async (
   ctx: { storage: Storage; config: FormConfig },

diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json
@@ -1,8 +1,9 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "emitDeclarationOnly": true,
-    "outDir": "./dist"
+    "emitDeclarationOnly": false,
+    "outDir": "./dist",
+    "rootDir": "./src"
   },
   "include": ["./src/**/*"],
   "exclude": ["./dist"],

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -12,11 +12,7 @@
     "noImplicitAny": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,
-
     "sourceMap": true,
-    "inlineSources": true,
-    "inlineSourceMap": true,
-
     "strict": true,
     "target": "ESNext"
   }