diff options
Diffstat (limited to 'packages/integrations')
42 files changed, 86 insertions, 87 deletions
diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts index 22439c4ac..ef452aa95 100644 --- a/packages/integrations/cloudflare/src/index.ts +++ b/packages/integrations/cloudflare/src/index.ts @@ -1,11 +1,11 @@ import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects'; import type { AstroAdapter, AstroConfig, AstroIntegration, RouteData } from 'astro'; import esbuild from 'esbuild'; -import * as fs from 'fs'; -import * as os from 'os'; -import { sep } from 'path'; +import * as fs from 'node:fs'; +import * as os from 'node:os'; +import { sep } from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; import glob from 'tiny-glob'; -import { fileURLToPath, pathToFileURL } from 'url'; type Options = { mode: 'directory' | 'advanced'; diff --git a/packages/integrations/cloudflare/test/test-utils.js b/packages/integrations/cloudflare/test/test-utils.js index bff7fb2a4..90147a7f6 100644 --- a/packages/integrations/cloudflare/test/test-utils.js +++ b/packages/integrations/cloudflare/test/test-utils.js @@ -1,6 +1,6 @@ +import { spawn } from 'node:child_process'; +import { fileURLToPath } from 'node:url'; import { loadFixture as baseLoadFixture } from '../../../astro/test/test-utils.js'; -import { spawn } from 'child_process'; -import { fileURLToPath } from 'url'; export { fixLineEndings } from '../../../astro/test/test-utils.js'; diff --git a/packages/integrations/deno/src/index.ts b/packages/integrations/deno/src/index.ts index 93e51289b..986449b18 100644 --- a/packages/integrations/deno/src/index.ts +++ b/packages/integrations/deno/src/index.ts @@ -1,8 +1,8 @@ import type { AstroAdapter, AstroIntegration } from 'astro'; import esbuild from 'esbuild'; -import * as fs from 'fs'; -import * as npath from 'path'; -import { fileURLToPath } from 'url'; +import * as fs from 'node:fs'; +import * as npath from 'node:path'; +import { fileURLToPath } from 'node:url'; interface BuildConfig { server: URL; diff --git a/packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro b/packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro index 35c47793f..6d666e504 100644 --- a/packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro +++ b/packages/integrations/deno/test/fixtures/basics/src/pages/nodecompat.astro @@ -1,6 +1,6 @@ --- // unprefixed node built-in module -import path from 'path' +import path from 'node:path' // prefixed node built-in module import os from 'node:os' @@ -12,4 +12,4 @@ import os from 'node:os' <code>{os.arch()}</code> </details> <p>Everything went fine.</p> -</body>
\ No newline at end of file +</body> diff --git a/packages/integrations/image/src/vendor/squoosh/avif/avif_node_dec.ts b/packages/integrations/image/src/vendor/squoosh/avif/avif_node_dec.ts index b432feefd..9e515108e 100644 --- a/packages/integrations/image/src/vendor/squoosh/avif/avif_node_dec.ts +++ b/packages/integrations/image/src/vendor/squoosh/avif/avif_node_dec.ts @@ -41,13 +41,13 @@ var Module = (function () { var nodePath if (ENVIRONMENT_IS_NODE) { if (ENVIRONMENT_IS_WORKER) { - scriptDirectory = require('path').dirname(scriptDirectory) + '/' + scriptDirectory = require('node:path').dirname(scriptDirectory) + '/' } else { scriptDirectory = dirname(getModuleURL(import.meta.url)) + '/' } read_ = function shell_read(filename, binary) { - if (!nodeFS) nodeFS = require('fs') - if (!nodePath) nodePath = require('path') + if (!nodeFS) nodeFS = require('node:fs') + if (!nodePath) nodePath = require('node:path') filename = nodePath['normalize'](filename) return nodeFS['readFileSync'](filename, binary ? null : 'utf8') } diff --git a/packages/integrations/image/src/vendor/squoosh/avif/avif_node_enc.ts b/packages/integrations/image/src/vendor/squoosh/avif/avif_node_enc.ts index 933d1a7c9..0236e494b 100644 --- a/packages/integrations/image/src/vendor/squoosh/avif/avif_node_enc.ts +++ b/packages/integrations/image/src/vendor/squoosh/avif/avif_node_enc.ts @@ -41,13 +41,13 @@ var Module = (function () { var nodePath if (ENVIRONMENT_IS_NODE) { if (ENVIRONMENT_IS_WORKER) { - scriptDirectory = require('path').dirname(scriptDirectory) + '/' + scriptDirectory = require('node:path').dirname(scriptDirectory) + '/' } else { scriptDirectory = dirname(getModuleURL(import.meta.url)) + '/' } read_ = function shell_read(filename, binary) { - if (!nodeFS) nodeFS = require('fs') - if (!nodePath) nodePath = require('path') + if (!nodeFS) nodeFS = require('node:fs') + if (!nodePath) nodePath = require('node:path') filename = nodePath['normalize'](filename) return nodeFS['readFileSync'](filename, binary ? null : 'utf8') } diff --git a/packages/integrations/image/src/vendor/squoosh/image-pool.ts b/packages/integrations/image/src/vendor/squoosh/image-pool.ts index 04606285b..7187bbe92 100644 --- a/packages/integrations/image/src/vendor/squoosh/image-pool.ts +++ b/packages/integrations/image/src/vendor/squoosh/image-pool.ts @@ -1,6 +1,6 @@ +import { cpus } from 'node:os'; +import { fileURLToPath } from 'node:url'; import { isMainThread } from 'node:worker_threads'; -import { cpus } from 'os'; -import { fileURLToPath } from 'url'; import type { OutputFormat } from '../../loaders/index.js'; import execOnce from '../../utils/execOnce.js'; import WorkerPool from '../../utils/workerPool.js'; diff --git a/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_dec.ts b/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_dec.ts index 720508a42..f9f2bc6e1 100644 --- a/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_dec.ts +++ b/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_dec.ts @@ -41,13 +41,13 @@ var Module = (function () { var nodePath if (ENVIRONMENT_IS_NODE) { if (ENVIRONMENT_IS_WORKER) { - scriptDirectory = require('path').dirname(scriptDirectory) + '/' + scriptDirectory = require('node:path').dirname(scriptDirectory) + '/' } else { scriptDirectory = dirname(getModuleURL(import.meta.url)) + '/' } read_ = function shell_read(filename, binary) { - if (!nodeFS) nodeFS = require('fs') - if (!nodePath) nodePath = require('path') + if (!nodeFS) nodeFS = require('node:fs') + if (!nodePath) nodePath = require('node:path') filename = nodePath['normalize'](filename) return nodeFS['readFileSync'](filename, binary ? null : 'utf8') } diff --git a/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_enc.ts b/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_enc.ts index b5fee7365..6adf50e8b 100644 --- a/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_enc.ts +++ b/packages/integrations/image/src/vendor/squoosh/mozjpeg/mozjpeg_node_enc.ts @@ -41,13 +41,13 @@ var Module = (function () { var nodePath if (ENVIRONMENT_IS_NODE) { if (ENVIRONMENT_IS_WORKER) { - scriptDirectory = require('path').dirname(scriptDirectory) + '/' + scriptDirectory = require('node:path').dirname(scriptDirectory) + '/' } else { scriptDirectory = dirname(getModuleURL(import.meta.url)) + '/' } read_ = function shell_read(filename, binary) { - if (!nodeFS) nodeFS = require('fs') - if (!nodePath) nodePath = require('path') + if (!nodeFS) nodeFS = require('node:fs') + if (!nodePath) nodePath = require('node:path') filename = nodePath['normalize'](filename) return nodeFS['readFileSync'](filename, binary ? null : 'utf8') } diff --git a/packages/integrations/image/src/vendor/squoosh/webp/webp_node_dec.ts b/packages/integrations/image/src/vendor/squoosh/webp/webp_node_dec.ts index cdb1a9837..dafa790da 100644 --- a/packages/integrations/image/src/vendor/squoosh/webp/webp_node_dec.ts +++ b/packages/integrations/image/src/vendor/squoosh/webp/webp_node_dec.ts @@ -41,13 +41,13 @@ var Module = (function () { var nodePath if (ENVIRONMENT_IS_NODE) { if (ENVIRONMENT_IS_WORKER) { - scriptDirectory = require('path').dirname(scriptDirectory) + '/' + scriptDirectory = require('node:path').dirname(scriptDirectory) + '/' } else { scriptDirectory = dirname(getModuleURL(import.meta.url)) + '/' } read_ = function shell_read(filename, binary) { - if (!nodeFS) nodeFS = require('fs') - if (!nodePath) nodePath = require('path') + if (!nodeFS) nodeFS = require('node:fs') + if (!nodePath) nodePath = require('node:path') filename = nodePath['normalize'](filename) return nodeFS['readFileSync'](filename, binary ? null : 'utf8') } diff --git a/packages/integrations/image/src/vendor/squoosh/webp/webp_node_enc.ts b/packages/integrations/image/src/vendor/squoosh/webp/webp_node_enc.ts index d1c350d2b..88d5d267f 100644 --- a/packages/integrations/image/src/vendor/squoosh/webp/webp_node_enc.ts +++ b/packages/integrations/image/src/vendor/squoosh/webp/webp_node_enc.ts @@ -41,13 +41,13 @@ var Module = (function () { var nodePath if (ENVIRONMENT_IS_NODE) { if (ENVIRONMENT_IS_WORKER) { - scriptDirectory = require('path').dirname(scriptDirectory) + '/' + scriptDirectory = require('node:path').dirname(scriptDirectory) + '/' } else { scriptDirectory = dirname(getModuleURL(import.meta.url)) + '/' } read_ = function shell_read(filename, binary) { - if (!nodeFS) nodeFS = require('fs') - if (!nodePath) nodePath = require('path') + if (!nodeFS) nodeFS = require('node:fs') + if (!nodePath) nodePath = require('node:path') filename = nodePath['normalize'](filename) return nodeFS['readFileSync'](filename, binary ? null : 'utf8') } diff --git a/packages/integrations/image/test/background-color-image-ssg.test.js b/packages/integrations/image/test/background-color-image-ssg.test.js index ea55d7ae1..6723ac1d5 100644 --- a/packages/integrations/image/test/background-color-image-ssg.test.js +++ b/packages/integrations/image/test/background-color-image-ssg.test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; import sharp from 'sharp'; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; import { loadFixture } from './test-utils.js'; describe('SSG image with background - dev', function () { diff --git a/packages/integrations/image/test/fixtures/background-color-image/server/server.mjs b/packages/integrations/image/test/fixtures/background-color-image/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/background-color-image/server/server.mjs +++ b/packages/integrations/image/test/fixtures/background-color-image/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/fixtures/basic-image/server/server.mjs b/packages/integrations/image/test/fixtures/basic-image/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/basic-image/server/server.mjs +++ b/packages/integrations/image/test/fixtures/basic-image/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/fixtures/basic-picture/server/server.mjs b/packages/integrations/image/test/fixtures/basic-picture/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/basic-picture/server/server.mjs +++ b/packages/integrations/image/test/fixtures/basic-picture/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/fixtures/no-alt-text-image/server/server.mjs b/packages/integrations/image/test/fixtures/no-alt-text-image/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/no-alt-text-image/server/server.mjs +++ b/packages/integrations/image/test/fixtures/no-alt-text-image/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/fixtures/no-alt-text-picture/server/server.mjs b/packages/integrations/image/test/fixtures/no-alt-text-picture/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/no-alt-text-picture/server/server.mjs +++ b/packages/integrations/image/test/fixtures/no-alt-text-picture/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/fixtures/rotation/server/server.mjs b/packages/integrations/image/test/fixtures/rotation/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/rotation/server/server.mjs +++ b/packages/integrations/image/test/fixtures/rotation/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/fixtures/squoosh-service/server/server.mjs b/packages/integrations/image/test/fixtures/squoosh-service/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/squoosh-service/server/server.mjs +++ b/packages/integrations/image/test/fixtures/squoosh-service/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/fixtures/with-mdx/server/server.mjs b/packages/integrations/image/test/fixtures/with-mdx/server/server.mjs index d7a0a7a40..7dd4756af 100644 --- a/packages/integrations/image/test/fixtures/with-mdx/server/server.mjs +++ b/packages/integrations/image/test/fixtures/with-mdx/server/server.mjs @@ -1,6 +1,6 @@ -import { createServer } from 'http'; -import fs from 'fs'; import mime from 'mime'; +import fs from 'node:fs'; +import { createServer } from 'node:http'; import { handler as ssrHandler } from '../dist/server/entry.mjs'; const clientRoot = new URL('../dist/client/', import.meta.url); diff --git a/packages/integrations/image/test/image-ssg.test.js b/packages/integrations/image/test/image-ssg.test.js index 12b3ffea9..a1be5df02 100644 --- a/packages/integrations/image/test/image-ssg.test.js +++ b/packages/integrations/image/test/image-ssg.test.js @@ -1,9 +1,9 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; import sizeOf from 'image-size'; -import fs from 'fs/promises'; -import { fileURLToPath, pathToFileURL } from 'node:url'; +import fs from 'node:fs/promises'; import { join } from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; import { loadFixture } from './test-utils.js'; const __dirname = fileURLToPath(new URL('.', import.meta.url)); diff --git a/packages/integrations/image/test/picture-ssg.test.js b/packages/integrations/image/test/picture-ssg.test.js index 6601e74f7..e74b4583d 100644 --- a/packages/integrations/image/test/picture-ssg.test.js +++ b/packages/integrations/image/test/picture-ssg.test.js @@ -1,12 +1,11 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; -import fs from 'fs'; import sizeOf from 'image-size'; -import path from 'path'; +import fs from 'node:fs'; +import path, { join } from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; -import { join } from 'node:path'; -import { loadFixture } from './test-utils.js'; import srcsetParse from 'srcset-parse'; +import { loadFixture } from './test-utils.js'; const matchSrcset = srcsetParse.default; diff --git a/packages/integrations/image/test/rotation.test.js b/packages/integrations/image/test/rotation.test.js index baa412e2c..2477ec8b2 100644 --- a/packages/integrations/image/test/rotation.test.js +++ b/packages/integrations/image/test/rotation.test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; import sizeOf from 'image-size'; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; import { loadFixture } from './test-utils.js'; let fixture; diff --git a/packages/integrations/image/test/with-mdx.test.js b/packages/integrations/image/test/with-mdx.test.js index ec7de4f62..6b44bb6d4 100644 --- a/packages/integrations/image/test/with-mdx.test.js +++ b/packages/integrations/image/test/with-mdx.test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as cheerio from 'cheerio'; import sizeOf from 'image-size'; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; import { loadFixture } from './test-utils.js'; describe('Images in MDX - build', function () { diff --git a/packages/integrations/netlify/src/shared.ts b/packages/integrations/netlify/src/shared.ts index 91ce49ef6..175b9d04f 100644 --- a/packages/integrations/netlify/src/shared.ts +++ b/packages/integrations/netlify/src/shared.ts @@ -2,8 +2,8 @@ import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects'; import type { AstroConfig, RouteData } from 'astro'; import esbuild from 'esbuild'; import fs from 'node:fs'; -import npath from 'path'; -import { fileURLToPath } from 'url'; +import npath from 'node:path'; +import { fileURLToPath } from 'node:url'; export const DENO_SHIM = `globalThis.process = { argv: [], diff --git a/packages/integrations/netlify/test/functions/test-utils.js b/packages/integrations/netlify/test/functions/test-utils.js index eff6c2782..bed187962 100644 --- a/packages/integrations/netlify/test/functions/test-utils.js +++ b/packages/integrations/netlify/test/functions/test-utils.js @@ -1,5 +1,5 @@ // @ts-check -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; export * from '../../../../astro/test/test-utils.js'; diff --git a/packages/integrations/netlify/test/static/test-utils.js b/packages/integrations/netlify/test/static/test-utils.js index 02b5d2ad9..f57abab1d 100644 --- a/packages/integrations/netlify/test/static/test-utils.js +++ b/packages/integrations/netlify/test/static/test-utils.js @@ -1,5 +1,5 @@ // @ts-check -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; export * from '../../../../astro/test/test-utils.js'; diff --git a/packages/integrations/node/README.md b/packages/integrations/node/README.md index 4c2f8a389..e2b78038f 100644 --- a/packages/integrations/node/README.md +++ b/packages/integrations/node/README.md @@ -108,7 +108,7 @@ Or, with Fastify (>4): import Fastify from 'fastify'; import fastifyMiddie from '@fastify/middie'; import fastifyStatic from '@fastify/static'; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; import { handler as ssrHandler } from './dist/server/entry.mjs'; const app = Fastify({ logger: true }); diff --git a/packages/integrations/node/src/createOutgoingHttpHeaders.ts b/packages/integrations/node/src/createOutgoingHttpHeaders.ts index 80269489e..e6c0c0ba4 100644 --- a/packages/integrations/node/src/createOutgoingHttpHeaders.ts +++ b/packages/integrations/node/src/createOutgoingHttpHeaders.ts @@ -1,4 +1,4 @@ -import type { OutgoingHttpHeaders } from 'http'; +import type { OutgoingHttpHeaders } from 'node:http'; /** * Takes in a nullable WebAPI Headers object and produces a NodeJS OutgoingHttpHeaders object suitable for usage diff --git a/packages/integrations/node/src/http-server.ts b/packages/integrations/node/src/http-server.ts index 2b0252c6e..2f2339cdf 100644 --- a/packages/integrations/node/src/http-server.ts +++ b/packages/integrations/node/src/http-server.ts @@ -1,9 +1,9 @@ -import fs from 'fs'; -import http from 'http'; import https from 'https'; +import fs from 'node:fs'; +import http from 'node:http'; +import { fileURLToPath } from 'node:url'; import send from 'send'; import enableDestroy from 'server-destroy'; -import { fileURLToPath } from 'url'; interface CreateServerOptions { client: URL; diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts index 63ba246bd..4963afc9f 100644 --- a/packages/integrations/node/src/nodeMiddleware.ts +++ b/packages/integrations/node/src/nodeMiddleware.ts @@ -1,5 +1,5 @@ import type { NodeApp } from 'astro/app/node'; -import type { IncomingMessage, ServerResponse } from 'http'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import type { Readable } from 'stream'; import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders'; import { responseIterator } from './response-iterator'; diff --git a/packages/integrations/node/src/preview.ts b/packages/integrations/node/src/preview.ts index 86e37f0d1..92f9b86ba 100644 --- a/packages/integrations/node/src/preview.ts +++ b/packages/integrations/node/src/preview.ts @@ -1,6 +1,6 @@ import type { CreatePreviewServer } from 'astro'; -import type http from 'http'; -import { fileURLToPath } from 'url'; +import type http from 'node:http'; +import { fileURLToPath } from 'node:url'; import { createServer } from './http-server.js'; import type { createExports } from './server'; diff --git a/packages/integrations/node/src/standalone.ts b/packages/integrations/node/src/standalone.ts index 85eb3822a..68b2cebcd 100644 --- a/packages/integrations/node/src/standalone.ts +++ b/packages/integrations/node/src/standalone.ts @@ -1,7 +1,7 @@ import type { NodeApp } from 'astro/app/node'; import https from 'https'; -import path from 'path'; -import { fileURLToPath } from 'url'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import { createServer } from './http-server.js'; import middleware from './nodeMiddleware.js'; import type { Options } from './types'; diff --git a/packages/integrations/node/test/test-utils.js b/packages/integrations/node/test/test-utils.js index 741564914..70ceaed25 100644 --- a/packages/integrations/node/test/test-utils.js +++ b/packages/integrations/node/test/test-utils.js @@ -1,5 +1,5 @@ -import { EventEmitter } from 'events'; import httpMocks from 'node-mocks-http'; +import { EventEmitter } from 'node:events'; import { loadFixture as baseLoadFixture } from '../../../astro/test/test-utils.js'; /** diff --git a/packages/integrations/node/test/url-protocol.test.js b/packages/integrations/node/test/url-protocol.test.js index 0da4bdeb0..a83cb2a41 100644 --- a/packages/integrations/node/test/url-protocol.test.js +++ b/packages/integrations/node/test/url-protocol.test.js @@ -1,7 +1,7 @@ -import { TLSSocket } from 'tls'; -import nodejs from '../dist/index.js'; -import { loadFixture, createRequestAndResponse } from './test-utils.js'; import { expect } from 'chai'; +import { TLSSocket } from 'node:tls'; +import nodejs from '../dist/index.js'; +import { createRequestAndResponse, loadFixture } from './test-utils.js'; describe('URL protocol', () => { /** @type {import('./test-utils').Fixture} */ diff --git a/packages/integrations/partytown/src/index.ts b/packages/integrations/partytown/src/index.ts index 758756a31..13f7b1118 100644 --- a/packages/integrations/partytown/src/index.ts +++ b/packages/integrations/partytown/src/index.ts @@ -2,10 +2,10 @@ import type { PartytownConfig } from '@builder.io/partytown/integration'; import { partytownSnippet } from '@builder.io/partytown/integration'; import { copyLibFiles, libDirPath } from '@builder.io/partytown/utils'; import type { AstroIntegration } from 'astro'; -import * as fs from 'fs'; import { createRequire } from 'module'; -import path from 'path'; -import { fileURLToPath } from 'url'; +import * as fs from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import sirv from './sirv.js'; const resolve = createRequire(import.meta.url).resolve; diff --git a/packages/integrations/partytown/src/sirv.ts b/packages/integrations/partytown/src/sirv.ts index 8e04fc85c..7bba54b66 100644 --- a/packages/integrations/partytown/src/sirv.ts +++ b/packages/integrations/partytown/src/sirv.ts @@ -30,12 +30,12 @@ * THE SOFTWARE. */ -import * as fs from 'fs'; -import { join, normalize, resolve } from 'path'; +import * as fs from 'node:fs'; +import { join, normalize, resolve } from 'node:path'; // import { totalist } from 'totalist/sync'; // import { parse } from '@polka/url'; import { lookup } from 'mrmime'; -import { URL } from 'url'; +import { URL } from 'node:url'; const noop = () => {}; diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts index f22384b69..35fb7c6b5 100644 --- a/packages/integrations/sitemap/src/index.ts +++ b/packages/integrations/sitemap/src/index.ts @@ -5,7 +5,7 @@ import { type LinkItem as LinkItemBase, type SitemapItemLoose, } from 'sitemap'; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; import { ZodError } from 'zod'; import { generateSitemap } from './generate-sitemap.js'; diff --git a/packages/integrations/solid/src/dependencies.ts b/packages/integrations/solid/src/dependencies.ts index 6b98aeb3a..ac6e5c655 100644 --- a/packages/integrations/solid/src/dependencies.ts +++ b/packages/integrations/solid/src/dependencies.ts @@ -1,5 +1,5 @@ import type { AstroConfig } from 'astro'; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; import { crawlFrameworkPkgs } from 'vitefu'; export async function getSolidPkgsConfig(isBuild: boolean, astroConfig: AstroConfig) { diff --git a/packages/integrations/svelte/src/index.ts b/packages/integrations/svelte/src/index.ts index ed41812eb..ab87a59b2 100644 --- a/packages/integrations/svelte/src/index.ts +++ b/packages/integrations/svelte/src/index.ts @@ -1,7 +1,7 @@ import type { Options } from '@sveltejs/vite-plugin-svelte'; import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte'; import type { AstroIntegration, AstroRenderer } from 'astro'; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from 'node:url'; import type { UserConfig } from 'vite'; function getRenderer(): AstroRenderer { diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts index 592f3618f..7f45852ed 100644 --- a/packages/integrations/vercel/src/serverless/adapter.ts +++ b/packages/integrations/vercel/src/serverless/adapter.ts @@ -3,7 +3,7 @@ import type { AstroAdapter, AstroConfig, AstroIntegration, RouteData } from 'ast import glob from 'fast-glob'; import { basename } from 'node:path'; import { fileURLToPath } from 'node:url'; -import { pathToFileURL } from 'url'; +import { pathToFileURL } from 'node:url'; import { defaultImageConfig, getImageConfig, diff --git a/packages/integrations/vercel/src/serverless/middleware.ts b/packages/integrations/vercel/src/serverless/middleware.ts index 742740f64..a2e44722b 100644 --- a/packages/integrations/vercel/src/serverless/middleware.ts +++ b/packages/integrations/vercel/src/serverless/middleware.ts @@ -1,4 +1,4 @@ -import { existsSync } from 'fs'; +import { existsSync } from 'node:fs'; import { join } from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; import { ASTRO_LOCALS_HEADER } from './adapter.js'; @@ -62,12 +62,12 @@ import { onRequest } from ${middlewarePath}; import { createContext, trySerializeLocals } from 'astro/middleware'; export default async function middleware(request, context) { const url = new URL(request.url); - const ctx = createContext({ + const ctx = createContext({ request, params: {} }); ctx.locals = ${handlerTemplateCall}; - const next = async () => { + const next = async () => { const response = await fetch(url, { headers: { ${JSON.stringify(ASTRO_LOCALS_HEADER)}: trySerializeLocals(ctx.locals) |