fix: switch to node16 module resolution

adelsz · Sep 26, 2023 · 26254af · 26254af
1 parent 6658671
commit 26254af
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 78 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -43,7 +43,7 @@
     "debug": "^4.1.1",
     "fp-ts": "^2.5.3",
     "fs-extra": "^11.0.0",
-    "glob": "^10.3.7, < 10.3.7",
+    "glob": "^10.3.7",
     "io-ts": "^2.2.20",
     "io-ts-reporters": "^2.0.1",
     "nunjucks": "3.2.4",

diff --git a/packages/cli/src/generator.test.ts b/packages/cli/src/generator.test.ts
@@ -1,14 +1,14 @@
 import { ParameterTransform } from '@pgtyped/runtime';
 
 import { parseSQLFile } from '@pgtyped/parser';
-import { IQueryTypes } from '@pgtyped/query/lib/actions';
+import { IQueryTypes } from '@pgtyped/query/lib/actions.js';
 import { ParsedConfig } from './config.js';
 import {
   escapeComment,
   generateInterface,
   ProcessingMode,
   queryToTypeDeclarations,
-} from './generator';
+} from './generator.js';
 import { parseCode as parseTypeScriptFile } from './parseTypescript.js';
 import { TypeAllocator, TypeMapping, TypeScope } from './types.js';
 

diff --git a/packages/cli/src/generator.ts b/packages/cli/src/generator.ts
@@ -20,7 +20,7 @@ import path from 'path';
 import { ParsedConfig } from './config.js';
 import { TypeAllocator, TypeMapping, TypeScope } from './types.js';
 import { parseCode as parseTypescriptFile } from './parseTypescript.js';
-import { IQueryTypes } from '@pgtyped/query/lib/actions';
+import { IQueryTypes } from '@pgtyped/query/lib/actions.js';
 
 export enum ProcessingMode {
   SQL = 'sql-file',

diff --git a/packages/query/package.json b/packages/query/package.json
@@ -6,7 +6,9 @@
     ".": {
       "import": "./lib/index.js",
       "types": "./lib/index.d.ts"
-    }
+    },
+    "./lib/actions.js": "./lib/actions.js",
+    "./lib/type.js": "./lib/type.js"
   },
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/tsconfig.json b/tsconfig.json
@@ -37,7 +37,7 @@
     // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
 
     /* Module Resolution Options */
-    "moduleResolution": "node",               /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "moduleResolution": "node16",               /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */