refactor: consolidating our ts and tsup configs (#813)

* refactor: consolidating our ts and tsup configs

* fix: removing `lib` from our base tsconfig

* fix: pr feedback

* fix: pr feedback

* fix: prettier issues

* fix: getting builds working

* fix: prettier issues

package.json

@@ -2,6 +2,7 @@
   "private": true,
   "scripts": {
     "alex": "alex .",
+    "attw": "npx lerna run attw --stream",
     "build": "npx lerna run build --stream",
     "clean": "npx lerna clean",
     "lint": "npm run lint:types && npm run lint:js && npm run prettier",

packages/oas-extensions/package.json

@@ -30,6 +30,7 @@
     "url": "https://github.com/readmeio/oas/issues"
   },
   "scripts": {
+    "attw": "attw --pack --format table-flipped",
     "build": "tsup",
     "lint": "npm run lint:types && npm run lint:js",
     "lint:js": "eslint . --ext .js,.ts",

packages/oas-extensions/tsconfig.json

@@ -1,14 +1,5 @@
 {
-  "compilerOptions": {
-    "allowJs": true,
-    "baseUrl": "./src/",
-    "declaration": true,
-    "esModuleInterop": true,
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "noImplicitAny": true,
-    "outDir": "./dist",
-    "target": "ES2020"
-  },
-  "include": ["./src/**/*"]
+  "extends": "../../tsconfig.base.json",
+  "include": ["./src/**/*"],
+  "exclude": ["dist"]
 }

packages/oas-extensions/tsup.config.ts

@@ -3,18 +3,12 @@ import type { Options } from 'tsup';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { defineConfig } from 'tsup';
 
+import config from '../../tsup.config';
+
 export default defineConfig((options: Options) => ({
   ...options,
+  ...config,
 
-  cjsInterop: true,
-  clean: true,
-  dts: true,
   entry: ['src/index.ts'],
-  format: ['esm', 'cjs'],
-  minify: false,
-  shims: true,
   silent: !options.watch,
-  splitting: true,
-  sourcemap: true,
-  treeshake: true,
 }));

packages/oas-normalize/.eslintrc

@@ -6,9 +6,6 @@
 
     "camelcase": ["error", { "allow": ["OpenAPIV3_1"] }],
 
-    // Does not play well with our `swagger2openapi` type sinkhole.
-    "import/order": "off",
-
     "no-case-declarations": "off",
 
     "unicorn/prefer-node-protocol": "error"

packages/oas-normalize/package.json

@@ -52,6 +52,7 @@
     "url": "https://github.com/readmeio/oas/issues"
   },
   "scripts": {
+    "attw": "attw --pack --format table-flipped",
     "build": "tsup",
     "lint": "npm run lint:types && npm run lint:js",
     "lint:js": "eslint . --ext .js,.ts",
@@ -71,6 +72,7 @@
   "devDependencies": {
     "@readme/oas-examples": "^5.12.0",
     "@types/js-yaml": "^4.0.5",
+    "@types/swagger2openapi": "^7.0.1",
     "@vitest/coverage-v8": "^0.34.1",
     "eslint": "^8.46.0",
     "fetch-mock": "^9.11.0",

packages/oas-normalize/tsconfig.json

@@ -1,17 +1,9 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "allowJs": true,
-    "baseUrl": "./src",
-    "declaration": true,
-    "esModuleInterop": true,
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "outDir": "dist/",
-    "paths": {
-      "swagger2openapi": [".sink.d.ts"]
-    },
-    "skipLibCheck": true,
-    "target": "ES2020"
+    // DOM is needed because `oas-normalize` uses `fetch`.
+    "lib": ["DOM"]
   },
-  "include": ["./src/**/*"]
+  "include": ["./src/**/*"],
+  "exclude": ["dist"]
 }

packages/oas-normalize/tsup.config.ts

@@ -3,17 +3,12 @@ import type { Options } from 'tsup';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { defineConfig } from 'tsup';
 
+import config from '../../tsup.config';
+
 export default defineConfig((options: Options) => ({
   ...options,
+  ...config,
 
-  cjsInterop: true,
-  clean: true,
-  dts: true,
   entry: ['src/index.ts', 'src/lib/types.ts', 'src/lib/utils.ts'],
-  format: ['esm', 'cjs'],
-  minify: false,
-  shims: true,
   silent: !options.watch,
-  sourcemap: true,
-  splitting: true,
 }));

packages/oas-to-har/package.json

@@ -39,6 +39,7 @@
     "url": "https://github.com/readmeio/oas/issues"
   },
   "scripts": {
+    "attw": "attw --pack --format table-flipped",
     "build": "tsup",
     "lint": "npm run lint:types && npm run lint:js",
     "lint:js": "eslint . --ext .js,.ts",

packages/oas-to-har/tsconfig.json

@@ -1,17 +1,8 @@
 {
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "allowJs": true,
-    "baseUrl": "./src",
-    "declaration": true,
-    "downlevelIteration": true,
-    "esModuleInterop": true,
-    "lib": ["DOM", "ES2020"],
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "noImplicitAny": true,
-    "outDir": "dist/",
-    "skipLibCheck": true,
-    "target": "ES2020"
+    "downlevelIteration": true
   },
-  "include": ["./src/**/*"]
+  "include": ["./src/**/*"],
+  "exclude": ["dist"]
 }

