feat(build): move from tsc and rollup to tsup

Author: anymaniax

.gitignore

@@ -89,19 +89,11 @@ typings/
 # dotenv environment variables file
 .env*
 
-lib
 .cache
 
 # End of https://www.gitignore.io/api/node,macos,vscode
 
 # Cache for parcel serverl in example
 .cache
 
-package-lock.json
-
-# examples artefacts
-examples/*.ts
-examples/model/*
-
-!docs/src/lib
-!samples/svelte-query/src/lib
+package-lock.json

.npmignore

@@ -1,4 +1,4 @@
 *
-!lib/**/*
+!dist/**/*
 !README.md
 !package.json

package.json

@@ -4,13 +4,12 @@
   "version": "5.0.0-alpha.6",
   "license": "MIT",
   "files": [
-    "lib"
+    "dist"
   ],
   "bin": {
-    "orval": "lib/bin/orval.js"
+    "orval": "dist/bin/orval.js"
   },
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
+  "main": "dist/index.js",
   "keywords": [
     "rest",
     "client",
@@ -35,13 +34,11 @@
     "url": "https://github.com/anymaniax/orval"
   },
   "scripts": {
-    "rollup": "rollup -c rollup.config.js",
-    "prebuild": "rimraf ./lib && mkdir lib",
-    "build": "tsc && yarn rollup",
+    "build": "tsup ./src/bin/orval.ts ./src/index.ts --minify --clean",
     "lint": "eslint src/**/*.ts",
     "format": "prettier --write 'src/**/*.{js,ts}'",
     "release": "dotenv release-it",
-    "generate-api": "node ./lib/bin/orval.js --config ./samples/react-app-with-react-query/orval.config.js",
+    "generate-api": "node ./dist/bin/orval.js --config ./samples/react-app-with-react-query/orval.config.js",
     "prepare": "husky install",
     "commitlint": "commitlint"
   },
@@ -74,8 +71,7 @@
     "prettier": "^2.2.1",
     "release-it": "^14.6.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.45.1",
-    "rollup-plugin-typescript2": "^0.30.0",
+    "tsup": "^4.8.21",
     "typescript": "^4.2.4"
   },
   "dependencies": {

rollup.config.js

@@ -1,14 +1,16 @@
 import program from 'commander';
+import pkg from '../../package.json';
 import { generateConfig, generateSpec } from '../generate';
 import { isString } from '../utils/is';
 import { startMessage } from '../utils/messages/logs';
-import { getPackage } from '../utils/packages';
 
-const { name, version, description } = getPackage();
+startMessage({
+  name: pkg.name,
+  version: pkg.version,
+  description: pkg.description,
+});
 
-startMessage({ name, version, description });
-
-program.version(version);
+program.version(pkg.version);
 
 program
   .command('default [open-api-file]', { isDefault: true, hidden: true })

src/bin/orval.ts

@@ -1,9 +1,10 @@
 import { pathExists } from 'fs-extra';
-import { dirname, join } from 'upath';
+import { dirname, resolve } from 'upath';
 import { importSpecs } from './core/importers/specs';
 import { writeSpecs } from './core/writers/specs';
 import { ExternalConfigFile, Options } from './types';
 import { catchError } from './utils/errors';
+import { dynamicImport } from './utils/imports';
 
 export const generateSpec = async (
   workspace: string,
@@ -22,13 +23,13 @@ export const generateConfig = async (
   path: string = './orval.config.js',
   projectName?: string,
 ) => {
-  const fullPath = join(process.cwd(), path);
+  const fullPath = resolve(process.cwd(), path);
 
   if (!(await pathExists(fullPath))) {
     catchError('orval config not found');
   }
 
-  const config: ExternalConfigFile = require(fullPath);
+  const config = await dynamicImport<ExternalConfigFile>(fullPath);
 
   const workspace = dirname(fullPath);
 

src/generate.ts

@@ -1,19 +1,28 @@
-import { join } from 'upath';
+import { resolve } from 'upath';
 import { isObject, isString } from './is';
 
 export const dynamicImport = async <T>(
   toImport: T | string,
   from = process.cwd(),
 ): Promise<T> => {
-  if (isString(toImport)) {
-    const data = await import(join(from, toImport));
+  if (!toImport) {
+    return toImport as T;
+  }
+
+  const path = resolve(from, toImport);
 
-    if (isObject(data)) {
-      return (data as any).default as T;
+  try {
+    if (isString(toImport)) {
+      const data = await import(path);
+      if (isObject(data) && data.default) {
+        return (data as any).default as T;
+      }
+
+      return data;
     }
 
-    return data;
+    return Promise.resolve<T>(toImport);
+  } catch (error) {
+    throw `Oups... 🍻. Path: ${path} => ${error}`;
   }
-
-  return Promise.resolve<T>(toImport);
 };

src/utils/imports.ts

@@ -1,6 +1,5 @@
 import { InfoObject } from 'openapi3-ts';
-
-const pkg = require('../../../package.json');
+import pkg from '../../../package.json';
 
 export const getFilesHeader = ({ title, description, version }: InfoObject) =>
   `/*\n * Generated by ${pkg.name} v${

src/utils/messages/inline.ts

@@ -1,5 +1,5 @@
 {
-  "exclude": ["node_modules", "lib", "__tests__", "**/*.test*", "**/*.spec*"],
+  "exclude": ["node_modules", "dist", "__tests__", "**/*.test*", "**/*.spec*"],
   "include": ["src/**/*"],
   "compilerOptions": {
     "skipLibCheck": true,
@@ -8,8 +8,6 @@
     "lib": ["es2015", "dom", "es2016.array.include", "es2017.object"],
     "declaration": true,
     "declarationMap": true,
-    "rootDir": "./src",
-    "outDir": "./lib",
     "downlevelIteration": true,
     "strict": true,
     "noUnusedLocals": true,