diff --git a/.github/workflows/test-integration-cli.yml b/.github/workflows/test-integration-cli.yml index 4ef40e68c..0456e1792 100644 --- a/.github/workflows/test-integration-cli.yml +++ b/.github/workflows/test-integration-cli.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - node: [14] + node: [12] runs-on: ${{ matrix.os }} env: TURBO_REMOTE_ONLY: true diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 78f0518db..c4c8f6b46 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -44,4 +44,4 @@ jobs: - run: yarn workspace vercel run coverage if: matrix.os == 'ubuntu-latest' && matrix.node == 14 # only run coverage once env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/api/tsconfig.json b/api/tsconfig.json index 3f930ba0b..b7e5e6845 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "ES2020", + "target": "esnext", "skipLibCheck": true, "strict": false, "forceConsistentCasingInFileNames": true, diff --git a/packages/build-utils/tsconfig.json b/packages/build-utils/tsconfig.json index 78e5da5b9..27c85fdba 100644 --- a/packages/build-utils/tsconfig.json +++ b/packages/build-utils/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": true, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -13,7 +13,7 @@ "outDir": "./dist", "types": ["node", "jest"], "strict": true, - "target": "ES2020" + "target": "es2019" }, "include": ["src/**/*"], "exclude": ["node_modules"] diff --git a/packages/cli/package.json b/packages/cli/package.json index a12881ae7..5c0d7c4bc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -40,7 +40,7 @@ ] }, "engines": { - "node": ">= 14" + "node": ">= 12" }, "dependencies": { "@vercel/build-utils": "3.1.1-canary.0", diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 00e3e3600..ad207e0df 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -5,10 +5,10 @@ "noFallthroughCasesInSwitch": true, "moduleResolution": "node", "module": "commonjs", - "target": "ES2020", + "target": "es2019", "esModuleInterop": true, "allowJs": true, - "lib": ["ES2020"], + "lib": ["esnext"], "resolveJsonModule": true, "sourceMap": true, "outDir": "./dist", diff --git a/packages/client/package.json b/packages/client/package.json index a0f278c94..76736bd9e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -20,7 +20,7 @@ "test-unit": "yarn test tests/unit.*test.*" }, "engines": { - "node": ">= 14" + "node": ">= 12" }, "devDependencies": { "@types/async-retry": "1.4.1", diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index 366c17969..fd017691e 100644 --- a/packages/client/tsconfig.json +++ b/packages/client/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": true, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "outDir": "dist", @@ -12,7 +12,7 @@ "noUnusedLocals": true, "noUnusedParameters": true, "strict": true, - "target": "ES2020" + "target": "es2019" }, "include": ["./src"] } diff --git a/packages/frameworks/tsconfig.json b/packages/frameworks/tsconfig.json index f9dcb8f8d..8174f7fdd 100644 --- a/packages/frameworks/tsconfig.json +++ b/packages/frameworks/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": true, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -13,7 +13,7 @@ "outDir": "./dist", "types": ["node", "jest"], "strict": true, - "target": "ES2020" + "target": "esnext" }, "include": ["src/*.ts"], "exclude": ["node_modules"] diff --git a/packages/go/tsconfig.json b/packages/go/tsconfig.json index 43956c3dc..7e081145c 100644 --- a/packages/go/tsconfig.json +++ b/packages/go/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": false, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -13,6 +13,6 @@ "noImplicitThis": false, "types": ["node"], "strict": true, - "target": "ES2020" + "target": "es2018" } } diff --git a/packages/next/tsconfig.json b/packages/next/tsconfig.json index fbf71d81a..4cc24fd01 100644 --- a/packages/next/tsconfig.json +++ b/packages/next/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "strict": true, "esModuleInterop": true, - "lib": ["ES2020"], - "target": "ES2020", + "lib": ["esnext"], + "target": "es2018", "module": "commonjs", "outDir": "dist", "sourceMap": false, diff --git a/packages/node-bridge/tsconfig.json b/packages/node-bridge/tsconfig.json index 3cd47c215..238855927 100644 --- a/packages/node-bridge/tsconfig.json +++ b/packages/node-bridge/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "allowJs": true, "checkJs": true, - "lib": ["ES2020"], + "lib": ["esnext"], "noEmit": true, "noImplicitReturns": true, "strict": true, diff --git a/packages/node/src/typescript.ts b/packages/node/src/typescript.ts index 8bd2fde4e..998e7ac67 100644 --- a/packages/node/src/typescript.ts +++ b/packages/node/src/typescript.ts @@ -450,6 +450,7 @@ export function fixConfig( delete config.compilerOptions.tsBuildInfoFile; delete config.compilerOptions.incremental; + // Target esnext output by default (instead of ES3). // This will prevent TS from polyfill/downlevel emit. if (config.compilerOptions.target === undefined) { // See https://github.com/tsconfig/bases/tree/main/bases diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 428029a3b..66c3f63ba 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "strict": true, "esModuleInterop": true, - "lib": ["ES2020"], - "target": "ES2020", + "lib": ["esnext"], + "target": "es2018", "module": "commonjs", "outDir": "dist", "sourceMap": false, diff --git a/packages/python/tsconfig.json b/packages/python/tsconfig.json index fa8d24ad9..25c0240ff 100644 --- a/packages/python/tsconfig.json +++ b/packages/python/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": true, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -13,7 +13,7 @@ "outDir": "dist", "types": ["node", "jest"], "strict": true, - "target": "ES2020" + "target": "es2018" }, "include": ["src/**/*"], "exclude": ["node_modules"] diff --git a/packages/redwood/tsconfig.json b/packages/redwood/tsconfig.json index 9ed3b7367..7734fbc21 100644 --- a/packages/redwood/tsconfig.json +++ b/packages/redwood/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": false, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -13,6 +13,6 @@ "outDir": "dist", "types": ["node"], "strict": true, - "target": "ES2020" + "target": "es2019" } } diff --git a/packages/remix/tsconfig.json b/packages/remix/tsconfig.json index c3de57e2b..ec15f71eb 100644 --- a/packages/remix/tsconfig.json +++ b/packages/remix/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": true, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -13,7 +13,7 @@ "outDir": "./dist", "types": ["node", "jest"], "strict": true, - "target": "ES2020", + "target": "es2019", "sourceMap": true }, "include": ["src/**/*"], diff --git a/packages/routing-utils/tsconfig.json b/packages/routing-utils/tsconfig.json index 1e558bbf8..f7055b450 100644 --- a/packages/routing-utils/tsconfig.json +++ b/packages/routing-utils/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "strict": true, "esModuleInterop": true, - "lib": ["ES2020"], - "target": "ES2020", + "lib": ["esnext"], + "target": "esnext", "module": "commonjs", "outDir": "dist", "sourceMap": false, diff --git a/packages/ruby/tsconfig.json b/packages/ruby/tsconfig.json index dc61dbbf1..56e32aacb 100644 --- a/packages/ruby/tsconfig.json +++ b/packages/ruby/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": true, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -12,6 +12,6 @@ "noUnusedParameters": true, "outDir": "dist", "strict": true, - "target": "ES2020" + "target": "esnext" } } diff --git a/packages/static-build/tsconfig.json b/packages/static-build/tsconfig.json index 45f910702..0a00e29f8 100644 --- a/packages/static-build/tsconfig.json +++ b/packages/static-build/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "declaration": false, "esModuleInterop": true, - "lib": ["ES2020"], + "lib": ["esnext"], "module": "commonjs", "moduleResolution": "node", "noEmitOnError": true, @@ -13,7 +13,7 @@ "outDir": "dist", "types": ["node", "jest"], "strict": true, - "target": "ES2020" + "target": "es2018" }, "include": ["src/**/*"], "exclude": ["test/fixtures"] diff --git a/packages/static-config/tsconfig.json b/packages/static-config/tsconfig.json index 8d5b658d6..64a78e702 100644 --- a/packages/static-config/tsconfig.json +++ b/packages/static-config/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "strict": true, "esModuleInterop": true, - "lib": ["ES2020"], - "target": "ES2020", + "lib": ["esnext"], + "target": "es2018", "module": "commonjs", "outDir": "dist", "sourceMap": true, diff --git a/test/lib/deployment/now-deploy.js b/test/lib/deployment/now-deploy.js index 558f577e3..72ed2a9fc 100644 --- a/test/lib/deployment/now-deploy.js +++ b/test/lib/deployment/now-deploy.js @@ -72,15 +72,7 @@ async function nowDeploy(bodies, randomness, uploadNowJson) { if (json.error && json.error.code === 'missing_files') throw new Error('Missing files'); deploymentId = json.id; - deploymentUrl = json.url || ''; - - if (!deploymentUrl.startsWith('https')) { - // if it doesn't look like an absolute URL, fetch will not work - console.log( - `Warning: deployment (${deploymentId}) returned deployment url of "${deploymentUrl}", which is not absolute. Prepending "https://".` - ); - deploymentUrl = 'https://' + deploymentUrl; - } + deploymentUrl = json.url; } logWithinTest('id', deploymentId); @@ -96,9 +88,7 @@ async function nowDeploy(bodies, randomness, uploadNowJson) { const { readyState } = deployment; if (readyState === 'ERROR') { logWithinTest('state is ERROR, throwing'); - const error = new Error( - `State of https://${deploymentUrl} is ERROR: ${deployment.errorMessage}` - ); + const error = new Error(`State of https://${deploymentUrl} is ERROR`); error.deployment = deployment; throw error; }