diff --git a/__fixtures__/esm-test-project/api/tsconfig.json b/__fixtures__/esm-test-project/api/tsconfig.json index 5d42753bb3..a04227fda6 100644 --- a/__fixtures__/esm-test-project/api/tsconfig.json +++ b/__fixtures__/esm-test-project/api/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": ["./src", "../.redwood/types/mirror/api/src"], "paths": { diff --git a/__fixtures__/esm-test-project/packages/validators/tsconfig.json b/__fixtures__/esm-test-project/packages/validators/tsconfig.json index a405d33430..3805f8c5f0 100644 --- a/__fixtures__/esm-test-project/packages/validators/tsconfig.json +++ b/__fixtures__/esm-test-project/packages/validators/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { "composite": true, - "target": "ES2023", - "module": "Node20", + "target": "es2023", + "module": "node20", "esModuleInterop": true, "skipLibCheck": true, "baseUrl": ".", diff --git a/__fixtures__/esm-test-project/scripts/tsconfig.json b/__fixtures__/esm-test-project/scripts/tsconfig.json index 5e564ac694..3efd490424 100644 --- a/__fixtures__/esm-test-project/scripts/tsconfig.json +++ b/__fixtures__/esm-test-project/scripts/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "paths": { "$api/*": ["../api/*"], "api/*": ["../api/*"], diff --git a/__fixtures__/test-project/api/tsconfig.json b/__fixtures__/test-project/api/tsconfig.json index daec0c0e1e..5a9e7a71df 100644 --- a/__fixtures__/test-project/api/tsconfig.json +++ b/__fixtures__/test-project/api/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": ["./src", "../.redwood/types/mirror/api/src"], "paths": { diff --git a/__fixtures__/test-project/packages/validators/tsconfig.json b/__fixtures__/test-project/packages/validators/tsconfig.json index a405d33430..3805f8c5f0 100644 --- a/__fixtures__/test-project/packages/validators/tsconfig.json +++ b/__fixtures__/test-project/packages/validators/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { "composite": true, - "target": "ES2023", - "module": "Node20", + "target": "es2023", + "module": "node20", "esModuleInterop": true, "skipLibCheck": true, "baseUrl": ".", diff --git a/__fixtures__/test-project/scripts/tsconfig.json b/__fixtures__/test-project/scripts/tsconfig.json index f4dda5faae..cfc83a37d6 100644 --- a/__fixtures__/test-project/scripts/tsconfig.json +++ b/__fixtures__/test-project/scripts/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "paths": { "$api/*": ["../api/*"], "api/*": ["../api/*"], diff --git a/packages/api/tsconfig.build.json b/packages/api/tsconfig.build.json index a336c33e7c..288059bfb4 100644 --- a/packages/api/tsconfig.build.json +++ b/packages/api/tsconfig.build.json @@ -4,7 +4,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["src/**/*"] } diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json index 70fd8310ab..d5bb916b57 100644 --- a/packages/api/tsconfig.json +++ b/packages/api/tsconfig.json @@ -4,7 +4,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src/**/*"] diff --git a/packages/auth-providers/auth0/api/tsconfig.json b/packages/auth-providers/auth0/api/tsconfig.json index 2345ffb867..abd3ace160 100644 --- a/packages/auth-providers/auth0/api/tsconfig.json +++ b/packages/auth-providers/auth0/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/auth0/setup/tsconfig.json b/packages/auth-providers/auth0/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/auth0/setup/tsconfig.json +++ b/packages/auth-providers/auth0/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/auth0/web/tsconfig.json b/packages/auth-providers/auth0/web/tsconfig.json index b43ccf55fd..5b2644b26f 100644 --- a/packages/auth-providers/auth0/web/tsconfig.json +++ b/packages/auth-providers/auth0/web/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "strict": true, "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "references": [ diff --git a/packages/auth-providers/azureActiveDirectory/api/tsconfig.json b/packages/auth-providers/azureActiveDirectory/api/tsconfig.json index 2345ffb867..abd3ace160 100644 --- a/packages/auth-providers/azureActiveDirectory/api/tsconfig.json +++ b/packages/auth-providers/azureActiveDirectory/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/azureActiveDirectory/setup/tsconfig.json b/packages/auth-providers/azureActiveDirectory/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/azureActiveDirectory/setup/tsconfig.json +++ b/packages/auth-providers/azureActiveDirectory/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/azureActiveDirectory/web/tsconfig.json b/packages/auth-providers/azureActiveDirectory/web/tsconfig.json index 75bb273a0c..7e0da1effc 100644 --- a/packages/auth-providers/azureActiveDirectory/web/tsconfig.json +++ b/packages/auth-providers/azureActiveDirectory/web/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "strict": true, "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "references": [ diff --git a/packages/auth-providers/clerk/api/tsconfig.json b/packages/auth-providers/clerk/api/tsconfig.json index 2345ffb867..abd3ace160 100644 --- a/packages/auth-providers/clerk/api/tsconfig.json +++ b/packages/auth-providers/clerk/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/clerk/setup/tsconfig.json b/packages/auth-providers/clerk/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/clerk/setup/tsconfig.json +++ b/packages/auth-providers/clerk/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/clerk/web/tsconfig.json b/packages/auth-providers/clerk/web/tsconfig.json index b43ccf55fd..5b2644b26f 100644 --- a/packages/auth-providers/clerk/web/tsconfig.json +++ b/packages/auth-providers/clerk/web/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "strict": true, "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "references": [ diff --git a/packages/auth-providers/custom/setup/tsconfig.json b/packages/auth-providers/custom/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/custom/setup/tsconfig.json +++ b/packages/auth-providers/custom/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/dbAuth/api/tsconfig.json b/packages/auth-providers/dbAuth/api/tsconfig.json index 3812bbbace..39cfae3d71 100644 --- a/packages/auth-providers/dbAuth/api/tsconfig.json +++ b/packages/auth-providers/dbAuth/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/dbAuth/middleware/tsconfig.build.json b/packages/auth-providers/dbAuth/middleware/tsconfig.build.json index ea1ba783bc..5acf262186 100644 --- a/packages/auth-providers/dbAuth/middleware/tsconfig.build.json +++ b/packages/auth-providers/dbAuth/middleware/tsconfig.build.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo" }, "include": ["src/**/*"], diff --git a/packages/auth-providers/dbAuth/middleware/tsconfig.json b/packages/auth-providers/dbAuth/middleware/tsconfig.json index e6ddba0d96..59447cef6b 100644 --- a/packages/auth-providers/dbAuth/middleware/tsconfig.json +++ b/packages/auth-providers/dbAuth/middleware/tsconfig.json @@ -4,7 +4,7 @@ "strict": true, "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "exclude": ["dist", "node_modules", "**/__mocks__", "**/__fixtures__"], diff --git a/packages/auth-providers/firebase/api/tsconfig.json b/packages/auth-providers/firebase/api/tsconfig.json index 2345ffb867..abd3ace160 100644 --- a/packages/auth-providers/firebase/api/tsconfig.json +++ b/packages/auth-providers/firebase/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/firebase/setup/tsconfig.json b/packages/auth-providers/firebase/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/firebase/setup/tsconfig.json +++ b/packages/auth-providers/firebase/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/firebase/web/tsconfig.json b/packages/auth-providers/firebase/web/tsconfig.json index b43ccf55fd..5b2644b26f 100644 --- a/packages/auth-providers/firebase/web/tsconfig.json +++ b/packages/auth-providers/firebase/web/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "strict": true, "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "references": [ diff --git a/packages/auth-providers/netlify/api/tsconfig.json b/packages/auth-providers/netlify/api/tsconfig.json index 2345ffb867..abd3ace160 100644 --- a/packages/auth-providers/netlify/api/tsconfig.json +++ b/packages/auth-providers/netlify/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/netlify/setup/tsconfig.json b/packages/auth-providers/netlify/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/netlify/setup/tsconfig.json +++ b/packages/auth-providers/netlify/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/netlify/web/tsconfig.json b/packages/auth-providers/netlify/web/tsconfig.json index b43ccf55fd..5b2644b26f 100644 --- a/packages/auth-providers/netlify/web/tsconfig.json +++ b/packages/auth-providers/netlify/web/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "strict": true, "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "references": [ diff --git a/packages/auth-providers/supabase/api/tsconfig.json b/packages/auth-providers/supabase/api/tsconfig.json index 2345ffb867..abd3ace160 100644 --- a/packages/auth-providers/supabase/api/tsconfig.json +++ b/packages/auth-providers/supabase/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/supabase/middleware/tsconfig.build.json b/packages/auth-providers/supabase/middleware/tsconfig.build.json index ea1ba783bc..5acf262186 100644 --- a/packages/auth-providers/supabase/middleware/tsconfig.build.json +++ b/packages/auth-providers/supabase/middleware/tsconfig.build.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo" }, "include": ["src/**/*"], diff --git a/packages/auth-providers/supabase/middleware/tsconfig.json b/packages/auth-providers/supabase/middleware/tsconfig.json index e6ddba0d96..59447cef6b 100644 --- a/packages/auth-providers/supabase/middleware/tsconfig.json +++ b/packages/auth-providers/supabase/middleware/tsconfig.json @@ -4,7 +4,7 @@ "strict": true, "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "exclude": ["dist", "node_modules", "**/__mocks__", "**/__fixtures__"], diff --git a/packages/auth-providers/supabase/setup/tsconfig.json b/packages/auth-providers/supabase/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/supabase/setup/tsconfig.json +++ b/packages/auth-providers/supabase/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/supabase/web/tsconfig.json b/packages/auth-providers/supabase/web/tsconfig.json index b43ccf55fd..5b2644b26f 100644 --- a/packages/auth-providers/supabase/web/tsconfig.json +++ b/packages/auth-providers/supabase/web/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "strict": true, "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "references": [ diff --git a/packages/auth-providers/supertokens/api/tsconfig.json b/packages/auth-providers/supertokens/api/tsconfig.json index 2345ffb867..abd3ace160 100644 --- a/packages/auth-providers/supertokens/api/tsconfig.json +++ b/packages/auth-providers/supertokens/api/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/supertokens/setup/tsconfig.json b/packages/auth-providers/supertokens/setup/tsconfig.json index be4a957a2f..c1c74da70c 100644 --- a/packages/auth-providers/supertokens/setup/tsconfig.json +++ b/packages/auth-providers/supertokens/setup/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.tsbuildinfo" }, "include": ["src"], diff --git a/packages/auth-providers/supertokens/web/tsconfig.json b/packages/auth-providers/supertokens/web/tsconfig.json index b43ccf55fd..5b2644b26f 100644 --- a/packages/auth-providers/supertokens/web/tsconfig.json +++ b/packages/auth-providers/supertokens/web/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "strict": true, "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "references": [ diff --git a/packages/cli/src/commands/generate/package/__tests__/__snapshots__/package.test.ts.snap b/packages/cli/src/commands/generate/package/__tests__/__snapshots__/package.test.ts.snap index c6e3fa3fae..8d1cebd824 100644 --- a/packages/cli/src/commands/generate/package/__tests__/__snapshots__/package.test.ts.snap +++ b/packages/cli/src/commands/generate/package/__tests__/__snapshots__/package.test.ts.snap @@ -204,8 +204,8 @@ exports[`packageHandler > files > single word package name > infers package scop "{ "compilerOptions": { "composite": true, - "target": "ES2023", - "module": "Node20", + "target": "es2023", + "module": "node20", "esModuleInterop": true, "skipLibCheck": true, "baseUrl": ".", diff --git a/packages/cli/src/commands/generate/package/__tests__/package.test.ts b/packages/cli/src/commands/generate/package/__tests__/package.test.ts index 1c91bdc4ee..38804634f0 100644 --- a/packages/cli/src/commands/generate/package/__tests__/package.test.ts +++ b/packages/cli/src/commands/generate/package/__tests__/package.test.ts @@ -342,9 +342,9 @@ describe('packageHandler', () => { "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", + "target": "es2023", "module": "Node16", // This is the line to update - "moduleResolution": "Node16", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": ["./src", "../.redwood/types/mirror/api/src"], "paths": { @@ -367,7 +367,7 @@ describe('packageHandler', () => { } ` - it('updates from Node16 to Node20', async () => { + it('updates from Node16 to node20', async () => { vol.fromJSON( { [tsconfigPath]: tsconfig, @@ -381,17 +381,37 @@ describe('packageHandler', () => { // Comments are valid in tsconfig files, we want to make sure we don't // remove those expect(fs.readFileSync(tsconfigPath, 'utf8')).toMatch( - /"module": "Node20", \/\/ This is the line to update/, + /"module": "node20", \/\/ This is the line to update/, ) expect(fs.readFileSync(tsconfigPath, 'utf8')).toEqual( - tsconfig.replace('"module": "Node16",', '"module": "Node20",'), + tsconfig.replace('"module": "Node16",', '"module": "node20",'), + ) + }) + + it('updates from node16 (lowercase) to node20', async () => { + const node16tsconfig = tsconfig.replace( + '"module": "Node16",', + '"module": "node16",', + ) + vol.fromJSON( + { + [tsconfigPath]: node16tsconfig, + 'cedar.toml': '', + }, + mockBase.path, + ) + + await packageHandler.updateTsconfig({ skip: () => {} }) + + expect(fs.readFileSync(tsconfigPath, 'utf8')).toEqual( + tsconfig.replace('"module": "Node16",', '"module": "node20",'), ) }) it('skips update if "module" is already Node20', async () => { const node20tsconfig = tsconfig.replace( '"module": "Node16",', - '"module": "Node20",', + '"module": "node20",', ) vol.fromJSON( { @@ -406,7 +426,7 @@ describe('packageHandler', () => { expect(skipFn).toHaveBeenCalled() expect(fs.readFileSync(tsconfigPath, 'utf8')).toMatch( - /"module": "Node20"/, + /"module": "node20"/, ) }) @@ -483,10 +503,10 @@ describe('packageHandler', () => { await packageHandler.updateTsconfig({ skip: () => {} }) expect(fs.readFileSync(webTsconfigPath, 'utf8')).toMatch( - /"module": "ESNext", \/\/ This is the line to update/, + /"module": "esnext", \/\/ This is the line to update/, ) expect(fs.readFileSync(webTsconfigPath, 'utf8')).toEqual( - webTsconfig.replace('"module": "ES2020",', '"module": "ESNext",'), + webTsconfig.replace('"module": "ES2020",', '"module": "esnext",'), ) }) @@ -529,9 +549,9 @@ describe('packageHandler', () => { const scriptsTsconfig = ` { "compilerOptions": { - "target": "ES2023", + "target": "es2023", "module": "Node16", // This is the line to update - "moduleResolution": "Node16" + "moduleResolution": "node16" } } ` @@ -547,10 +567,10 @@ describe('packageHandler', () => { await packageHandler.updateTsconfig({ skip: () => {} }) expect(fs.readFileSync(scriptsTsconfigPath, 'utf8')).toMatch( - /"module": "Node20", \/\/ This is the line to update/, + /"module": "node20", \/\/ This is the line to update/, ) expect(fs.readFileSync(scriptsTsconfigPath, 'utf8')).toEqual( - scriptsTsconfig.replace('"module": "Node16",', '"module": "Node20",'), + scriptsTsconfig.replace('"module": "Node16",', '"module": "node20",'), ) }) @@ -563,9 +583,9 @@ describe('packageHandler', () => { const scriptsTsconfig = ` { "compilerOptions": { - "target": "ES2023", + "target": "es2023", "module": "NodeNext", - "moduleResolution": "Node16" + "moduleResolution": "node16" } } ` diff --git a/packages/cli/src/commands/generate/package/packageHandler.js b/packages/cli/src/commands/generate/package/packageHandler.js index 37dfb1ce21..fc4b7a1389 100644 --- a/packages/cli/src/commands/generate/package/packageHandler.js +++ b/packages/cli/src/commands/generate/package/packageHandler.js @@ -49,7 +49,7 @@ export async function updateTsconfig(task) { { name: 'api', path: path.join(getPaths().api.base, 'tsconfig.json'), - expectedModule: 'Node20', + expectedModule: 'node20', // While Cedar doesn't officially endorse NodeNext, it will still work // here, so we'll keep it acceptable: ['node20', 'nodenext'], @@ -57,13 +57,13 @@ export async function updateTsconfig(task) { { name: 'web', path: path.join(getPaths().web.base, 'tsconfig.json'), - expectedModule: 'ESNext', + expectedModule: 'esnext', acceptable: ['esnext', 'es2022'], }, { name: 'scripts', path: path.join(getPaths().scripts, 'tsconfig.json'), - expectedModule: 'Node20', + expectedModule: 'node20', acceptable: ['node20', 'nodenext'], }, ] diff --git a/packages/cli/src/commands/generate/package/templates/tsconfig.json.template b/packages/cli/src/commands/generate/package/templates/tsconfig.json.template index a405d33430..3805f8c5f0 100644 --- a/packages/cli/src/commands/generate/package/templates/tsconfig.json.template +++ b/packages/cli/src/commands/generate/package/templates/tsconfig.json.template @@ -1,8 +1,8 @@ { "compilerOptions": { "composite": true, - "target": "ES2023", - "module": "Node20", + "target": "es2023", + "module": "node20", "esModuleInterop": true, "skipLibCheck": true, "baseUrl": ".", diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json index 3b91e94afa..b9e5431072 100644 --- a/packages/cli/tsconfig.build.json +++ b/packages/cli/tsconfig.build.json @@ -3,8 +3,8 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "module": "Node20", - "moduleResolution": "Node16" + "module": "node20", + "moduleResolution": "node16" }, "include": ["src", "./testUtils.d.ts"], "exclude": ["**/__testfixtures__"], diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index e17645d39e..3a68c80118 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -4,7 +4,7 @@ "isolatedModules": true, "emitDeclarationOnly": false, "noEmit": true, - "module": "Node20", + "module": "node20", "moduleResolution": "node16" }, "include": ["."], diff --git a/packages/codemods/tsconfig.json b/packages/codemods/tsconfig.json index 102d661bdd..2ecdf06e63 100644 --- a/packages/codemods/tsconfig.json +++ b/packages/codemods/tsconfig.json @@ -4,7 +4,7 @@ "emitDeclarationOnly": false, "noEmit": true, "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "rootDir": "." }, "include": ["src", "./testUtils.d.ts"], diff --git a/packages/context/tsconfig.build.json b/packages/context/tsconfig.build.json index 494547b45a..108d846c1d 100644 --- a/packages/context/tsconfig.build.json +++ b/packages/context/tsconfig.build.json @@ -4,7 +4,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo" }, "include": ["src"] diff --git a/packages/context/tsconfig.json b/packages/context/tsconfig.json index 75666818ec..40bd90f954 100644 --- a/packages/context/tsconfig.json +++ b/packages/context/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "exclude": ["dist", "node_modules", "**/__mocks__", "**/__fixtures__"], diff --git a/packages/create-cedar-app/templates/esm-js/api/jsconfig.json b/packages/create-cedar-app/templates/esm-js/api/jsconfig.json index de06039ac7..53709970ef 100644 --- a/packages/create-cedar-app/templates/esm-js/api/jsconfig.json +++ b/packages/create-cedar-app/templates/esm-js/api/jsconfig.json @@ -2,9 +2,9 @@ "compilerOptions": { "noEmit": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": [ "./src", diff --git a/packages/create-cedar-app/templates/esm-js/scripts/jsconfig.json b/packages/create-cedar-app/templates/esm-js/scripts/jsconfig.json index e2e804685b..358ebdecfe 100644 --- a/packages/create-cedar-app/templates/esm-js/scripts/jsconfig.json +++ b/packages/create-cedar-app/templates/esm-js/scripts/jsconfig.json @@ -2,9 +2,9 @@ "compilerOptions": { "noEmit": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "paths": { "$api/*": [ "../api/*" diff --git a/packages/create-cedar-app/templates/esm-ts/api/tsconfig.json b/packages/create-cedar-app/templates/esm-ts/api/tsconfig.json index 5d42753bb3..a04227fda6 100644 --- a/packages/create-cedar-app/templates/esm-ts/api/tsconfig.json +++ b/packages/create-cedar-app/templates/esm-ts/api/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": ["./src", "../.redwood/types/mirror/api/src"], "paths": { diff --git a/packages/create-cedar-app/templates/esm-ts/scripts/tsconfig.json b/packages/create-cedar-app/templates/esm-ts/scripts/tsconfig.json index 5e564ac694..3efd490424 100644 --- a/packages/create-cedar-app/templates/esm-ts/scripts/tsconfig.json +++ b/packages/create-cedar-app/templates/esm-ts/scripts/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "paths": { "$api/*": ["../api/*"], "api/*": ["../api/*"], diff --git a/packages/create-cedar-app/templates/js/api/jsconfig.json b/packages/create-cedar-app/templates/js/api/jsconfig.json index de06039ac7..53709970ef 100644 --- a/packages/create-cedar-app/templates/js/api/jsconfig.json +++ b/packages/create-cedar-app/templates/js/api/jsconfig.json @@ -2,9 +2,9 @@ "compilerOptions": { "noEmit": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": [ "./src", diff --git a/packages/create-cedar-app/templates/js/scripts/jsconfig.json b/packages/create-cedar-app/templates/js/scripts/jsconfig.json index e2e804685b..358ebdecfe 100644 --- a/packages/create-cedar-app/templates/js/scripts/jsconfig.json +++ b/packages/create-cedar-app/templates/js/scripts/jsconfig.json @@ -2,9 +2,9 @@ "compilerOptions": { "noEmit": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "paths": { "$api/*": [ "../api/*" diff --git a/packages/create-cedar-app/templates/ts/api/tsconfig.json b/packages/create-cedar-app/templates/ts/api/tsconfig.json index 5d42753bb3..a04227fda6 100644 --- a/packages/create-cedar-app/templates/ts/api/tsconfig.json +++ b/packages/create-cedar-app/templates/ts/api/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": ["./src", "../.redwood/types/mirror/api/src"], "paths": { diff --git a/packages/create-cedar-app/templates/ts/scripts/tsconfig.json b/packages/create-cedar-app/templates/ts/scripts/tsconfig.json index 5e564ac694..3efd490424 100644 --- a/packages/create-cedar-app/templates/ts/scripts/tsconfig.json +++ b/packages/create-cedar-app/templates/ts/scripts/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "paths": { "$api/*": ["../api/*"], "api/*": ["../api/*"], diff --git a/packages/forms/tsconfig.build.json b/packages/forms/tsconfig.build.json index 494547b45a..108d846c1d 100644 --- a/packages/forms/tsconfig.build.json +++ b/packages/forms/tsconfig.build.json @@ -4,7 +4,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo" }, "include": ["src"] diff --git a/packages/forms/tsconfig.json b/packages/forms/tsconfig.json index 725f885d67..107c9c8137 100644 --- a/packages/forms/tsconfig.json +++ b/packages/forms/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["."], "exclude": ["dist", "node_modules", "**/__mocks__", "**/__tests__/fixtures"] diff --git a/packages/jobs/tsconfig.build.json b/packages/jobs/tsconfig.build.json index 15254e0fa3..3aa95ce98f 100644 --- a/packages/jobs/tsconfig.build.json +++ b/packages/jobs/tsconfig.build.json @@ -3,7 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "dist", - "moduleResolution": "Node16", + "moduleResolution": "node16", "module": "Node16", "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo" }, diff --git a/packages/jobs/tsconfig.json b/packages/jobs/tsconfig.json index aa2201c48b..789aa54ff8 100644 --- a/packages/jobs/tsconfig.json +++ b/packages/jobs/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "moduleResolution": "Node16", + "moduleResolution": "node16", "module": "Node16", "emitDeclarationOnly": false, "noEmit": true diff --git a/packages/mailer/core/tsconfig.json b/packages/mailer/core/tsconfig.json index 55d7900bc6..57afc28cb1 100644 --- a/packages/mailer/core/tsconfig.json +++ b/packages/mailer/core/tsconfig.json @@ -4,7 +4,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16" + "moduleResolution": "node16" }, "include": ["src"] } diff --git a/packages/router/tsconfig.build.json b/packages/router/tsconfig.build.json index b221dd1ade..89c2f8c073 100644 --- a/packages/router/tsconfig.build.json +++ b/packages/router/tsconfig.build.json @@ -4,7 +4,7 @@ "rootDir": "src", "outDir": "dist", "module": "Node16", - "moduleResolution": "Node16", + "moduleResolution": "node16", "tsBuildInfoFile": "./tsconfig.build.tsbuildinfo" }, "include": ["src", "./ambient.d.ts", "./rsdw.modules.d.ts"], diff --git a/packages/router/tsconfig.json b/packages/router/tsconfig.json index 4cb2060d6b..6e94504ce3 100644 --- a/packages/router/tsconfig.json +++ b/packages/router/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "isolatedModules": true, - "moduleResolution": "Node16", + "moduleResolution": "node16", "module": "Node16", "outDir": "dist", "typeRoots": [ diff --git a/test-project/api/tsconfig.json b/test-project/api/tsconfig.json index daec0c0e1e..5a9e7a71df 100644 --- a/test-project/api/tsconfig.json +++ b/test-project/api/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "skipLibCheck": false, "rootDirs": ["./src", "../.redwood/types/mirror/api/src"], "paths": { diff --git a/test-project/packages/validators/tsconfig.json b/test-project/packages/validators/tsconfig.json index 6158fa5507..ba788255b9 100644 --- a/test-project/packages/validators/tsconfig.json +++ b/test-project/packages/validators/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { "composite": true, - "target": "ES2023", - "module": "Node20", + "target": "es2023", + "module": "node20", "esModuleInterop": true, "skipLibCheck": true, "baseUrl": ".", diff --git a/test-project/scripts/tsconfig.json b/test-project/scripts/tsconfig.json index 5e564ac694..3efd490424 100644 --- a/test-project/scripts/tsconfig.json +++ b/test-project/scripts/tsconfig.json @@ -3,9 +3,9 @@ "noEmit": true, "allowJs": true, "esModuleInterop": true, - "target": "ES2023", - "module": "Node20", - "moduleResolution": "Node16", + "target": "es2023", + "module": "node20", + "moduleResolution": "node16", "paths": { "$api/*": ["../api/*"], "api/*": ["../api/*"],