diff --git a/examples/next-css/component/hello-world.tsx b/examples/next-css/component/hello-world.tsx index 8ecbf5bec3..3efb95e8e8 100644 --- a/examples/next-css/component/hello-world.tsx +++ b/examples/next-css/component/hello-world.tsx @@ -1,5 +1,5 @@ import css from "./hello-world.module.css"; - +console.log('css:',css); export default function HelloWorld() { return (
diff --git a/packages/next/src/build/webpack/plugins/profiling-plugin.ts b/packages/next/src/build/webpack/plugins/profiling-plugin.ts index 462ea0eebe..2ae8faf47f 100644 --- a/packages/next/src/build/webpack/plugins/profiling-plugin.ts +++ b/packages/next/src/build/webpack/plugins/profiling-plugin.ts @@ -221,9 +221,23 @@ export class ProfilingPlugin { traceChild() { return { traceFn(fn: any) { - return fn() + return fn(); + }, + traceAsyncFn(fn:any){ + return fn(); }, setAttribute() {}, + traceChild(){ + return { + traceFn(fn: any) { + return fn(); + }, + traceAsyncFn(fn:any){ + return fn(); + }, + setAttribute() {}, + } + } } }, } diff --git a/packages/next/src/server/require.ts b/packages/next/src/server/require.ts index 3d77e90647..eb6ec0019b 100644 --- a/packages/next/src/server/require.ts +++ b/packages/next/src/server/require.ts @@ -133,7 +133,7 @@ export async function requirePage( export function requireFontManifest(distDir: string) { const serverBuildPath = path.join(distDir, SERVER_DIRECTORY) - return {} + return {} as FontManifest; const fontManifest = loadManifest( path.join(serverBuildPath, AUTOMATIC_FONT_OPTIMIZATION_MANIFEST) ) as FontManifest diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7d024b58a..d00049abfe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -711,6 +711,31 @@ importers: specifier: ^1.1.0 version: 1.1.0 + examples/next-css: + dependencies: + next: + specifier: latest + version: link:../../packages/next + react: + specifier: 19.0.0-rc-6230622a1a-20240610 + version: 19.0.0-rc-6230622a1a-20240610 + react-dom: + specifier: 19.0.0-rc-6230622a1a-20240610 + version: 19.0.0-rc-6230622a1a-20240610(react@19.0.0-rc-6230622a1a-20240610) + devDependencies: + '@types/node': + specifier: 20.12.3 + version: 20.12.3 + '@types/react': + specifier: npm:types-react@19.0.0-rc.0 + version: types-react@19.0.0-rc.0 + '@types/react-dom': + specifier: npm:types-react-dom@19.0.0-rc.0 + version: types-react-dom@19.0.0-rc.0 + typescript: + specifier: 4.8.4 + version: 4.8.4 + packages/create-next-app: devDependencies: '@types/async-retry': @@ -14208,8 +14233,8 @@ packages: types-react@19.0.0-rc.0: resolution: {integrity: sha512-JFd3qtgXZ+EdHht8WXMPSF231brd6Bu4yLKqyo0JjpzhmjYxJptT6TBh/xFqOhx+ee2Nagj7Ttkh5F/jc49TVQ==} - typescript@4.8.2: - resolution: {integrity: sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==} + typescript@4.8.4: + resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==} engines: {node: '>=4.2.0'} hasBin: true @@ -26369,13 +26394,13 @@ snapshots: rollup-plugin-bundle-size: 1.0.3 rollup-plugin-postcss: 4.0.0(postcss@8.4.31) rollup-plugin-terser: 7.0.2(rollup@2.35.1) - rollup-plugin-typescript2: 0.29.0(rollup@2.35.1)(typescript@4.8.2) + rollup-plugin-typescript2: 0.29.0(rollup@2.35.1)(typescript@4.8.4) rollup-plugin-visualizer: 5.6.0(rollup@2.35.1) sade: 1.7.4 terser: 5.27.0 tiny-glob: 0.2.8 tslib: 2.4.0 - typescript: 4.8.2 + typescript: 4.8.4 transitivePeerDependencies: - '@types/babel__core' - supports-color @@ -29424,7 +29449,7 @@ snapshots: serialize-javascript: 4.0.0 terser: 5.27.0 - rollup-plugin-typescript2@0.29.0(rollup@2.35.1)(typescript@4.8.2): + rollup-plugin-typescript2@0.29.0(rollup@2.35.1)(typescript@4.8.4): dependencies: '@rollup/pluginutils': 3.1.0(rollup@2.35.1) find-cache-dir: 3.3.1 @@ -29432,7 +29457,7 @@ snapshots: resolve: 1.17.0 rollup: 2.35.1 tslib: 2.0.1 - typescript: 4.8.2 + typescript: 4.8.4 rollup-plugin-visualizer@5.6.0(rollup@2.35.1): dependencies: @@ -30795,7 +30820,7 @@ snapshots: dependencies: csstype: 3.1.2 - typescript@4.8.2: {} + typescript@4.8.4: {} typescript@5.5.3: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 9507311d18..f6575995e6 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,3 +2,4 @@ packages: - 'packages/*' - 'bench/*' - 'packages/next-swc/crates/next-core/js' + - 'examples/next-css'