packages/oas-to-har/tsup.config.ts

@@ -1,14 +1,12 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { defineConfig } from 'tsup';
 
+import config from '../../tsup.config.js';
+
 export default defineConfig(options => ({
   ...options,
+  ...config,
 
-  cjsInterop: true,
-  dts: true,
   entry: ['src/index.ts', 'src/lib/configure-security.ts', 'src/lib/types.ts'],
-  format: ['esm', 'cjs'],
-  shims: true,
   silent: !options.watch,
-  sourcemap: true,
 }));

packages/oas/package.json

@@ -69,6 +69,7 @@
     "url": "https://github.com/readmeio/oas/issues"
   },
   "scripts": {
+    "attw": "attw --pack --format table-flipped",
     "build": "tsup",
     "lint": "npm run lint:types && npm run lint:js",
     "lint:js": "eslint . --ext .js,.ts",

packages/oas/src/lib/helpers.ts

@@ -1,4 +1,4 @@
-import type { SchemaObject } from 'rmoas.types';
+import type { SchemaObject } from '../rmoas.types';
 
 export function hasSchemaType(schema: SchemaObject, discriminator: 'array' | 'object') {
   if (Array.isArray(schema.type)) {

packages/oas/src/operation/get-response-as-json-schema.ts

@@ -1,12 +1,12 @@
-import type Operation from 'operation';
+import type Operation from '../operation';
 import type {
   ComponentsObject,
   MediaTypeObject,
   OASDocument,
   ResponseObject,
   SchemaObject,
   HeaderObject,
-} from 'rmoas.types';
+} from '../rmoas.types';
 
 import cloneObject from '../lib/clone-object';
 import { isPrimitive } from '../lib/helpers';

packages/oas/tsconfig.json

@@ -1,15 +1,5 @@
 {
-  "compilerOptions": {
-    "allowJs": true,
-    "baseUrl": "./src/",
-    "declaration": true,
-    "esModuleInterop": true,
-    "lib": ["ES2023"],
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "noImplicitAny": true,
-    "outDir": "./dist",
-    "target": "ES2020"
-  },
-  "include": ["./src/**/*"]
+  "extends": "../../tsconfig.base.json",
+  "include": ["./src/**/*"],
+  "exclude": ["dist"]
 }

packages/oas/tsup.config.ts

@@ -3,12 +3,12 @@ import type { Options } from 'tsup';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { defineConfig } from 'tsup';
 
+import config from '../../tsup.config';
+
 export default defineConfig((options: Options) => ({
   ...options,
+  ...config,
 
-  cjsInterop: true,
-  clean: true,
-  dts: true,
   entry: [
     'src/analyzer/index.ts',
     'src/lib/reducer.ts',
@@ -18,10 +18,5 @@ export default defineConfig((options: Options) => ({
     'src/rmoas.types.ts',
     'src/utils.ts',
   ],
-  format: ['esm', 'cjs'],
-  minify: false,
-  shims: true,
   silent: !options.watch,
-  sourcemap: true,
-  splitting: true,
 }));

tsconfig.base.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "baseUrl": "./src",
+    "declaration": true,
+    "declarationMap": true,
+    "esModuleInterop": true,
+    "lib": ["ES2023"],
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "noImplicitAny": true,
+    "outDir": "./dist",
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "target": "ES2020"
+  }
+}

tsup.config.ts

@@ -0,0 +1,14 @@
+import type { Options } from 'tsup';
+
+const config: Options = {
+  cjsInterop: true,
+  clean: true,
+  dts: true,
+  format: ['esm', 'cjs'],
+  minify: false,
+  shims: true,
+  sourcemap: true,
+  splitting: true,
+};
+
+export default config;