Unverified Commit 73e89d9f authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Replace deprecated `moduleResolution: "node"` (#92654)

parent 30b305e2
...@@ -351,7 +351,10 @@ ...@@ -351,7 +351,10 @@
"minizlib@3.1.0": "patches/minizlib@3.1.0.patch", "minizlib@3.1.0": "patches/minizlib@3.1.0.patch",
"http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch", "http-proxy@1.18.1": "patches/http-proxy@1.18.1.patch",
"web-vitals@4.2.1": "patches/web-vitals@4.2.1.patch", "web-vitals@4.2.1": "patches/web-vitals@4.2.1.patch",
"@rspack/core@1.6.7": "patches/@rspack__core@1.6.7.patch" "@rspack/core@1.6.7": "patches/@rspack__core@1.6.7.patch",
"@modelcontextprotocol/sdk": "patches/@modelcontextprotocol__sdk.patch",
"@vercel/blob": "patches/@vercel__blob.patch",
"postcss-scss": "patches/postcss-scss.patch"
} }
} }
} }
{ {
"compilerOptions": { "compilerOptions": {
"target": "es2015", "target": "es2015",
"moduleResolution": "node", "module": "ESNext",
"ignoreDeprecations": "6.0", "moduleResolution": "bundler",
"strict": true, "strict": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"esModuleInterop": true, "esModuleInterop": true,
......
{ {
"compilerOptions": { "compilerOptions": {
"target": "es2022", "target": "es2022",
"moduleResolution": "node", "module": "ESNext",
"ignoreDeprecations": "6.0", "moduleResolution": "bundler",
"strict": true, "strict": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"esModuleInterop": true, "esModuleInterop": true,
......
...@@ -63,7 +63,7 @@ export async function lazyPostCSS( ...@@ -63,7 +63,7 @@ export async function lazyPostCSS(
) { ) {
if (!postcssInstancePromise) { if (!postcssInstancePromise) {
postcssInstancePromise = (async () => { postcssInstancePromise = (async () => {
const postcss = require('postcss') as typeof import('postcss') const postcss = require('postcss') as typeof import('postcss').default
// @ts-ignore backwards compat // @ts-ignore backwards compat
postcss.plugin = function postcssPlugin(name, initializer) { postcss.plugin = function postcssPlugin(name, initializer) {
function creator(...args: any) { function creator(...args: any) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -27777,7 +27777,7 @@ module.exports = require("string_decoder"); ...@@ -27777,7 +27777,7 @@ module.exports = require("string_decoder");
/***/ }), /***/ }),
/***/ 573: /***/ 8740:
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
"use strict"; "use strict";
...@@ -29222,7 +29222,7 @@ Object.defineProperty(exports, "__esModule", ({value: true})); ...@@ -29222,7 +29222,7 @@ Object.defineProperty(exports, "__esModule", ({value: true}));
var _chunkZCP6UQNEcjs = __nccwpck_require__(573); var _chunkZCP6UQNEcjs = __nccwpck_require__(8740);
// src/del.ts // src/del.ts
async function del(urlOrPathname, options) { async function del(urlOrPathname, options) {
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
"jsx": "react-jsx", "jsx": "react-jsx",
"module": "ESNext", "module": "ESNext",
"target": "ES2018", "target": "ES2018",
"moduleResolution": "node", "moduleResolution": "bundler",
"ignoreDeprecations": "6.0",
"types": ["trusted-types", "jest", "node"], "types": ["trusted-types", "jest", "node"],
"paths": { "paths": {
// Required absolute paths. // Required absolute paths.
......
...@@ -485,9 +485,7 @@ declare module 'next/dist/compiled/@next/react-refresh-utils/dist/ReactRefreshWe ...@@ -485,9 +485,7 @@ declare module 'next/dist/compiled/@next/react-refresh-utils/dist/ReactRefreshWe
} }
declare module 'next/dist/compiled/commander' { declare module 'next/dist/compiled/commander' {
import commander from 'commander'
export * from 'commander' export * from 'commander'
export default commander
} }
declare module 'next/dist/compiled/node-html-parser' { declare module 'next/dist/compiled/node-html-parser' {
...@@ -571,11 +569,6 @@ declare module 'next/dist/compiled/@hapi/accept' { ...@@ -571,11 +569,6 @@ declare module 'next/dist/compiled/@hapi/accept' {
export = m export = m
} }
declare module 'next/dist/compiled/acorn' {
import m from 'acorn'
export = m
}
declare module 'next/dist/compiled/superstruct' { declare module 'next/dist/compiled/superstruct' {
import * as m from 'superstruct' import * as m from 'superstruct'
export = m export = m
...@@ -759,8 +752,7 @@ declare module 'next/dist/compiled/strip-ansi' { ...@@ -759,8 +752,7 @@ declare module 'next/dist/compiled/strip-ansi' {
export = m export = m
} }
declare module 'next/dist/compiled/@vercel/blob' { declare module 'next/dist/compiled/@vercel/blob' {
import m from '@vercel/blob' export * from '@vercel/blob'
export = m
} }
declare module 'next/dist/compiled/@vercel/nft' { declare module 'next/dist/compiled/@vercel/nft' {
import m from '@vercel/nft' import m from '@vercel/nft'
......
diff --git a/package.json b/package.json
index bb36a6d98d3f021a551543c868b10609c8dd7134..38bc7a65aad6bf5c0f0894c9b3619ee614ce66ef 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
"require": "./dist/cjs/server/index.js"
},
"./*": {
+ "types": "./dist/esm/*.d.ts",
"import": "./dist/esm/*",
"require": "./dist/cjs/*"
}
diff --git a/package.json b/package.json
index 7ac1dadcd87254c0ea5adb71dae477b9d38dcf83..293d7462e7efbbda826ab6d740c566e6e63a2989 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"type": "module",
"exports": {
".": {
+ "types": "./dist/index.d.ts",
"import": "./dist/index.js",
"require": "./dist/index.cjs"
},
diff --git a/package.json b/package.json
index 826e347ec40c413f99289c8069810702d79d2573..4419e5f77483599d2e6d4975415ac3b98e77215c 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"types": "lib/scss-syntax.d.ts",
"exports": {
".": {
+ "types": "./lib/scss-syntax.d.ts",
"require": "./lib/scss-syntax.js",
"import": "./lib/scss-syntax.mjs"
},
...@@ -25,18 +25,27 @@ overrides: ...@@ -25,18 +25,27 @@ overrides:
packageExtensionsChecksum: sha256-ylDR55omOZlT4Sfpfh6n7mO2r/cLCmlirAikJ/E/LAw= packageExtensionsChecksum: sha256-ylDR55omOZlT4Sfpfh6n7mO2r/cLCmlirAikJ/E/LAw=
patchedDependencies: patchedDependencies:
'@modelcontextprotocol/sdk':
hash: 680fe4edb7abd1de29d08cdf217a22506e815a8cc1c2282201d5d47aa3e5da12
path: patches/@modelcontextprotocol__sdk.patch
'@rspack/core@1.6.7': '@rspack/core@1.6.7':
hash: 4cf28ea116b0e27c7c80b09035905f9d16a7b18d1f2b7d312fc80d42cd57068d hash: 4cf28ea116b0e27c7c80b09035905f9d16a7b18d1f2b7d312fc80d42cd57068d
path: patches/@rspack__core@1.6.7.patch path: patches/@rspack__core@1.6.7.patch
'@types/node@20.17.6': '@types/node@20.17.6':
hash: 9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd hash: 9c31d25336aea4076b3cb942c35e59fd160c540947f01ea455a060367153f9fd
path: patches/@types__node@20.17.6.patch path: patches/@types__node@20.17.6.patch
'@vercel/blob':
hash: cb53bfa5effb15b3a361e176003df667cadf757b27b7c9b458c2f0fce86ea893
path: patches/@vercel__blob.patch
http-proxy@1.18.1: http-proxy@1.18.1:
hash: 3aac1c597fabd03f9fb4e3fd6e689b87012758d4fed06f296541f9dc3b8d7b39 hash: 3aac1c597fabd03f9fb4e3fd6e689b87012758d4fed06f296541f9dc3b8d7b39
path: patches/http-proxy@1.18.1.patch path: patches/http-proxy@1.18.1.patch
minizlib@3.1.0: minizlib@3.1.0:
hash: 587688821244aaee46680929cd869947377a284ac1b30c9ae8660a5ea7d2be67 hash: 587688821244aaee46680929cd869947377a284ac1b30c9ae8660a5ea7d2be67
path: patches/minizlib@3.1.0.patch path: patches/minizlib@3.1.0.patch
postcss-scss:
hash: 88893e632b3e099730dc0ffcc93cf3654b31c277da9e2796e822f6b5aeedc093
path: patches/postcss-scss.patch
stacktrace-parser@0.1.10: stacktrace-parser@0.1.10:
hash: 5e07adcb70fa52f969ea76c939668fd09762774a60ec849622e44e5362354dd5 hash: 5e07adcb70fa52f969ea76c939668fd09762774a60ec849622e44e5362354dd5
path: patches/stacktrace-parser@0.1.10.patch path: patches/stacktrace-parser@0.1.10.patch
...@@ -1213,7 +1222,7 @@ importers: ...@@ -1213,7 +1222,7 @@ importers:
version: 29.5.0 version: 29.5.0
'@modelcontextprotocol/sdk': '@modelcontextprotocol/sdk':
specifier: 1.18.1 specifier: 1.18.1
version: 1.18.1 version: 1.18.1(patch_hash=680fe4edb7abd1de29d08cdf217a22506e815a8cc1c2282201d5d47aa3e5da12)
'@mswjs/interceptors': '@mswjs/interceptors':
specifier: 0.23.0 specifier: 0.23.0
version: 0.23.0 version: 0.23.0
...@@ -1384,7 +1393,7 @@ importers: ...@@ -1384,7 +1393,7 @@ importers:
version: 8.2.0 version: 8.2.0
'@vercel/blob': '@vercel/blob':
specifier: 2.3.2 specifier: 2.3.2
version: 2.3.2 version: 2.3.2(patch_hash=cb53bfa5effb15b3a361e176003df667cadf757b27b7c9b458c2f0fce86ea893)
'@vercel/ncc': '@vercel/ncc':
specifier: 0.34.0 specifier: 0.34.0
version: 0.34.0 version: 0.34.0
...@@ -1639,7 +1648,7 @@ importers: ...@@ -1639,7 +1648,7 @@ importers:
version: 6.0.0(postcss@8.4.31) version: 6.0.0(postcss@8.4.31)
postcss-scss: postcss-scss:
specifier: 4.0.3 specifier: 4.0.3
version: 4.0.3(postcss@8.4.31) version: 4.0.3(patch_hash=88893e632b3e099730dc0ffcc93cf3654b31c277da9e2796e822f6b5aeedc093)(postcss@8.4.31)
postcss-value-parser: postcss-value-parser:
specifier: 4.2.0 specifier: 4.2.0
version: 4.2.0 version: 4.2.0
...@@ -21638,7 +21647,7 @@ snapshots: ...@@ -21638,7 +21647,7 @@ snapshots:
'@types/react': 19.2.10 '@types/react': 19.2.10
react: 19.3.0-canary-fef12a01-20260413 react: 19.3.0-canary-fef12a01-20260413
'@modelcontextprotocol/sdk@1.18.1': '@modelcontextprotocol/sdk@1.18.1(patch_hash=680fe4edb7abd1de29d08cdf217a22506e815a8cc1c2282201d5d47aa3e5da12)':
dependencies: dependencies:
ajv: 6.12.6 ajv: 6.12.6
content-type: 1.0.5 content-type: 1.0.5
...@@ -24690,7 +24699,7 @@ snapshots: ...@@ -24690,7 +24699,7 @@ snapshots:
- react-native-b4a - react-native-b4a
- supports-color - supports-color
'@vercel/blob@2.3.2': '@vercel/blob@2.3.2(patch_hash=cb53bfa5effb15b3a361e176003df667cadf757b27b7c9b458c2f0fce86ea893)':
dependencies: dependencies:
async-retry: 1.3.3 async-retry: 1.3.3
is-buffer: 2.0.5 is-buffer: 2.0.5
...@@ -35495,7 +35504,7 @@ snapshots: ...@@ -35495,7 +35504,7 @@ snapshots:
dependencies: dependencies:
postcss: 8.4.31 postcss: 8.4.31
postcss-scss@4.0.3(postcss@8.4.31): postcss-scss@4.0.3(patch_hash=88893e632b3e099730dc0ffcc93cf3654b31c277da9e2796e822f6b5aeedc093)(postcss@8.4.31):
dependencies: dependencies:
postcss: 8.4.31 postcss: 8.4.31
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
"jsx": "react-jsx", "jsx": "react-jsx",
"module": "ESNext", "module": "ESNext",
"target": "ESNext", "target": "ESNext",
"moduleResolution": "node", "moduleResolution": "bundler",
"ignoreDeprecations": "6.0",
"types": ["react", "jest", "node", "trusted-types", "jest-extended"], "types": ["react", "jest", "node", "trusted-types", "jest-extended"],
"paths": { "paths": {
"development-sandbox": ["./test/lib/development-sandbox"], "development-sandbox": ["./test/lib/development-sandbox"],
......
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
// environment // environment
"lib": ["ESNext"], "lib": ["ESNext"],
"target": "esnext", "target": "esnext",
"ignoreDeprecations": "6.0",
// modules // modules
"module": "esnext", "module": "esnext",
"moduleResolution": "node", "moduleResolution": "bundler",
// emit // emit
"noEmit": true, "noEmit": true,
......
// Compile with pnpm tsc turbopack/crates/turbopack-tests/tests/snapshot/source_maps/input-source-map-merged/input/sourcemapped.ts --sourceMap --inlineSources --target esnext // Compile with pnpm tsc turbopack/crates/turbopack-tests/tests/snapshot/source_maps/input-source-map-merged/sourcemapped.ts --sourceMap --inlineSources --target esnext
// tsc compile errors can be ignored // tsc compile errors can be ignored
type Fn<T> = () => T type Fn<T> = () => T
export function runExternalSourceMapped<T>(fn: Fn<T>): T { export function runExternalSourceMapped<T>(fn: Fn<T>): T {
......
// Compile with pnpm tsc turbopack/crates/turbopack-tests/tests/snapshot/source_maps/input-source-map/input/sourcemapped.ts --sourceMap --inlineSources --target esnext // Compile with pnpm tsc turbopack/crates/turbopack-tests/tests/snapshot/source_maps/input-source-map/sourcemapped.ts --sourceMap --inlineSources --target esnext
// tsc compile errors can be ignored // tsc compile errors can be ignored
type Fn<T> = () => T type Fn<T> = () => T
export function runExternalSourceMapped<T>(fn: Fn<T>): T { export function runExternalSourceMapped<T>(fn: Fn<T>): T {
......
{ {
"compilerOptions": { "compilerOptions": {
"target": "ES2018", "target": "ES2018",
"module": "commonjs", "module": "NodeNext",
"moduleResolution": "node", "moduleResolution": "NodeNext",
"ignoreDeprecations": "6.0",
"strict": true, "strict": true,
"importHelpers": false, "importHelpers": false,
"noEmitHelpers": false, "noEmitHelpers": false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment