Use node16 in tsconfig.json (#2052)

Azure · Oct 11, 2023 · ab0d41c · ab0d41c
1 parent b3a5345
commit ab0d41c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json
@@ -27,8 +27,8 @@
     "generate-tsp-only:rlc": "ts-node ./test/commands/gen-cadl-ranch.ts --tag=rlc",
     "generate-tsp-only:modular": "ts-node ./test/commands/gen-cadl-ranch.ts --tag=modular",
     "integration-test:alone": "npm run integration-test:alone:rlc && npm run integration-test:alone:modular",
-    "integration-test:alone:rlc": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/integration/*.spec.ts",
-    "integration-test:alone:modular": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/modularIntegration/*.spec.ts",
+    "integration-test:alone:rlc": "cross-env TS_NODE_PROJECT=tsconfig.integration.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/integration/*.spec.ts",
+    "integration-test:alone:modular": "cross-env TS_NODE_PROJECT=tsconfig.integration.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/modularIntegration/*.spec.ts",
     "stop-test-server": "npx cadl-ranch server stop",
     "unit-test": "npm run unit-test:rlc && npm run unit-test:modular",
     "unit-test:rlc": "cross-env TS_NODE_PROJECT=tsconfig.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --timeout 4000 './test/unit/**/*.spec.ts'",

diff --git a/packages/typespec-ts/test/integration/tsconfig.json b/packages/typespec-ts/test/integration/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../tsconfig.integration.json",
+  "include": ["./**/*.ts"]
+}
diff --git a/packages/typespec-ts/test/tsconfig.json b/packages/typespec-ts/test/tsconfig.json
@@ -1,4 +1,5 @@
 {
   "extends": "../tsconfig.test.json",
-  "include": ["./**/*.ts", "./**/**/*.ts"]
+  "include": ["./**/*.ts", "./**/**/*.ts"],
+  "exclude": ["./integration/**/*.ts"]
 }
diff --git a/packages/typespec-ts/tsconfig.integration.json b/packages/typespec-ts/tsconfig.integration.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "ESNext",
+    "moduleResolution": "Node"
+  }
+}
diff --git a/packages/typespec-ts/tsconfig.json b/packages/typespec-ts/tsconfig.json
@@ -5,8 +5,8 @@
     "composite": true,
     "lib": ["ES2019"],
     "target": "es2019",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
+    "module": "node16",
+    "moduleResolution": "node16",
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,

diff --git a/packages/typespec-ts/tsconfig.test.json b/packages/typespec-ts/tsconfig.test.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "ESNext",
-    "moduleResolution": "Node"
+    "module": "node16",
+    "moduleResolution": "node16"
   }
 }