Merge PR: Run typechecking in CI (#843)

Author: nene

Diff for: bin/sql-formatter-cli.cjs

@@ -2,7 +2,7 @@
 
 'use strict';
 
-const { format, supportedDialects } = require('../dist/index.cjs');
+const { format, supportedDialects } = require('../dist/cjs/index.js');
 const fs = require('fs');
 const path = require('path');
 const tty = require('tty');

Diff for: package.json

@@ -1,16 +1,16 @@
 {
   "name": "sql-formatter",
-  "version": "15.4.11",
+  "version": "15.5.0-beta.2",
   "description": "Format whitespace in a SQL query to make it more readable",
   "license": "MIT",
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
   "unpkg": "dist/sql-formatter.min.js",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.cjs"
     }
   },
   "bin": {
@@ -63,9 +63,10 @@
     "prepare": "yarn clean && yarn grammar && yarn fix && yarn check && yarn build",
     "pre-commit": "npm-run-all --parallel ts:changes lint:changes",
     "grammar": "nearleyc src/parser/grammar.ne -o src/parser/grammar.ts",
-    "build:tsup": "tsup src/index.ts --format cjs,esm --sourcemap --dts",
+    "build:cjs": "tsc -p tsconfig.cjs.json && echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json",
+    "build:esm": "tsc -p tsconfig.esm.json",
     "build:webpack": "webpack --config webpack.prod.js && cp dist/sql-formatter.min.cjs dist/sql-formatter.min.js",
-    "build": "yarn grammar && npm-run-all --parallel build:tsup build:webpack",
+    "build": "yarn grammar && npm-run-all --parallel build:cjs build:esm build:webpack",
     "release": "release-it"
   },
   "repository": {
@@ -111,7 +112,6 @@
     "rimraf": "^3.0.2",
     "ts-jest": "^29.2.6",
     "ts-loader": "^9.3.1",
-    "tsup": "^8.0.1",
     "typescript": "^4.7.4",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.9.1",

Diff for: tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/cjs",
+    "module": "CommonJS"
+  },
+  "include": ["src"]
+}

Diff for: tsconfig.esm.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist/esm",
+    "module": "NodeNext"
+  },
+  "include": ["src"]
+}

Diff for: tsconfig.json

@@ -1,17 +1,18 @@
 {
   "compilerOptions": {
     "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "target": "es6",
     "lib": ["es6", "dom"],
     "rootDirs": ["src"],
-    "outDir": "lib",
     "baseUrl": "./",
     "sourceMap": true,
     "declaration": true,
     "esModuleInterop": true,
-    "strict": true /* enable all strict type-checking options */,
-    /* Additional Checks */
-    "noImplicitReturns": true /* Report error when not all code paths in function return a value. */
+    // Enable all strict type-checking options.
+    "strict": true,
+    // Report error when not all code paths in function return a value.
+    "noImplicitReturns": true
   },
   "include": ["src", "test", "static"],
   "exclude": ["node_modules"]

Diff for: webpack.common.js

@@ -20,7 +20,18 @@ export default {
       {
         test: /\.ts$/u,
         exclude: /node_modules/u,
-        use: ['babel-loader', 'ts-loader'],
+        use: [
+          'babel-loader',
+          {
+            loader: 'ts-loader',
+            options: {
+              // Prevent `ts-loader` from emitting types to the `lib` directory.
+              // This also disables type-checking, which is already performed
+              // independently of the webpack build process.
+              transpileOnly: true,
+            },
+          },
+        ],
       },
       {
         test: /\.js$/u,