diff --git a/playground/ssr-deps/read-file-content/index.js b/playground/ssr-deps/read-file-content/index.js index 4cc6c34972defa..03b2e199b61f52 100644 --- a/playground/ssr-deps/read-file-content/index.js +++ b/playground/ssr-deps/read-file-content/index.js @@ -1,9 +1,6 @@ const path = require('node:path') module.exports = async function readFileContent(filePath) { - const fs = - process.versions.node.split('.')[0] >= '14' - ? require('node:fs/promises') - : require('node:fs').promises + const fs = require('node:fs/promises') return await fs.readFile(path.resolve(filePath), 'utf-8') } diff --git a/playground/ssr-webworker/package.json b/playground/ssr-webworker/package.json index 66fdc8b7afaa99..9f6c8c00534eab 100644 --- a/playground/ssr-webworker/package.json +++ b/playground/ssr-webworker/package.json @@ -4,13 +4,14 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "DEV=1 node worker", + "dev": "cross-env DEV=1 node worker", "build:worker": "vite build --ssr src/entry-worker.jsx --outDir dist/worker" }, "dependencies": { "react": "^18.2.0" }, "devDependencies": { + "cross-env": "^7.0.3", "miniflare": "^1.4.1", "resolve-linked": "workspace:*" } diff --git a/playground/ssr-webworker/src/entry-worker.jsx b/playground/ssr-webworker/src/entry-worker.jsx index 940d0d2943d632..750926653f9e31 100644 --- a/playground/ssr-webworker/src/entry-worker.jsx +++ b/playground/ssr-webworker/src/entry-worker.jsx @@ -1,8 +1,9 @@ import { msg as linkedMsg } from 'resolve-linked' import React from 'react' +let loaded = false import('./dynamic').then(({ foo }) => { - console.log(foo) + loaded = !!foo }) addEventListener('fetch', function (event) { @@ -12,6 +13,7 @@ addEventListener('fetch', function (event) {

hello from webworker

${linkedMsg}

${typeof React}

+

dynamic: ${loaded}

`, { headers: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3b00d19680be01..9204c91c20f944 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1090,12 +1090,14 @@ importers: playground/ssr-webworker: specifiers: + cross-env: ^7.0.3 miniflare: ^1.4.1 react: ^18.2.0 resolve-linked: workspace:* dependencies: react: 18.2.0 devDependencies: + cross-env: 7.0.3 miniflare: 1.4.1 resolve-linked: link:../resolve-linked