diff --git a/packages/api-server/src/__tests__/withApiProxy.test.ts b/packages/api-server/src/__tests__/withApiProxy.test.ts index f0c6502d9ca4..2b60267f9a4c 100644 --- a/packages/api-server/src/__tests__/withApiProxy.test.ts +++ b/packages/api-server/src/__tests__/withApiProxy.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { FastifyInstance } from 'fastify' diff --git a/packages/api-server/src/__tests__/withFunctions.test.ts b/packages/api-server/src/__tests__/withFunctions.test.ts index f39b7a23c1bf..6f2b58c31998 100644 --- a/packages/api-server/src/__tests__/withFunctions.test.ts +++ b/packages/api-server/src/__tests__/withFunctions.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { FastifyInstance, FastifyPluginCallback } from 'fastify' diff --git a/packages/api-server/src/__tests__/withWebServer.test.ts b/packages/api-server/src/__tests__/withWebServer.test.ts index 2e3958a78c1b..9d9d977f42ea 100644 --- a/packages/api-server/src/__tests__/withWebServer.test.ts +++ b/packages/api-server/src/__tests__/withWebServer.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { FastifyInstance, FastifyPluginCallback } from 'fastify' diff --git a/packages/api-server/src/fastify.ts b/packages/api-server/src/fastify.ts index ffce1de6adf1..6afb64ecff4d 100644 --- a/packages/api-server/src/fastify.ts +++ b/packages/api-server/src/fastify.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import type { FastifyInstance, FastifyServerOptions } from 'fastify' import Fastify from 'fastify' diff --git a/packages/api-server/src/plugins/lambdaLoader.ts b/packages/api-server/src/plugins/lambdaLoader.ts index 4ad4c57556bf..a51b1e19e3eb 100644 --- a/packages/api-server/src/plugins/lambdaLoader.ts +++ b/packages/api-server/src/plugins/lambdaLoader.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import c from 'ansi-colors' import type { Handler } from 'aws-lambda' diff --git a/packages/api-server/src/plugins/withWebServer.ts b/packages/api-server/src/plugins/withWebServer.ts index 2cb84304c214..ba9d472a63b9 100644 --- a/packages/api-server/src/plugins/withWebServer.ts +++ b/packages/api-server/src/plugins/withWebServer.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import fastifyStatic from '@fastify/static' import { FastifyInstance, FastifyReply } from 'fastify' diff --git a/packages/api-server/src/watch.ts b/packages/api-server/src/watch.ts index eaf1bf0a80f1..cf68ce1087ac 100644 --- a/packages/api-server/src/watch.ts +++ b/packages/api-server/src/watch.ts @@ -1,9 +1,9 @@ #!/usr/bin/env node -import { fork } from 'child_process' -import type { ChildProcess } from 'child_process' -import fs from 'fs' -import path from 'path' +import { fork } from 'node:child_process' +import type { ChildProcess } from 'node:child_process' +import fs from 'node:fs' +import path from 'node:path' import c from 'ansi-colors' import chalk from 'chalk' diff --git a/packages/api/__mocks__/@redwoodjs/path.js b/packages/api/__mocks__/@redwoodjs/path.js index 76922f3e9e6c..4ab6925f8f79 100644 --- a/packages/api/__mocks__/@redwoodjs/path.js +++ b/packages/api/__mocks__/@redwoodjs/path.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' const BASE_PATH = path.resolve(__dirname, '../../src/__tests__/fixtures') diff --git a/packages/api/src/auth/verifiers/base64Sha1Verifier.ts b/packages/api/src/auth/verifiers/base64Sha1Verifier.ts index 54a29a08ac83..d897f280fc8f 100644 --- a/packages/api/src/auth/verifiers/base64Sha1Verifier.ts +++ b/packages/api/src/auth/verifiers/base64Sha1Verifier.ts @@ -1,4 +1,4 @@ -import { createHmac, timingSafeEqual } from 'crypto' +import { createHmac, timingSafeEqual } from 'node:crypto' import { WebhookVerificationError, diff --git a/packages/api/src/auth/verifiers/base64Sha256Verifier.ts b/packages/api/src/auth/verifiers/base64Sha256Verifier.ts index 913bde6fd050..c2ca99e0d21b 100644 --- a/packages/api/src/auth/verifiers/base64Sha256Verifier.ts +++ b/packages/api/src/auth/verifiers/base64Sha256Verifier.ts @@ -1,4 +1,4 @@ -import { createHmac, timingSafeEqual } from 'crypto' +import { createHmac, timingSafeEqual } from 'node:crypto' import { WebhookVerificationError, diff --git a/packages/api/src/auth/verifiers/sha1Verifier.ts b/packages/api/src/auth/verifiers/sha1Verifier.ts index d64b6fc9db6e..5448067de4d3 100644 --- a/packages/api/src/auth/verifiers/sha1Verifier.ts +++ b/packages/api/src/auth/verifiers/sha1Verifier.ts @@ -1,4 +1,4 @@ -import { createHmac, timingSafeEqual } from 'crypto' +import { createHmac, timingSafeEqual } from 'node:crypto' import { WebhookVerificationError, diff --git a/packages/api/src/auth/verifiers/sha256Verifier.ts b/packages/api/src/auth/verifiers/sha256Verifier.ts index 2c4be0cc3d68..095f250bb385 100644 --- a/packages/api/src/auth/verifiers/sha256Verifier.ts +++ b/packages/api/src/auth/verifiers/sha256Verifier.ts @@ -1,4 +1,4 @@ -import { createHmac, timingSafeEqual } from 'crypto' +import { createHmac, timingSafeEqual } from 'node:crypto' import { WebhookVerificationError, diff --git a/packages/api/src/auth/verifiers/timestampSchemeVerifier.ts b/packages/api/src/auth/verifiers/timestampSchemeVerifier.ts index e5b3b72fd067..76f89ea84ea8 100644 --- a/packages/api/src/auth/verifiers/timestampSchemeVerifier.ts +++ b/packages/api/src/auth/verifiers/timestampSchemeVerifier.ts @@ -1,4 +1,4 @@ -import { createHmac } from 'crypto' +import { createHmac } from 'node:crypto' import { WebhookVerificationError, diff --git a/packages/api/src/bins/redwood.ts b/packages/api/src/bins/redwood.ts index 7c3de49808df..f9511bf70e96 100644 --- a/packages/api/src/bins/redwood.ts +++ b/packages/api/src/bins/redwood.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromCli = createRequire( require.resolve('@redwoodjs/cli/package.json') diff --git a/packages/api/src/bins/rwfw.ts b/packages/api/src/bins/rwfw.ts index 31c3e0e8b40f..e4d3e9f24cca 100644 --- a/packages/api/src/bins/rwfw.ts +++ b/packages/api/src/bins/rwfw.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromCli = createRequire( require.resolve('@redwoodjs/cli/package.json') diff --git a/packages/api/src/bins/tsc.ts b/packages/api/src/bins/tsc.ts index 22c9992cec31..5f8e0345a010 100644 --- a/packages/api/src/bins/tsc.ts +++ b/packages/api/src/bins/tsc.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromTypeScript = createRequire( require.resolve('typescript/package.json') diff --git a/packages/api/src/logger/logger.test.ts b/packages/api/src/logger/logger.test.ts index 42a1b9ce0c12..b376b6dedc7c 100644 --- a/packages/api/src/logger/logger.test.ts +++ b/packages/api/src/logger/logger.test.ts @@ -1,6 +1,6 @@ -import { existsSync, readFileSync, statSync } from 'fs' -import os from 'os' -import { join } from 'path' +import { existsSync, readFileSync, statSync } from 'node:fs' +import os from 'node:os' +import { join } from 'node:path' import split from 'split2' diff --git a/packages/auth-providers/auth0/setup/src/setupHandler.ts b/packages/auth-providers/auth0/setup/src/setupHandler.ts index f045008d7edb..8165be335ba9 100644 --- a/packages/auth-providers/auth0/setup/src/setupHandler.ts +++ b/packages/auth-providers/auth0/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { standardAuthHandler } from '@redwoodjs/cli-helpers' diff --git a/packages/auth-providers/azureActiveDirectory/setup/src/setupHandler.ts b/packages/auth-providers/azureActiveDirectory/setup/src/setupHandler.ts index c8bdd8bb94bf..69a8e201bd39 100644 --- a/packages/auth-providers/azureActiveDirectory/setup/src/setupHandler.ts +++ b/packages/auth-providers/azureActiveDirectory/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { standardAuthHandler } from '@redwoodjs/cli-helpers' diff --git a/packages/auth-providers/clerk/setup/src/setupHandler.ts b/packages/auth-providers/clerk/setup/src/setupHandler.ts index f08d9c1406b4..ae0ae60093c2 100644 --- a/packages/auth-providers/clerk/setup/src/setupHandler.ts +++ b/packages/auth-providers/clerk/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { standardAuthHandler } from '@redwoodjs/cli-helpers' diff --git a/packages/auth-providers/custom/setup/src/setupHandler.ts b/packages/auth-providers/custom/setup/src/setupHandler.ts index 6c14308e4e1c..81e299d5f405 100644 --- a/packages/auth-providers/custom/setup/src/setupHandler.ts +++ b/packages/auth-providers/custom/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { isTypeScriptProject, diff --git a/packages/auth-providers/dbAuth/setup/src/setupData.ts b/packages/auth-providers/dbAuth/setup/src/setupData.ts index 284ee1548927..b50f18ad5f66 100644 --- a/packages/auth-providers/dbAuth/setup/src/setupData.ts +++ b/packages/auth-providers/dbAuth/setup/src/setupData.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import password from 'secure-random-password' diff --git a/packages/auth-providers/dbAuth/setup/src/setupHandler.ts b/packages/auth-providers/dbAuth/setup/src/setupHandler.ts index a82226b32b82..1fc410047420 100644 --- a/packages/auth-providers/dbAuth/setup/src/setupHandler.ts +++ b/packages/auth-providers/dbAuth/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import prompts from 'prompts' diff --git a/packages/auth-providers/dbAuth/setup/src/webAuthn.setupData.ts b/packages/auth-providers/dbAuth/setup/src/webAuthn.setupData.ts index f93e7a814b88..12b764b24a7a 100644 --- a/packages/auth-providers/dbAuth/setup/src/webAuthn.setupData.ts +++ b/packages/auth-providers/dbAuth/setup/src/webAuthn.setupData.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getPaths, colors } from '@redwoodjs/cli-helpers' diff --git a/packages/auth-providers/firebase/setup/src/setupHandler.ts b/packages/auth-providers/firebase/setup/src/setupHandler.ts index 1ffdf95bbe1b..d071f14d9435 100644 --- a/packages/auth-providers/firebase/setup/src/setupHandler.ts +++ b/packages/auth-providers/firebase/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { standardAuthHandler } from '@redwoodjs/cli-helpers' diff --git a/packages/auth-providers/firebase/web/jest.config.js b/packages/auth-providers/firebase/web/jest.config.js index 4c937d832dc1..4233f9438d74 100644 --- a/packages/auth-providers/firebase/web/jest.config.js +++ b/packages/auth-providers/firebase/web/jest.config.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('node:path') /** @type {import('@jest/types').Config.InitialOptions} */ module.exports = { diff --git a/packages/auth-providers/netlify/setup/src/setupHandler.ts b/packages/auth-providers/netlify/setup/src/setupHandler.ts index 34cfa489c52f..9d3025a5b546 100644 --- a/packages/auth-providers/netlify/setup/src/setupHandler.ts +++ b/packages/auth-providers/netlify/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { standardAuthHandler } from '@redwoodjs/cli-helpers' diff --git a/packages/auth-providers/supabase/setup/src/setupHandler.ts b/packages/auth-providers/supabase/setup/src/setupHandler.ts index 16430493850d..a1196e05be0d 100644 --- a/packages/auth-providers/supabase/setup/src/setupHandler.ts +++ b/packages/auth-providers/supabase/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { standardAuthHandler } from '@redwoodjs/cli-helpers' diff --git a/packages/auth-providers/supertokens/setup/__mocks__/fs.js b/packages/auth-providers/supertokens/setup/__mocks__/fs.js index 99fec09d82ed..8eb3778d19a3 100644 --- a/packages/auth-providers/supertokens/setup/__mocks__/fs.js +++ b/packages/auth-providers/supertokens/setup/__mocks__/fs.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' const fs = { ...jest.requireActual('fs'), diff --git a/packages/auth-providers/supertokens/setup/src/__tests__/setupHandler.test.ts b/packages/auth-providers/supertokens/setup/src/__tests__/setupHandler.test.ts index a9bd0f353cb0..bdbe1b79e2d4 100644 --- a/packages/auth-providers/supertokens/setup/src/__tests__/setupHandler.test.ts +++ b/packages/auth-providers/supertokens/setup/src/__tests__/setupHandler.test.ts @@ -29,7 +29,7 @@ const mockFS = fs as unknown as Omit, 'readdirSync'> & { __setMockFiles: (files: Record) => void } -import fs from 'fs' +import fs from 'node:fs' import { extraTask } from '../setupHandler' diff --git a/packages/auth-providers/supertokens/setup/src/setupHandler.ts b/packages/auth-providers/supertokens/setup/src/setupHandler.ts index 03990fa55594..de025ab22594 100644 --- a/packages/auth-providers/supertokens/setup/src/setupHandler.ts +++ b/packages/auth-providers/supertokens/setup/src/setupHandler.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths, standardAuthHandler } from '@redwoodjs/cli-helpers' diff --git a/packages/cli-helpers/__mocks__/fs.js b/packages/cli-helpers/__mocks__/fs.js index 99fec09d82ed..8eb3778d19a3 100644 --- a/packages/cli-helpers/__mocks__/fs.js +++ b/packages/cli-helpers/__mocks__/fs.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' const fs = { ...jest.requireActual('fs'), diff --git a/packages/cli-helpers/src/auth/__tests__/authFiles.test.ts b/packages/cli-helpers/src/auth/__tests__/authFiles.test.ts index b7ca9a3d778e..e4a51f2ab952 100644 --- a/packages/cli-helpers/src/auth/__tests__/authFiles.test.ts +++ b/packages/cli-helpers/src/auth/__tests__/authFiles.test.ts @@ -4,7 +4,7 @@ let mockIsTypeScriptProject = true globalThis.__dirname = __dirname jest.mock('../../lib/paths', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('../../lib/paths'), @@ -26,7 +26,7 @@ jest.mock('../../lib/project', () => ({ isTypeScriptProject: () => mockIsTypeScriptProject, })) -import path from 'path' +import path from 'node:path' import { getPaths } from '../../lib/paths' import { apiSideFiles, generateUniqueFileNames } from '../authFiles' diff --git a/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts b/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts index d7114aebcbc9..f446f1b4764b 100644 --- a/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts +++ b/packages/cli-helpers/src/auth/__tests__/authTasks.test.ts @@ -19,7 +19,7 @@ jest.mock('@redwoodjs/telemetry', () => { }) jest.mock('../../lib/paths', () => { - const path = require('path') + const path = require('node:path') const actualPaths = jest.requireActual('../../lib/paths') const basedir = '/mock/setup/path' const app = mockIsTypeScriptProject ? 'App.tsx' : 'App.jsx' @@ -63,8 +63,8 @@ const mockFS = fs as unknown as Omit, 'readdirSync'> & { readdirSync: () => string[] } -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '../../lib/paths' import { diff --git a/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts b/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts index eba30cdb464a..60d771154e71 100644 --- a/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts +++ b/packages/cli-helpers/src/auth/__tests__/setupHelpers.test.ts @@ -9,7 +9,7 @@ jest.mock('@redwoodjs/telemetry', () => { }) jest.mock('../../lib/paths', () => { - const path = require('path') + const path = require('node:path') const __dirname = path.resolve() return { @@ -36,8 +36,8 @@ jest.mock('execa', () => {}) jest.mock('listr2') jest.mock('prompts', () => jest.fn(() => ({ answer: true }))) -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' import prompts from 'prompts' diff --git a/packages/cli-helpers/src/auth/authFiles.ts b/packages/cli-helpers/src/auth/authFiles.ts index 85bd5f812075..126f1ac2ccd4 100644 --- a/packages/cli-helpers/src/auth/authFiles.ts +++ b/packages/cli-helpers/src/auth/authFiles.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import pascalcase from 'pascalcase' diff --git a/packages/cli-helpers/src/auth/authTasks.ts b/packages/cli-helpers/src/auth/authTasks.ts index d1b886c7636d..1e1600c877d1 100644 --- a/packages/cli-helpers/src/auth/authTasks.ts +++ b/packages/cli-helpers/src/auth/authTasks.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { ListrRenderer, ListrTask, ListrTaskWrapper } from 'listr2' diff --git a/packages/cli-helpers/src/lib/index.ts b/packages/cli-helpers/src/lib/index.ts index 1107b3d59e7b..12a66bde3b27 100644 --- a/packages/cli-helpers/src/lib/index.ts +++ b/packages/cli-helpers/src/lib/index.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import * as babel from '@babel/core' import { diff --git a/packages/cli-helpers/src/lib/project.ts b/packages/cli-helpers/src/lib/project.ts index 5cba82c73b90..b633fe7a90f4 100644 --- a/packages/cli-helpers/src/lib/project.ts +++ b/packages/cli-helpers/src/lib/project.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { resolveFile } from '@redwoodjs/project-config' diff --git a/packages/cli/__mocks__/fs.js b/packages/cli/__mocks__/fs.js index c7bf119b4118..029d8c1ba03f 100644 --- a/packages/cli/__mocks__/fs.js +++ b/packages/cli/__mocks__/fs.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' const fs = { ...jest.requireActual('fs'), diff --git a/packages/cli/src/__tests__/cwd.test.js b/packages/cli/src/__tests__/cwd.test.js index 14826e7cdb1a..837284096644 100644 --- a/packages/cli/src/__tests__/cwd.test.js +++ b/packages/cli/src/__tests__/cwd.test.js @@ -1,5 +1,5 @@ -import { spawnSync } from 'child_process' -import path from 'path' +import { spawnSync } from 'node:child_process' +import path from 'node:path' describe('The CLI sets `cwd` correctly', () => { describe('--cwd', () => { diff --git a/packages/cli/src/__tests__/fs.test.js b/packages/cli/src/__tests__/fs.test.js index 1352240e62a9..f05e51cfd48f 100644 --- a/packages/cli/src/__tests__/fs.test.js +++ b/packages/cli/src/__tests__/fs.test.js @@ -1,7 +1,7 @@ jest.mock('fs') -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' const INITIAL_FS = { file_a: 'content_a', diff --git a/packages/cli/src/commands/__tests__/type-check.test.js b/packages/cli/src/commands/__tests__/type-check.test.js index dfa7543fec25..15abf408c472 100644 --- a/packages/cli/src/commands/__tests__/type-check.test.js +++ b/packages/cli/src/commands/__tests__/type-check.test.js @@ -50,7 +50,7 @@ jest.mock('../../commands/upgrade', () => { } }) -import path from 'path' +import path from 'node:path' import concurrently from 'concurrently' import execa from 'execa' diff --git a/packages/cli/src/commands/buildHandler.js b/packages/cli/src/commands/buildHandler.js index f6bb7a08029f..058e903e8847 100644 --- a/packages/cli/src/commands/buildHandler.js +++ b/packages/cli/src/commands/buildHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import execa from 'execa' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/consoleHandler.js b/packages/cli/src/commands/consoleHandler.js index 0fd79e79b4a9..af1e73df7996 100644 --- a/packages/cli/src/commands/consoleHandler.js +++ b/packages/cli/src/commands/consoleHandler.js @@ -1,6 +1,6 @@ -import fs from 'fs' -import path from 'path' -import repl from 'repl' +import fs from 'node:fs' +import path from 'node:path' +import repl from 'node:repl' import { recordTelemetryAttributes } from '@redwoodjs/cli-helpers' import { registerApiSideBabelHook } from '@redwoodjs/internal/dist/build/babel/api' diff --git a/packages/cli/src/commands/dataMigrate/installHandler.js b/packages/cli/src/commands/dataMigrate/installHandler.js index 334e05686b51..c1d599462cf6 100644 --- a/packages/cli/src/commands/dataMigrate/installHandler.js +++ b/packages/cli/src/commands/dataMigrate/installHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import fs from 'fs-extra' diff --git a/packages/cli/src/commands/dataMigrate/upHandler.js b/packages/cli/src/commands/dataMigrate/upHandler.js index fad92e82f43a..ad8ee47345ca 100644 --- a/packages/cli/src/commands/dataMigrate/upHandler.js +++ b/packages/cli/src/commands/dataMigrate/upHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/deploy/__tests__/nftPack.test.js b/packages/cli/src/commands/deploy/__tests__/nftPack.test.js index a6840c58a84e..ab2fc5bab0ec 100644 --- a/packages/cli/src/commands/deploy/__tests__/nftPack.test.js +++ b/packages/cli/src/commands/deploy/__tests__/nftPack.test.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { buildApi } from '@redwoodjs/internal/dist/build/api' import { findApiDistFunctions } from '@redwoodjs/internal/dist/files' diff --git a/packages/cli/src/commands/deploy/baremetal.js b/packages/cli/src/commands/deploy/baremetal.js index 316aa6d4f1cd..e5748584c8bb 100644 --- a/packages/cli/src/commands/deploy/baremetal.js +++ b/packages/cli/src/commands/deploy/baremetal.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import toml from '@iarna/toml' import boxen from 'boxen' diff --git a/packages/cli/src/commands/deploy/edgio.js b/packages/cli/src/commands/deploy/edgio.js index 9cfc80f793fc..c9720a23b2e7 100644 --- a/packages/cli/src/commands/deploy/edgio.js +++ b/packages/cli/src/commands/deploy/edgio.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import fs from 'fs-extra' diff --git a/packages/cli/src/commands/deploy/flightcontrol.js b/packages/cli/src/commands/deploy/flightcontrol.js index 1274773bc17a..aa1e10e89823 100644 --- a/packages/cli/src/commands/deploy/flightcontrol.js +++ b/packages/cli/src/commands/deploy/flightcontrol.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/deploy/packing/nft.js b/packages/cli/src/commands/deploy/packing/nft.js index 7c9cb979be5a..7f794a5a0ccb 100644 --- a/packages/cli/src/commands/deploy/packing/nft.js +++ b/packages/cli/src/commands/deploy/packing/nft.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { nodeFileTrace } from '@vercel/nft' import archiver from 'archiver' diff --git a/packages/cli/src/commands/deploy/render.js b/packages/cli/src/commands/deploy/render.js index 1faf8a23eeea..cd515937b107 100644 --- a/packages/cli/src/commands/deploy/render.js +++ b/packages/cli/src/commands/deploy/render.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/deploy/serverless.js b/packages/cli/src/commands/deploy/serverless.js index f9d95f5c0f96..0fdd80bc0820 100644 --- a/packages/cli/src/commands/deploy/serverless.js +++ b/packages/cli/src/commands/deploy/serverless.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import boxen from 'boxen' import chalk from 'chalk' diff --git a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js index 4ac811b8072c..05e9716eb35e 100644 --- a/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js +++ b/packages/cli/src/commands/destroy/cell/__tests__/cell.test.js @@ -16,7 +16,7 @@ jest.mock('@redwoodjs/structure', () => { } }) -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' diff --git a/packages/cli/src/commands/destroy/component/__tests__/component.test.js b/packages/cli/src/commands/destroy/component/__tests__/component.test.js index cccc803db4c6..0266a4761246 100644 --- a/packages/cli/src/commands/destroy/component/__tests__/component.test.js +++ b/packages/cli/src/commands/destroy/component/__tests__/component.test.js @@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => { } }) -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' diff --git a/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js b/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js index 3078a88ab229..7f7c8ae780c7 100644 --- a/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js +++ b/packages/cli/src/commands/destroy/directive/__tests__/directive.test.js @@ -8,7 +8,7 @@ jest.mock('../../../../lib', () => { } }) -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' diff --git a/packages/cli/src/commands/destroy/function/__tests__/function.test.js b/packages/cli/src/commands/destroy/function/__tests__/function.test.js index d72a403de010..6d52c8162673 100644 --- a/packages/cli/src/commands/destroy/function/__tests__/function.test.js +++ b/packages/cli/src/commands/destroy/function/__tests__/function.test.js @@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => { } }) -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' diff --git a/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js b/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js index f0d970bc1d7f..598791904d8d 100644 --- a/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js +++ b/packages/cli/src/commands/destroy/layout/__tests__/layout.test.js @@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => { } }) -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' diff --git a/packages/cli/src/commands/destroy/page/__tests__/page.test.js b/packages/cli/src/commands/destroy/page/__tests__/page.test.js index d6182d32a45a..9d1cac39090b 100644 --- a/packages/cli/src/commands/destroy/page/__tests__/page.test.js +++ b/packages/cli/src/commands/destroy/page/__tests__/page.test.js @@ -7,7 +7,7 @@ jest.mock('../../../../lib', () => { } }) -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' diff --git a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js index 1baba32c507c..7ab6763169b6 100644 --- a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js +++ b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffold.test.js @@ -1,7 +1,7 @@ globalThis.__dirname = __dirname -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import '../../../../lib/test' @@ -24,7 +24,7 @@ jest.mock('../../../../lib', () => { }) jest.mock('../../../../lib/schemaHelpers', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('../../../../lib/schemaHelpers'), getSchema: () => diff --git a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js index ee69c8702f59..d69efd8e8b5b 100644 --- a/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js +++ b/packages/cli/src/commands/destroy/scaffold/__tests__/scaffoldNoNest.test.js @@ -1,7 +1,7 @@ globalThis.__dirname = __dirname -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import '../../../../lib/test' @@ -24,7 +24,7 @@ jest.mock('../../../../lib', () => { }) jest.mock('../../../../lib/schemaHelpers', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('../../../../lib/schemaHelpers'), getSchema: () => diff --git a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js index 5d704f1f067c..107bf013906f 100644 --- a/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js +++ b/packages/cli/src/commands/destroy/sdl/__tests__/sdl.test.js @@ -1,6 +1,6 @@ globalThis.__dirname = __dirname -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' @@ -18,7 +18,7 @@ jest.mock('../../../../lib', () => { }) jest.mock('../../../../lib/schemaHelpers', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('../../../../lib/schemaHelpers'), getSchema: () => diff --git a/packages/cli/src/commands/destroy/service/__tests__/service.test.js b/packages/cli/src/commands/destroy/service/__tests__/service.test.js index 22b59bb8d885..8601a1dc332c 100644 --- a/packages/cli/src/commands/destroy/service/__tests__/service.test.js +++ b/packages/cli/src/commands/destroy/service/__tests__/service.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' @@ -17,7 +17,7 @@ jest.mock('../../../../lib', () => { }) jest.mock('../../../../lib/schemaHelpers', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('../../../../lib/schemaHelpers'), getSchema: () => diff --git a/packages/cli/src/commands/devHandler.js b/packages/cli/src/commands/devHandler.js index 964143794423..d476838b47f3 100644 --- a/packages/cli/src/commands/devHandler.js +++ b/packages/cli/src/commands/devHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import { argv } from 'process' +import fs from 'node:fs' +import { argv } from 'node:process' import concurrently from 'concurrently' diff --git a/packages/cli/src/commands/execHandler.js b/packages/cli/src/commands/execHandler.js index c54cd184b829..e920c981196f 100644 --- a/packages/cli/src/commands/execHandler.js +++ b/packages/cli/src/commands/execHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { context } from '@opentelemetry/api' import { suppressTracing } from '@opentelemetry/core' diff --git a/packages/cli/src/commands/experimental/generateRealtimeHandler.js b/packages/cli/src/commands/experimental/generateRealtimeHandler.js index 84c7a6fc4a75..efd77dbac9eb 100644 --- a/packages/cli/src/commands/experimental/generateRealtimeHandler.js +++ b/packages/cli/src/commands/experimental/generateRealtimeHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import camelcase from 'camelcase' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js b/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js index 7371888f4fbd..84a9f3a0de30 100644 --- a/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js +++ b/packages/cli/src/commands/experimental/setupOpentelemetryHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import execa from 'execa' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/experimental/setupRealtimeHandler.js b/packages/cli/src/commands/experimental/setupRealtimeHandler.js index 97216209653e..a09e3d4f398e 100644 --- a/packages/cli/src/commands/experimental/setupRealtimeHandler.js +++ b/packages/cli/src/commands/experimental/setupRealtimeHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/experimental/setupRscHandler.js b/packages/cli/src/commands/experimental/setupRscHandler.js index b5176bdf04ff..14a7339b6288 100644 --- a/packages/cli/src/commands/experimental/setupRscHandler.js +++ b/packages/cli/src/commands/experimental/setupRscHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/experimental/setupSentryHandler.js b/packages/cli/src/commands/experimental/setupSentryHandler.js index 14a320ba6b0b..d2b04f2ee6a3 100644 --- a/packages/cli/src/commands/experimental/setupSentryHandler.js +++ b/packages/cli/src/commands/experimental/setupSentryHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/experimental/setupServerFileHandler.js b/packages/cli/src/commands/experimental/setupServerFileHandler.js index 7db86fbe2ce9..65b7022dc50d 100644 --- a/packages/cli/src/commands/experimental/setupServerFileHandler.js +++ b/packages/cli/src/commands/experimental/setupServerFileHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js index 007e1bdf7b99..2fddba6cb165 100644 --- a/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js +++ b/packages/cli/src/commands/experimental/setupStreamingSsrHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/experimental/studioHandler.js b/packages/cli/src/commands/experimental/studioHandler.js index e1a7cdaf0e4f..026a1816e5c2 100644 --- a/packages/cli/src/commands/experimental/studioHandler.js +++ b/packages/cli/src/commands/experimental/studioHandler.js @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import { getConfigPath } from '@redwoodjs/project-config' diff --git a/packages/cli/src/commands/experimental/util.js b/packages/cli/src/commands/experimental/util.js index 0dd02bf300b8..c699e3d4e3de 100644 --- a/packages/cli/src/commands/experimental/util.js +++ b/packages/cli/src/commands/experimental/util.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import chalk from 'chalk' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/generate/__tests__/helpers.test.js b/packages/cli/src/commands/generate/__tests__/helpers.test.js index 35bf51fb02cd..d90a6cf029c7 100644 --- a/packages/cli/src/commands/generate/__tests__/helpers.test.js +++ b/packages/cli/src/commands/generate/__tests__/helpers.test.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' // Setup test mocks globalThis.__dirname = __dirname diff --git a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js index a52684c7280e..d6bb92b0c56e 100644 --- a/packages/cli/src/commands/generate/cell/__tests__/cell.test.js +++ b/packages/cli/src/commands/generate/cell/__tests__/cell.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' // Load mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/component/__tests__/component.test.ts b/packages/cli/src/commands/generate/component/__tests__/component.test.ts index 6df97bcb84cc..f97e84bd270f 100644 --- a/packages/cli/src/commands/generate/component/__tests__/component.test.ts +++ b/packages/cli/src/commands/generate/component/__tests__/component.test.ts @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import yargs from 'yargs' diff --git a/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js b/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js index 0b322d7302d0..cf715a0e8de7 100644 --- a/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js +++ b/packages/cli/src/commands/generate/dataMigration/__tests__/dataMigration.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import '../../../../lib/test' import * as generator from '../dataMigration' diff --git a/packages/cli/src/commands/generate/dataMigration/dataMigration.js b/packages/cli/src/commands/generate/dataMigration/dataMigration.js index 20babf10228a..e395f5d3f976 100644 --- a/packages/cli/src/commands/generate/dataMigration/dataMigration.js +++ b/packages/cli/src/commands/generate/dataMigration/dataMigration.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' import { paramCase } from 'param-case' diff --git a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js index 08797506d27a..2d1295d21bd9 100644 --- a/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js +++ b/packages/cli/src/commands/generate/dbAuth/__tests__/dbAuth.test.js @@ -2,8 +2,8 @@ global.__dirname = __dirname jest.mock('fs') -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' // Load mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/dbAuth/dbAuth.js b/packages/cli/src/commands/generate/dbAuth/dbAuth.js index e163aa9a8cb9..94f2ec2de9af 100644 --- a/packages/cli/src/commands/generate/dbAuth/dbAuth.js +++ b/packages/cli/src/commands/generate/dbAuth/dbAuth.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { camelCase } from 'camel-case' import Enquirer from 'enquirer' diff --git a/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts b/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts index b8faabb31f97..e6d849f62015 100644 --- a/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts +++ b/packages/cli/src/commands/generate/directive/__tests__/directive.test.ts @@ -2,7 +2,7 @@ globalThis.__dirname = __dirname // Load shared mocks import '../../../../lib/test' -import path from 'path' +import path from 'node:path' import yargs from 'yargs' diff --git a/packages/cli/src/commands/generate/directive/directive.js b/packages/cli/src/commands/generate/directive/directive.js index 97d1d9ce5827..659a34d732a1 100644 --- a/packages/cli/src/commands/generate/directive/directive.js +++ b/packages/cli/src/commands/generate/directive/directive.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import camelcase from 'camelcase' import execa from 'execa' diff --git a/packages/cli/src/commands/generate/function/__tests__/function.test.ts b/packages/cli/src/commands/generate/function/__tests__/function.test.ts index 29abd3aa9dab..bb748bccaa00 100644 --- a/packages/cli/src/commands/generate/function/__tests__/function.test.ts +++ b/packages/cli/src/commands/generate/function/__tests__/function.test.ts @@ -2,7 +2,7 @@ globalThis.__dirname = __dirname // Load shared mocks import '../../../../lib/test' -import path from 'path' +import path from 'node:path' import yargs from 'yargs' diff --git a/packages/cli/src/commands/generate/function/function.js b/packages/cli/src/commands/generate/function/function.js index 24559c7121d5..4945ff0b53ef 100644 --- a/packages/cli/src/commands/generate/function/function.js +++ b/packages/cli/src/commands/generate/function/function.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import camelcase from 'camelcase' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/generate/helpers.js b/packages/cli/src/commands/generate/helpers.js index c76490a62c47..a55ae288ed69 100644 --- a/packages/cli/src/commands/generate/helpers.js +++ b/packages/cli/src/commands/generate/helpers.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' import { paramCase } from 'param-case' diff --git a/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts b/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts index 82decf5e227f..d1a31cfedac4 100644 --- a/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts +++ b/packages/cli/src/commands/generate/layout/__tests__/layout.test.ts @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' // Load shared mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/model/model.js b/packages/cli/src/commands/generate/model/model.js index 740b934e50d7..5a9df8ec08ec 100644 --- a/packages/cli/src/commands/generate/model/model.js +++ b/packages/cli/src/commands/generate/model/model.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { Listr } from 'listr2' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/generate/page/__tests__/page.test.js b/packages/cli/src/commands/generate/page/__tests__/page.test.js index 3ad2e4cdfc5f..4168134dd0b7 100644 --- a/packages/cli/src/commands/generate/page/__tests__/page.test.js +++ b/packages/cli/src/commands/generate/page/__tests__/page.test.js @@ -36,8 +36,8 @@ jest.mock('fs', () => { } }) -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' // Load mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/page/page.js b/packages/cli/src/commands/generate/page/page.js index f18fdbcae397..529148be619a 100644 --- a/packages/cli/src/commands/generate/page/page.js +++ b/packages/cli/src/commands/generate/page/page.js @@ -1,4 +1,4 @@ -import { execSync } from 'child_process' +import { execSync } from 'node:child_process' import camelcase from 'camelcase' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js index 23dc45553873..b6d2a3e4e8b5 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/editableColumns.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' // Load mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js index 0dd3b19681cc..882813889b75 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffold.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' // Load mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js index ffd8290baf1e..49bbafb0cc1a 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldNoNest.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' // Load mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js index 01b1b29e6b76..66290db4d2bb 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPath.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js index b1b27e736cac..ba10dc31423b 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMulti.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js index 3d5b462a7f71..c910bbbb9164 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiNoNest.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js index 67bd4a6f71c6..4e92c45c5bdf 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiword.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js index 7d640a7d3d9c..679e230924ca 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathMultiwordNoNest.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js index 043eb483011b..cb8b10f9a905 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/scaffoldPathNoNest.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js index 10cec9fd9908..932d83b351de 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseEmptyAsUndefined.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' // Load mocks import '../../../../lib/test' diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js index 3c27756a104d..fc746f99f9d5 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js +++ b/packages/cli/src/commands/generate/scaffold/__tests__/shouldUseTailwindCSS.test.js @@ -1,6 +1,6 @@ globalThis.__dirname = __dirname -import fs from 'fs' +import fs from 'node:fs' import '../../../../lib/test' import { shouldUseTailwindCSS } from '../scaffold' diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js index 8762ab04da05..11ad3e4e72c8 100644 --- a/packages/cli/src/commands/generate/scaffold/scaffold.js +++ b/packages/cli/src/commands/generate/scaffold/scaffold.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import camelcase from 'camelcase' import execa from 'execa' diff --git a/packages/cli/src/commands/generate/script/__tests__/script.test.ts b/packages/cli/src/commands/generate/script/__tests__/script.test.ts index 73744cec071b..ce99899d8ff7 100644 --- a/packages/cli/src/commands/generate/script/__tests__/script.test.ts +++ b/packages/cli/src/commands/generate/script/__tests__/script.test.ts @@ -2,7 +2,7 @@ globalThis.__dirname = __dirname // Load shared mocks import '../../../../lib/test' -import path from 'path' +import path from 'node:path' import yargs from 'yargs' diff --git a/packages/cli/src/commands/generate/script/script.js b/packages/cli/src/commands/generate/script/script.js index e2ed7d8dcc64..c7f678307ab1 100644 --- a/packages/cli/src/commands/generate/script/script.js +++ b/packages/cli/src/commands/generate/script/script.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js index 5c426645ad9a..b5413bb4b8c4 100644 --- a/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js +++ b/packages/cli/src/commands/generate/sdl/__tests__/sdl.test.js @@ -24,8 +24,8 @@ jest.mock('fs', () => { } }) -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import prompts from 'prompts' diff --git a/packages/cli/src/commands/generate/sdl/sdl.js b/packages/cli/src/commands/generate/sdl/sdl.js index d6ffd5dd923b..cdcd58fdd13c 100644 --- a/packages/cli/src/commands/generate/sdl/sdl.js +++ b/packages/cli/src/commands/generate/sdl/sdl.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import boxen from 'boxen' import camelcase from 'camelcase' diff --git a/packages/cli/src/commands/generate/service/__tests__/service.test.js b/packages/cli/src/commands/generate/service/__tests__/service.test.js index b7de2380837f..d4624bb83dcd 100644 --- a/packages/cli/src/commands/generate/service/__tests__/service.test.js +++ b/packages/cli/src/commands/generate/service/__tests__/service.test.js @@ -1,5 +1,5 @@ globalThis.__dirname = __dirname -import path from 'path' +import path from 'node:path' import yargs from 'yargs' diff --git a/packages/cli/src/commands/lint.js b/packages/cli/src/commands/lint.js index e0db5812279c..a285b9a87479 100644 --- a/packages/cli/src/commands/lint.js +++ b/packages/cli/src/commands/lint.js @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import execa from 'execa' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/prerenderHandler.js b/packages/cli/src/commands/prerenderHandler.js index 2d3e09fc5000..8394ed17b4fd 100644 --- a/packages/cli/src/commands/prerenderHandler.js +++ b/packages/cli/src/commands/prerenderHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/prismaHandler.js b/packages/cli/src/commands/prismaHandler.js index ff2884e861cd..9b4640e257e3 100644 --- a/packages/cli/src/commands/prismaHandler.js +++ b/packages/cli/src/commands/prismaHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import boxen from 'boxen' import execa from 'execa' diff --git a/packages/cli/src/commands/serve.js b/packages/cli/src/commands/serve.js index 10475aa1a83f..f007e108363e 100644 --- a/packages/cli/src/commands/serve.js +++ b/packages/cli/src/commands/serve.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/serveApiHandler.js b/packages/cli/src/commands/serveApiHandler.js index 278d5031b51a..d177ddd504c5 100644 --- a/packages/cli/src/commands/serveApiHandler.js +++ b/packages/cli/src/commands/serveApiHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import chalk from 'chalk' import execa from 'execa' diff --git a/packages/cli/src/commands/serveBothHandler.js b/packages/cli/src/commands/serveBothHandler.js index 28ace745bbcf..212c0eadcb11 100644 --- a/packages/cli/src/commands/serveBothHandler.js +++ b/packages/cli/src/commands/serveBothHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import chalk from 'chalk' import execa from 'execa' diff --git a/packages/cli/src/commands/setup/auth/auth.js b/packages/cli/src/commands/setup/auth/auth.js index 76c81f24960b..8ee5294b68e6 100644 --- a/packages/cli/src/commands/setup/auth/auth.js +++ b/packages/cli/src/commands/setup/auth/auth.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import fs from 'fs-extra' diff --git a/packages/cli/src/commands/setup/cache/cacheHandler.js b/packages/cli/src/commands/setup/cache/cacheHandler.js index a742f982cf20..38842c606c53 100644 --- a/packages/cli/src/commands/setup/cache/cacheHandler.js +++ b/packages/cli/src/commands/setup/cache/cacheHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import chalk from 'chalk' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js b/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js index 4f14f0db3d63..96bad629a86f 100644 --- a/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js +++ b/packages/cli/src/commands/setup/custom-web-index/custom-web-index-handler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import chalk from 'chalk' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js b/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js index c89b89071c25..50a8368d0901 100644 --- a/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js +++ b/packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js @@ -1,8 +1,8 @@ // Automock fs using ../..../__mocks__/fs jest.mock('fs') -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '../../../../lib' import { updateApiURLTask } from '../helpers' diff --git a/packages/cli/src/commands/setup/deploy/helpers/index.js b/packages/cli/src/commands/setup/deploy/helpers/index.js index 0a04b91e2c48..409f399eedac 100644 --- a/packages/cli/src/commands/setup/deploy/helpers/index.js +++ b/packages/cli/src/commands/setup/deploy/helpers/index.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import execa from 'execa' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/providers/baremetal.js b/packages/cli/src/commands/setup/deploy/providers/baremetal.js index 7d3ce5a0f6d4..33c8132d8c62 100644 --- a/packages/cli/src/commands/setup/deploy/providers/baremetal.js +++ b/packages/cli/src/commands/setup/deploy/providers/baremetal.js @@ -1,5 +1,5 @@ // import terminalLink from 'terminal-link' -import path from 'path' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js index 4c1b36e9fc83..d5052498e403 100644 --- a/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js +++ b/packages/cli/src/commands/setup/deploy/providers/coherenceHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import toml from '@iarna/toml' import { getSchema, getConfig } from '@prisma/internals' diff --git a/packages/cli/src/commands/setup/deploy/providers/edgio.js b/packages/cli/src/commands/setup/deploy/providers/edgio.js index abe121e651ab..51eb5aabfa44 100644 --- a/packages/cli/src/commands/setup/deploy/providers/edgio.js +++ b/packages/cli/src/commands/setup/deploy/providers/edgio.js @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js index 42633d6bdfb3..bdbb88eea87e 100644 --- a/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js +++ b/packages/cli/src/commands/setup/deploy/providers/flightcontrol.js @@ -1,7 +1,7 @@ // import terminalLink from 'terminal-link' -import fs from 'fs' -import { EOL } from 'os' -import path from 'path' +import fs from 'node:fs' +import { EOL } from 'node:os' +import path from 'node:path' import { getSchema, getConfig } from '@prisma/internals' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/providers/netlify.js b/packages/cli/src/commands/setup/deploy/providers/netlify.js index 929fdc7e44e9..b319e2cd6e26 100644 --- a/packages/cli/src/commands/setup/deploy/providers/netlify.js +++ b/packages/cli/src/commands/setup/deploy/providers/netlify.js @@ -1,5 +1,5 @@ // import terminalLink from 'terminal-link' -import path from 'path' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/providers/render.js b/packages/cli/src/commands/setup/deploy/providers/render.js index 2c36a7fffb43..1a5a8020b376 100644 --- a/packages/cli/src/commands/setup/deploy/providers/render.js +++ b/packages/cli/src/commands/setup/deploy/providers/render.js @@ -1,6 +1,6 @@ // import terminalLink from 'terminal-link' -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getSchema, getConfig } from '@prisma/internals' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/providers/serverless.js b/packages/cli/src/commands/setup/deploy/providers/serverless.js index a1ac10fe916e..055c90338dcd 100644 --- a/packages/cli/src/commands/setup/deploy/providers/serverless.js +++ b/packages/cli/src/commands/setup/deploy/providers/serverless.js @@ -1,6 +1,6 @@ // import terminalLink from 'terminal-link' -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/deploy/templates/render.js b/packages/cli/src/commands/setup/deploy/templates/render.js index c2b4f654266b..7c2076d414d3 100644 --- a/packages/cli/src/commands/setup/deploy/templates/render.js +++ b/packages/cli/src/commands/setup/deploy/templates/render.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getPaths } from '../../../../lib' diff --git a/packages/cli/src/commands/setup/deploy/templates/serverless/api.js b/packages/cli/src/commands/setup/deploy/templates/serverless/api.js index 9ca33d04f17c..9a228c90ba0c 100644 --- a/packages/cli/src/commands/setup/deploy/templates/serverless/api.js +++ b/packages/cli/src/commands/setup/deploy/templates/serverless/api.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '../../../../../lib' diff --git a/packages/cli/src/commands/setup/deploy/templates/serverless/web.js b/packages/cli/src/commands/setup/deploy/templates/serverless/web.js index 80972e08474a..722d7aa88fb2 100644 --- a/packages/cli/src/commands/setup/deploy/templates/serverless/web.js +++ b/packages/cli/src/commands/setup/deploy/templates/serverless/web.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getPaths } from '../../../../../lib' diff --git a/packages/cli/src/commands/setup/generator/generator.js b/packages/cli/src/commands/setup/generator/generator.js index 9c61795c0532..f8624294bb01 100644 --- a/packages/cli/src/commands/setup/generator/generator.js +++ b/packages/cli/src/commands/setup/generator/generator.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import terminalLink from 'terminal-link' diff --git a/packages/cli/src/commands/setup/generator/generatorHandler.js b/packages/cli/src/commands/setup/generator/generatorHandler.js index 79b17554ca2a..ee7b3b69ddba 100644 --- a/packages/cli/src/commands/setup/generator/generatorHandler.js +++ b/packages/cli/src/commands/setup/generator/generatorHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fse from 'fs-extra' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js b/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js index 44dbbb8a7e0a..32f8254059be 100644 --- a/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js +++ b/packages/cli/src/commands/setup/graphiql/graphiqlHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import execa from 'execa' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/graphiql/graphiqlHelpers.js b/packages/cli/src/commands/setup/graphiql/graphiqlHelpers.js index 2acc16c6a334..0ce13b6c66a7 100644 --- a/packages/cli/src/commands/setup/graphiql/graphiqlHelpers.js +++ b/packages/cli/src/commands/setup/graphiql/graphiqlHelpers.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getPaths } from '../../../lib' import { isTypeScriptProject } from '../../../lib/project' diff --git a/packages/cli/src/commands/setup/i18n/i18nHandler.js b/packages/cli/src/commands/setup/i18n/i18nHandler.js index 1e07e255ba81..d6392a842b02 100644 --- a/packages/cli/src/commands/setup/i18n/i18nHandler.js +++ b/packages/cli/src/commands/setup/i18n/i18nHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import chalk from 'chalk' import execa from 'execa' diff --git a/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js b/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js index 12be8b901f0f..7ffaabdbfa09 100644 --- a/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js +++ b/packages/cli/src/commands/setup/tsconfig/tsconfigHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import chalk from 'chalk' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js index e088883d4177..d8444e802347 100644 --- a/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js +++ b/packages/cli/src/commands/setup/ui/libraries/chakra-ui.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/ui/libraries/mantine.js b/packages/cli/src/commands/setup/ui/libraries/mantine.js index 8723df80c2c0..7dfdd95cba2c 100644 --- a/packages/cli/src/commands/setup/ui/libraries/mantine.js +++ b/packages/cli/src/commands/setup/ui/libraries/mantine.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js index 89d1f7fa609e..a02b51753e23 100644 --- a/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js +++ b/packages/cli/src/commands/setup/ui/libraries/tailwindcss.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import execa from 'execa' import { outputFileSync } from 'fs-extra' diff --git a/packages/cli/src/commands/setup/vite/viteHandler.js b/packages/cli/src/commands/setup/vite/viteHandler.js index 993c29a94a8b..878bdf581ac6 100644 --- a/packages/cli/src/commands/setup/vite/viteHandler.js +++ b/packages/cli/src/commands/setup/vite/viteHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/setup/webpack/webpackHandler.js b/packages/cli/src/commands/setup/webpack/webpackHandler.js index 6c10cdb83a93..eabfcffba778 100644 --- a/packages/cli/src/commands/setup/webpack/webpackHandler.js +++ b/packages/cli/src/commands/setup/webpack/webpackHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import chalk from 'chalk' import { Listr } from 'listr2' diff --git a/packages/cli/src/commands/testHandler.js b/packages/cli/src/commands/testHandler.js index 9234684d570d..a90c58529968 100644 --- a/packages/cli/src/commands/testHandler.js +++ b/packages/cli/src/commands/testHandler.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import execa from 'execa' diff --git a/packages/cli/src/commands/type-checkHandler.js b/packages/cli/src/commands/type-checkHandler.js index 32d9ba285755..1f7ab9c625a0 100644 --- a/packages/cli/src/commands/type-checkHandler.js +++ b/packages/cli/src/commands/type-checkHandler.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import concurrently from 'concurrently' import execa from 'execa' diff --git a/packages/cli/src/commands/upgrade.js b/packages/cli/src/commands/upgrade.js index c200997a183b..4b11b151f1a4 100644 --- a/packages/cli/src/commands/upgrade.js +++ b/packages/cli/src/commands/upgrade.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import execa from 'execa' import latestVersion from 'latest-version' diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js index a344fc644feb..6499807343d0 100644 --- a/packages/cli/src/index.js +++ b/packages/cli/src/index.js @@ -1,7 +1,7 @@ #!/usr/bin/env node -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { trace, SpanStatusCode } from '@opentelemetry/api' import { config } from 'dotenv-defaults' diff --git a/packages/cli/src/lib/__tests__/index.test.js b/packages/cli/src/lib/__tests__/index.test.js index 3883c1dfe98d..ca776ed3ed07 100644 --- a/packages/cli/src/lib/__tests__/index.test.js +++ b/packages/cli/src/lib/__tests__/index.test.js @@ -1,6 +1,6 @@ global.__dirname = __dirname jest.mock('@redwoodjs/project-config', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('@redwoodjs/project-config'), getPaths: () => { @@ -15,8 +15,8 @@ jest.mock('@redwoodjs/project-config', () => { } }) -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import * as index from '../index' diff --git a/packages/cli/src/lib/__tests__/locking.test.js b/packages/cli/src/lib/__tests__/locking.test.js index d73d2ca303c6..1f22149f99e5 100644 --- a/packages/cli/src/lib/__tests__/locking.test.js +++ b/packages/cli/src/lib/__tests__/locking.test.js @@ -13,8 +13,8 @@ jest.mock('@redwoodjs/project-config', () => { }) jest.mock('fs') -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { setLock, unsetLock, isLockSet, clearLocks } from '../locking' diff --git a/packages/cli/src/lib/__tests__/mergeConfig.test.js b/packages/cli/src/lib/__tests__/mergeConfig.test.js index ad7bfe4070db..5a810e2a8c84 100644 --- a/packages/cli/src/lib/__tests__/mergeConfig.test.js +++ b/packages/cli/src/lib/__tests__/mergeConfig.test.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fs from 'fs-extra' diff --git a/packages/cli/src/lib/__tests__/rollback.test.js b/packages/cli/src/lib/__tests__/rollback.test.js index 830103d4d85e..97f2a88ec448 100644 --- a/packages/cli/src/lib/__tests__/rollback.test.js +++ b/packages/cli/src/lib/__tests__/rollback.test.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { Listr } from 'listr2' diff --git a/packages/cli/src/lib/__tests__/schemaHelpers.test.js b/packages/cli/src/lib/__tests__/schemaHelpers.test.js index cd4d171f8b68..f878b5c50760 100644 --- a/packages/cli/src/lib/__tests__/schemaHelpers.test.js +++ b/packages/cli/src/lib/__tests__/schemaHelpers.test.js @@ -1,6 +1,6 @@ global.__dirname = __dirname jest.mock('@redwoodjs/project-config', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('@redwoodjs/project-config'), getPaths: () => { diff --git a/packages/cli/src/lib/__tests__/updateCheck.test.js b/packages/cli/src/lib/__tests__/updateCheck.test.js index c97742f1735f..e2ffd452c61f 100644 --- a/packages/cli/src/lib/__tests__/updateCheck.test.js +++ b/packages/cli/src/lib/__tests__/updateCheck.test.js @@ -17,7 +17,7 @@ jest.mock('@redwoodjs/project-config', () => { } }) -import fs from 'fs' +import fs from 'node:fs' import latestVersion from 'latest-version' diff --git a/packages/cli/src/lib/background.js b/packages/cli/src/lib/background.js index a48d1c15385b..caa5d7bb87e0 100644 --- a/packages/cli/src/lib/background.js +++ b/packages/cli/src/lib/background.js @@ -1,6 +1,6 @@ -import { spawn } from 'child_process' -import os from 'os' -import path from 'path' +import { spawn } from 'node:child_process' +import os from 'node:os' +import path from 'node:path' import fs from 'fs-extra' diff --git a/packages/cli/src/lib/configureStorybook.js b/packages/cli/src/lib/configureStorybook.js index cccb7ba18276..6bb63d7ce45d 100644 --- a/packages/cli/src/lib/configureStorybook.js +++ b/packages/cli/src/lib/configureStorybook.js @@ -1,5 +1,5 @@ -import path from 'path' -import util from 'util' +import path from 'node:path' +import util from 'node:util' import fse from 'fs-extra' import prettier from 'prettier' diff --git a/packages/cli/src/lib/exec.js b/packages/cli/src/lib/exec.js index 4fb76cfb2c5b..baccae3f1a36 100644 --- a/packages/cli/src/lib/exec.js +++ b/packages/cli/src/lib/exec.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { registerApiSideBabelHook } from '@redwoodjs/internal/dist/build/babel/api' import { getWebSideDefaultBabelConfig } from '@redwoodjs/internal/dist/build/babel/web' diff --git a/packages/cli/src/lib/extendFile.js b/packages/cli/src/lib/extendFile.js index 2ce353f7ae74..88f6d720183c 100644 --- a/packages/cli/src/lib/extendFile.js +++ b/packages/cli/src/lib/extendFile.js @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' /** * Convenience function to check if a file includes a particular string. diff --git a/packages/cli/src/lib/generatePrismaClient.js b/packages/cli/src/lib/generatePrismaClient.js index 43ce4c74d01b..a0fd4a7b3da0 100644 --- a/packages/cli/src/lib/generatePrismaClient.js +++ b/packages/cli/src/lib/generatePrismaClient.js @@ -1,7 +1,7 @@ // helper used in Dev and Build commands -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { runCommandTask, getPaths } from '../lib' diff --git a/packages/cli/src/lib/index.js b/packages/cli/src/lib/index.js index aab2ad24733f..6a052300631f 100644 --- a/packages/cli/src/lib/index.js +++ b/packages/cli/src/lib/index.js @@ -1,7 +1,7 @@ -import { execSync } from 'child_process' -import fs from 'fs' -import https from 'https' -import path from 'path' +import { execSync } from 'node:child_process' +import fs from 'node:fs' +import https from 'node:https' +import path from 'node:path' import * as babel from '@babel/core' import boxen from 'boxen' diff --git a/packages/cli/src/lib/locking.js b/packages/cli/src/lib/locking.js index bbafb6f0eb4e..47c6641acca9 100644 --- a/packages/cli/src/lib/locking.js +++ b/packages/cli/src/lib/locking.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from './index' diff --git a/packages/cli/src/lib/packages.js b/packages/cli/src/lib/packages.js index 298da8f9d807..aeb41c183cfd 100644 --- a/packages/cli/src/lib/packages.js +++ b/packages/cli/src/lib/packages.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import fs from 'fs-extra' diff --git a/packages/cli/src/lib/project.js b/packages/cli/src/lib/project.js index deb1d019a7c6..cb2a8fce9113 100644 --- a/packages/cli/src/lib/project.js +++ b/packages/cli/src/lib/project.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '.' diff --git a/packages/cli/src/lib/rollback.js b/packages/cli/src/lib/rollback.js index 62107d60311e..7e11da7ba849 100644 --- a/packages/cli/src/lib/rollback.js +++ b/packages/cli/src/lib/rollback.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' // The stack containing rollback actions let rollback = [] diff --git a/packages/cli/src/lib/schemaHelpers.js b/packages/cli/src/lib/schemaHelpers.js index cf75aa95e031..f1d1c7b1c24f 100644 --- a/packages/cli/src/lib/schemaHelpers.js +++ b/packages/cli/src/lib/schemaHelpers.js @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import { getConfig, getDMMF } from '@prisma/internals' diff --git a/packages/cli/src/lib/test.js b/packages/cli/src/lib/test.js index da733d2f90fa..90736bcf9369 100644 --- a/packages/cli/src/lib/test.js +++ b/packages/cli/src/lib/test.js @@ -8,8 +8,8 @@ // expect('some output').toEqual(loadComponentFixture('component', 'filename.js')) // }) -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import './mockTelemetry' @@ -22,7 +22,7 @@ jest.mock('@redwoodjs/internal/dist/generate/generate', () => { }) jest.mock('@redwoodjs/project-config', () => { - const path = require('path') + const path = require('node:path') return { ...jest.requireActual('@redwoodjs/project-config'), getPaths: () => { diff --git a/packages/cli/src/lib/updateCheck.js b/packages/cli/src/lib/updateCheck.js index 24fd70feca9c..3edd0e94a570 100644 --- a/packages/cli/src/lib/updateCheck.js +++ b/packages/cli/src/lib/updateCheck.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import boxen from 'boxen' import chalk from 'chalk' diff --git a/packages/cli/src/plugin.js b/packages/cli/src/plugin.js index 6e65840909e8..bff5f0508f35 100644 --- a/packages/cli/src/plugin.js +++ b/packages/cli/src/plugin.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import chalk from 'chalk' diff --git a/packages/cli/src/rwfw.js b/packages/cli/src/rwfw.js index 77ecc130698d..9e52bd5426f9 100644 --- a/packages/cli/src/rwfw.js +++ b/packages/cli/src/rwfw.js @@ -1,7 +1,7 @@ #!/usr/bin/env node -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import Configstore from 'configstore/index' import execa from 'execa' diff --git a/packages/cli/src/telemetry/exporter.js b/packages/cli/src/telemetry/exporter.js index 226c8d50a381..edc5d8787e63 100644 --- a/packages/cli/src/telemetry/exporter.js +++ b/packages/cli/src/telemetry/exporter.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fs from 'fs-extra' diff --git a/packages/cli/src/telemetry/index.js b/packages/cli/src/telemetry/index.js index b8160d21e0a5..1492ad4dd5f9 100644 --- a/packages/cli/src/telemetry/index.js +++ b/packages/cli/src/telemetry/index.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api' import opentelemetry from '@opentelemetry/api' diff --git a/packages/cli/src/telemetry/resource.js b/packages/cli/src/telemetry/resource.js index 42060d7eecb7..9d677991ea6b 100644 --- a/packages/cli/src/telemetry/resource.js +++ b/packages/cli/src/telemetry/resource.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions' import ci from 'ci-info' diff --git a/packages/cli/src/telemetry/send.js b/packages/cli/src/telemetry/send.js index 0ee99717a296..0e30da180b55 100644 --- a/packages/cli/src/telemetry/send.js +++ b/packages/cli/src/telemetry/send.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http' import { Resource } from '@opentelemetry/resources' diff --git a/packages/codemods/jest.setup.js b/packages/codemods/jest.setup.js index 22269f8b5245..c2080c10fd56 100644 --- a/packages/codemods/jest.setup.js +++ b/packages/codemods/jest.setup.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') globalThis.matchTransformSnapshot = require('./src/testUtils/matchTransformSnapshot').matchTransformSnapshot diff --git a/packages/codemods/src/codemods/list.yargs.ts b/packages/codemods/src/codemods/list.yargs.ts index 744c68e27f68..2e0e423dc8f0 100644 --- a/packages/codemods/src/codemods/list.yargs.ts +++ b/packages/codemods/src/codemods/list.yargs.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import yargs from 'yargs' import { decamelize } from 'yargs-parser' diff --git a/packages/codemods/src/codemods/v0.37.x/addDirectives/addDirectives.ts b/packages/codemods/src/codemods/v0.37.x/addDirectives/addDirectives.ts index 11554ac0d715..a25e7889746a 100644 --- a/packages/codemods/src/codemods/v0.37.x/addDirectives/addDirectives.ts +++ b/packages/codemods/src/codemods/v0.37.x/addDirectives/addDirectives.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { fetch } from '@whatwg-node/fetch' import fg from 'fast-glob' diff --git a/packages/codemods/src/codemods/v0.37.x/updateApiImports/updateApiImports.yargs.ts b/packages/codemods/src/codemods/v0.37.x/updateApiImports/updateApiImports.yargs.ts index d3851816e321..59bb9c7f53cf 100644 --- a/packages/codemods/src/codemods/v0.37.x/updateApiImports/updateApiImports.yargs.ts +++ b/packages/codemods/src/codemods/v0.37.x/updateApiImports/updateApiImports.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v0.37.x/updateForms/updateForms.yargs.ts b/packages/codemods/src/codemods/v0.37.x/updateForms/updateForms.yargs.ts index 3d5095f8bd49..0fbed2cf8f7a 100644 --- a/packages/codemods/src/codemods/v0.37.x/updateForms/updateForms.yargs.ts +++ b/packages/codemods/src/codemods/v0.37.x/updateForms/updateForms.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v0.37.x/updateGraphQLFunction/updateGraphQLFunction.yargs.ts b/packages/codemods/src/codemods/v0.37.x/updateGraphQLFunction/updateGraphQLFunction.yargs.ts index 378616495404..eb3e5f0b7672 100644 --- a/packages/codemods/src/codemods/v0.37.x/updateGraphQLFunction/updateGraphQLFunction.yargs.ts +++ b/packages/codemods/src/codemods/v0.37.x/updateGraphQLFunction/updateGraphQLFunction.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v0.37.x/updateScenarios/updateScenarios.yargs.ts b/packages/codemods/src/codemods/v0.37.x/updateScenarios/updateScenarios.yargs.ts index 09e316487e7a..872ca4b0e25a 100644 --- a/packages/codemods/src/codemods/v0.37.x/updateScenarios/updateScenarios.yargs.ts +++ b/packages/codemods/src/codemods/v0.37.x/updateScenarios/updateScenarios.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v0.38.x/renameApiProxyPath/renameApiProxyPath.ts b/packages/codemods/src/codemods/v0.38.x/renameApiProxyPath/renameApiProxyPath.ts index 027b75926de3..d0381c5be118 100644 --- a/packages/codemods/src/codemods/v0.38.x/renameApiProxyPath/renameApiProxyPath.ts +++ b/packages/codemods/src/codemods/v0.38.x/renameApiProxyPath/renameApiProxyPath.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/codemods/src/codemods/v0.38.x/updateNodeEngine/updateNodeEngine.ts b/packages/codemods/src/codemods/v0.38.x/updateNodeEngine/updateNodeEngine.ts index 3dae0aaa14d1..4df5e958be76 100644 --- a/packages/codemods/src/codemods/v0.38.x/updateNodeEngine/updateNodeEngine.ts +++ b/packages/codemods/src/codemods/v0.38.x/updateNodeEngine/updateNodeEngine.ts @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import getRootPackageJSON from '../../../lib/getRootPackageJSON' diff --git a/packages/codemods/src/codemods/v0.38.x/updateScaffoldStyles/updateScaffoldStyles.ts b/packages/codemods/src/codemods/v0.38.x/updateScaffoldStyles/updateScaffoldStyles.ts index 6d0ee7c7b4d8..5652668ea65e 100644 --- a/packages/codemods/src/codemods/v0.38.x/updateScaffoldStyles/updateScaffoldStyles.ts +++ b/packages/codemods/src/codemods/v0.38.x/updateScaffoldStyles/updateScaffoldStyles.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/codemods/src/codemods/v0.38.x/updateSeedScript/updateSeedScript.ts b/packages/codemods/src/codemods/v0.38.x/updateSeedScript/updateSeedScript.ts index 261c91335718..d8bd1c2c7e40 100644 --- a/packages/codemods/src/codemods/v0.38.x/updateSeedScript/updateSeedScript.ts +++ b/packages/codemods/src/codemods/v0.38.x/updateSeedScript/updateSeedScript.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { fetch } from '@whatwg-node/fetch' diff --git a/packages/codemods/src/codemods/v0.39.x/updateBabelConfig/updateBabelConfig.ts b/packages/codemods/src/codemods/v0.39.x/updateBabelConfig/updateBabelConfig.ts index 863bfb8aad61..f04c3075a7a2 100644 --- a/packages/codemods/src/codemods/v0.39.x/updateBabelConfig/updateBabelConfig.ts +++ b/packages/codemods/src/codemods/v0.39.x/updateBabelConfig/updateBabelConfig.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/codemods/src/codemods/v0.39.x/updateCellMocks/updateCellMocks.yargs.ts b/packages/codemods/src/codemods/v0.39.x/updateCellMocks/updateCellMocks.yargs.ts index ffb50251d116..2096af58bd90 100644 --- a/packages/codemods/src/codemods/v0.39.x/updateCellMocks/updateCellMocks.yargs.ts +++ b/packages/codemods/src/codemods/v0.39.x/updateCellMocks/updateCellMocks.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v0.39.x/updateRouterParamTypes/updateRouterParamTypes.yargs.ts b/packages/codemods/src/codemods/v0.39.x/updateRouterParamTypes/updateRouterParamTypes.yargs.ts index 4b7cdce0602c..24976e367765 100644 --- a/packages/codemods/src/codemods/v0.39.x/updateRouterParamTypes/updateRouterParamTypes.yargs.ts +++ b/packages/codemods/src/codemods/v0.39.x/updateRouterParamTypes/updateRouterParamTypes.yargs.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v0.44.x/updateJestConfig/updateJestConfig.ts b/packages/codemods/src/codemods/v0.44.x/updateJestConfig/updateJestConfig.ts index 420f07369e19..30c4841c3f60 100644 --- a/packages/codemods/src/codemods/v0.44.x/updateJestConfig/updateJestConfig.ts +++ b/packages/codemods/src/codemods/v0.44.x/updateJestConfig/updateJestConfig.ts @@ -1,8 +1,8 @@ /** * @typedef {[string, string, string]} JestConfigPaths */ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/codemods/src/codemods/v0.48.x/renameVerifierTimestamp/renameVerifierTimestamp.yargs.ts b/packages/codemods/src/codemods/v0.48.x/renameVerifierTimestamp/renameVerifierTimestamp.yargs.ts index 823850f62853..3a9bf39df684 100644 --- a/packages/codemods/src/codemods/v0.48.x/renameVerifierTimestamp/renameVerifierTimestamp.yargs.ts +++ b/packages/codemods/src/codemods/v0.48.x/renameVerifierTimestamp/renameVerifierTimestamp.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v0.48.x/upgradeYarn/upgradeYarn.ts b/packages/codemods/src/codemods/v0.48.x/upgradeYarn/upgradeYarn.ts index 8c1dac199ccc..599095ccf956 100644 --- a/packages/codemods/src/codemods/v0.48.x/upgradeYarn/upgradeYarn.ts +++ b/packages/codemods/src/codemods/v0.48.x/upgradeYarn/upgradeYarn.ts @@ -1,6 +1,6 @@ -import { spawnSync } from 'child_process' -import fs from 'fs' -import path from 'path' +import { spawnSync } from 'node:child_process' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/codemods/src/codemods/v0.50.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts b/packages/codemods/src/codemods/v0.50.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts index 26abf5e270d6..46a04e6d8497 100644 --- a/packages/codemods/src/codemods/v0.50.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts +++ b/packages/codemods/src/codemods/v0.50.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { fetch } from '@whatwg-node/fetch' diff --git a/packages/codemods/src/codemods/v2.x.x/configureFastify/configureFastify.yargs.ts b/packages/codemods/src/codemods/v2.x.x/configureFastify/configureFastify.yargs.ts index 8180f0901c6e..dc0476e44d64 100644 --- a/packages/codemods/src/codemods/v2.x.x/configureFastify/configureFastify.yargs.ts +++ b/packages/codemods/src/codemods/v2.x.x/configureFastify/configureFastify.yargs.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { fetch } from '@whatwg-node/fetch' import fg from 'fast-glob' diff --git a/packages/codemods/src/codemods/v2.x.x/updateResolverTypes/updateResolverTypes.yargs.ts b/packages/codemods/src/codemods/v2.x.x/updateResolverTypes/updateResolverTypes.yargs.ts index 901f2bd1132c..1c33ac63cf28 100644 --- a/packages/codemods/src/codemods/v2.x.x/updateResolverTypes/updateResolverTypes.yargs.ts +++ b/packages/codemods/src/codemods/v2.x.x/updateResolverTypes/updateResolverTypes.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task, { TaskInnerAPI } from 'tasuku' diff --git a/packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/updateClerkGetCurrentUser.yargs.ts b/packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/updateClerkGetCurrentUser.yargs.ts index 4643dd49c1c1..f100248f518b 100644 --- a/packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/updateClerkGetCurrentUser.yargs.ts +++ b/packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/updateClerkGetCurrentUser.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import task, { TaskInnerAPI } from 'tasuku' diff --git a/packages/codemods/src/codemods/v4.x.x/useArmor/useArmor.yargs.ts b/packages/codemods/src/codemods/v4.x.x/useArmor/useArmor.yargs.ts index 68a6d6d9ae64..84a11f7a2f7a 100644 --- a/packages/codemods/src/codemods/v4.x.x/useArmor/useArmor.yargs.ts +++ b/packages/codemods/src/codemods/v4.x.x/useArmor/useArmor.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v5.x.x/cellQueryResult/cellQueryResult.yargs.ts b/packages/codemods/src/codemods/v5.x.x/cellQueryResult/cellQueryResult.yargs.ts index 6a1189654647..20e164c5f541 100644 --- a/packages/codemods/src/codemods/v5.x.x/cellQueryResult/cellQueryResult.yargs.ts +++ b/packages/codemods/src/codemods/v5.x.x/cellQueryResult/cellQueryResult.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v5.x.x/renameValidateWith/renameValidateWith.yargs.ts b/packages/codemods/src/codemods/v5.x.x/renameValidateWith/renameValidateWith.yargs.ts index b36f01ad02d7..97f991bdcd55 100644 --- a/packages/codemods/src/codemods/v5.x.x/renameValidateWith/renameValidateWith.yargs.ts +++ b/packages/codemods/src/codemods/v5.x.x/renameValidateWith/renameValidateWith.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v5.x.x/updateAuth0ToV2/updateAuth0ToV2.yargs.ts b/packages/codemods/src/codemods/v5.x.x/updateAuth0ToV2/updateAuth0ToV2.yargs.ts index 6e0cf1a30f58..f70af4d37c5c 100644 --- a/packages/codemods/src/codemods/v5.x.x/updateAuth0ToV2/updateAuth0ToV2.yargs.ts +++ b/packages/codemods/src/codemods/v5.x.x/updateAuth0ToV2/updateAuth0ToV2.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import execa from 'execa' import task from 'tasuku' diff --git a/packages/codemods/src/codemods/v5.x.x/updateNodeEngineTo18/updateNodeEngineTo18.ts b/packages/codemods/src/codemods/v5.x.x/updateNodeEngineTo18/updateNodeEngineTo18.ts index b728547d449d..65eb51777457 100644 --- a/packages/codemods/src/codemods/v5.x.x/updateNodeEngineTo18/updateNodeEngineTo18.ts +++ b/packages/codemods/src/codemods/v5.x.x/updateNodeEngineTo18/updateNodeEngineTo18.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/codemods/src/codemods/v5.x.x/upgradeToReact18/upgradeToReact18.ts b/packages/codemods/src/codemods/v5.x.x/upgradeToReact18/upgradeToReact18.ts index 5fb15c617966..255401c869c0 100644 --- a/packages/codemods/src/codemods/v5.x.x/upgradeToReact18/upgradeToReact18.ts +++ b/packages/codemods/src/codemods/v5.x.x/upgradeToReact18/upgradeToReact18.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { load } from 'cheerio' import execa from 'execa' diff --git a/packages/codemods/src/codemods/v6.x.x/changeGlobalToGlobalThis/changeGlobalToGlobalThis.yargs.ts b/packages/codemods/src/codemods/v6.x.x/changeGlobalToGlobalThis/changeGlobalToGlobalThis.yargs.ts index 6f78fe5fb384..d8199f7cc3d0 100644 --- a/packages/codemods/src/codemods/v6.x.x/changeGlobalToGlobalThis/changeGlobalToGlobalThis.yargs.ts +++ b/packages/codemods/src/codemods/v6.x.x/changeGlobalToGlobalThis/changeGlobalToGlobalThis.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task, { TaskInnerAPI } from 'tasuku' diff --git a/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.ts b/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.ts index 2b02f44862ec..e88e96384122 100644 --- a/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.ts +++ b/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.ts @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import type { FileInfo, API } from 'jscodeshift' diff --git a/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.yargs.ts b/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.yargs.ts index 8bc599d6518a..284aee0f3fb6 100644 --- a/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.yargs.ts +++ b/packages/codemods/src/codemods/v6.x.x/convertJsToJsx/convertJsToJsx.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task, { TaskInnerAPI } from 'tasuku' diff --git a/packages/codemods/src/codemods/v6.x.x/processEnvDotNotation/processEnvDotNotation.yargs.ts b/packages/codemods/src/codemods/v6.x.x/processEnvDotNotation/processEnvDotNotation.yargs.ts index e96c63111a5c..bfcf8363aa74 100644 --- a/packages/codemods/src/codemods/v6.x.x/processEnvDotNotation/processEnvDotNotation.yargs.ts +++ b/packages/codemods/src/codemods/v6.x.x/processEnvDotNotation/processEnvDotNotation.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task, { TaskInnerAPI } from 'tasuku' diff --git a/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.ts b/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.ts index 3b1a2a204182..673a94de17ae 100644 --- a/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.ts +++ b/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.ts @@ -1,5 +1,5 @@ -import fs from 'fs/promises' -import path from 'path' +import fs from 'node:fs/promises' +import path from 'node:path' import { transform as svgrTransform } from '@svgr/core' import type { API, FileInfo, StringLiteral } from 'jscodeshift' diff --git a/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.yargs.ts b/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.yargs.ts index dae1e0cd8716..583a14501bac 100644 --- a/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.yargs.ts +++ b/packages/codemods/src/codemods/v6.x.x/replaceComponentSvgs/replaceComponentSvgs.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task, { TaskInnerAPI } from 'tasuku' diff --git a/packages/codemods/src/codemods/v6.x.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts b/packages/codemods/src/codemods/v6.x.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts index ba19dd9c9da8..24eb2094b6a8 100644 --- a/packages/codemods/src/codemods/v6.x.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts +++ b/packages/codemods/src/codemods/v6.x.x/updateDevFatalErrorPage/updateDevFatalErrorPage.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { fetch } from '@whatwg-node/fetch' diff --git a/packages/codemods/src/codemods/v6.x.x/updateThemeConfig/updateThemeConfig.yargs.ts b/packages/codemods/src/codemods/v6.x.x/updateThemeConfig/updateThemeConfig.yargs.ts index 468c3e5b817a..cb5f2dfe627e 100644 --- a/packages/codemods/src/codemods/v6.x.x/updateThemeConfig/updateThemeConfig.yargs.ts +++ b/packages/codemods/src/codemods/v6.x.x/updateThemeConfig/updateThemeConfig.yargs.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import task, { TaskInnerAPI } from 'tasuku' diff --git a/packages/codemods/src/lib/cells.ts b/packages/codemods/src/lib/cells.ts index 54e69bf0357c..586a9db26166 100644 --- a/packages/codemods/src/lib/cells.ts +++ b/packages/codemods/src/lib/cells.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { types } from '@babel/core' import { parse as babelParse, ParserPlugin } from '@babel/parser' diff --git a/packages/codemods/src/lib/getRootPackageJSON.ts b/packages/codemods/src/lib/getRootPackageJSON.ts index f68c3a52a605..7ac809b0ecc3 100644 --- a/packages/codemods/src/lib/getRootPackageJSON.ts +++ b/packages/codemods/src/lib/getRootPackageJSON.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/codemods/src/lib/prettify.ts b/packages/codemods/src/lib/prettify.ts index 7a2927f24e85..dc3168f443b8 100644 --- a/packages/codemods/src/lib/prettify.ts +++ b/packages/codemods/src/lib/prettify.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { format } from 'prettier' diff --git a/packages/codemods/src/testUtils/index.ts b/packages/codemods/src/testUtils/index.ts index 257868193ef3..b8735bb3beb7 100644 --- a/packages/codemods/src/testUtils/index.ts +++ b/packages/codemods/src/testUtils/index.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { format } from 'prettier' import parserBabel from 'prettier/parser-babel' diff --git a/packages/codemods/src/testUtils/matchFolderTransform.ts b/packages/codemods/src/testUtils/matchFolderTransform.ts index a56298c6ae84..a88a6e346f26 100644 --- a/packages/codemods/src/testUtils/matchFolderTransform.ts +++ b/packages/codemods/src/testUtils/matchFolderTransform.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' import fse from 'fs-extra' diff --git a/packages/codemods/src/testUtils/matchInlineTransformSnapshot.ts b/packages/codemods/src/testUtils/matchInlineTransformSnapshot.ts index a95386a5fe59..7e77425ed24d 100644 --- a/packages/codemods/src/testUtils/matchInlineTransformSnapshot.ts +++ b/packages/codemods/src/testUtils/matchInlineTransformSnapshot.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import tempy from 'tempy' diff --git a/packages/codemods/src/testUtils/matchTransformSnapshot.ts b/packages/codemods/src/testUtils/matchTransformSnapshot.ts index f90481609182..9b3fb95899d6 100644 --- a/packages/codemods/src/testUtils/matchTransformSnapshot.ts +++ b/packages/codemods/src/testUtils/matchTransformSnapshot.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import tempy from 'tempy' diff --git a/packages/core/config/webpack.common.js b/packages/core/config/webpack.common.js index 5e51e3d7b707..da9b2d1e6f97 100644 --- a/packages/core/config/webpack.common.js +++ b/packages/core/config/webpack.common.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin') const CopyPlugin = require('copy-webpack-plugin') diff --git a/packages/core/src/bins/cross-env.ts b/packages/core/src/bins/cross-env.ts index a01c07c5df66..293facc69131 100644 --- a/packages/core/src/bins/cross-env.ts +++ b/packages/core/src/bins/cross-env.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromCrossEnv = createRequire( require.resolve('cross-env/package.json') diff --git a/packages/core/src/bins/eslint.ts b/packages/core/src/bins/eslint.ts index a4904d38e678..5a94fdc2cfa1 100644 --- a/packages/core/src/bins/eslint.ts +++ b/packages/core/src/bins/eslint.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromESLint = createRequire(require.resolve('eslint/package.json')) diff --git a/packages/core/src/bins/jest.ts b/packages/core/src/bins/jest.ts index 7269056f094a..dc5fef606fc3 100644 --- a/packages/core/src/bins/jest.ts +++ b/packages/core/src/bins/jest.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromJest = createRequire(require.resolve('jest/package.json')) diff --git a/packages/core/src/bins/nodemon.ts b/packages/core/src/bins/nodemon.ts index 82c33c06c015..e1cc4845d52c 100644 --- a/packages/core/src/bins/nodemon.ts +++ b/packages/core/src/bins/nodemon.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromNodemon = createRequire( require.resolve('nodemon/package.json') diff --git a/packages/core/src/bins/redwood.ts b/packages/core/src/bins/redwood.ts index 7939f0c04dad..e9efca2cae4e 100644 --- a/packages/core/src/bins/redwood.ts +++ b/packages/core/src/bins/redwood.ts @@ -17,7 +17,7 @@ * - https://yarnpkg.com/advanced/rulebook#packages-should-only-ever-require-what-they-formally-list-in-their-dependencies * - https://yarnpkg.com/advanced/rulebook#modules-shouldnt-hardcode-node_modules-paths-to-access-other-modules */ -import { createRequire } from 'module' +import { createRequire } from 'node:module' // You can think about the argument we're passing to `createRequire` as being kinda like setting the `cwd`: // diff --git a/packages/core/src/bins/rw-api-server-watch.ts b/packages/core/src/bins/rw-api-server-watch.ts index c55b59a3ceeb..fc35cdc2aa9e 100644 --- a/packages/core/src/bins/rw-api-server-watch.ts +++ b/packages/core/src/bins/rw-api-server-watch.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromApiServer = createRequire( require.resolve('@redwoodjs/api-server/package.json') diff --git a/packages/core/src/bins/rw-dev-fe.ts b/packages/core/src/bins/rw-dev-fe.ts index e25b584ad397..0aaa4aebf4cf 100644 --- a/packages/core/src/bins/rw-dev-fe.ts +++ b/packages/core/src/bins/rw-dev-fe.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromRwVite = createRequire( require.resolve('@redwoodjs/vite/package.json') diff --git a/packages/core/src/bins/rw-gen-watch.ts b/packages/core/src/bins/rw-gen-watch.ts index 1f6854e2f73d..41019fd0a02a 100644 --- a/packages/core/src/bins/rw-gen-watch.ts +++ b/packages/core/src/bins/rw-gen-watch.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromInternal = createRequire( require.resolve('@redwoodjs/internal/package.json') diff --git a/packages/core/src/bins/rw-gen.ts b/packages/core/src/bins/rw-gen.ts index 557d81daec35..c0c066c0cc8e 100644 --- a/packages/core/src/bins/rw-gen.ts +++ b/packages/core/src/bins/rw-gen.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromInternal = createRequire( require.resolve('@redwoodjs/internal/package.json') diff --git a/packages/core/src/bins/rw-log-formatter.ts b/packages/core/src/bins/rw-log-formatter.ts index 2a502078eeed..015a66828166 100644 --- a/packages/core/src/bins/rw-log-formatter.ts +++ b/packages/core/src/bins/rw-log-formatter.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromApiServer = createRequire( require.resolve('@redwoodjs/api-server/package.json') diff --git a/packages/core/src/bins/rw-serve-api.ts b/packages/core/src/bins/rw-serve-api.ts index 4156ecaa86f7..3b3cbe1fc19f 100644 --- a/packages/core/src/bins/rw-serve-api.ts +++ b/packages/core/src/bins/rw-serve-api.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromApiServer = createRequire( require.resolve('@redwoodjs/api-server/package.json') diff --git a/packages/core/src/bins/rw-serve-fe.ts b/packages/core/src/bins/rw-serve-fe.ts index a31988ae98bf..2c8e7c038724 100644 --- a/packages/core/src/bins/rw-serve-fe.ts +++ b/packages/core/src/bins/rw-serve-fe.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromRwVite = createRequire( require.resolve('@redwoodjs/vite/package.json') diff --git a/packages/core/src/bins/rw-server.ts b/packages/core/src/bins/rw-server.ts index 05b40f9c1076..edfa75488e8f 100644 --- a/packages/core/src/bins/rw-server.ts +++ b/packages/core/src/bins/rw-server.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromApiServer = createRequire( require.resolve('@redwoodjs/api-server/package.json') diff --git a/packages/core/src/bins/rw-web-server.ts b/packages/core/src/bins/rw-web-server.ts index eaa87af6af0b..2ea215773c00 100644 --- a/packages/core/src/bins/rw-web-server.ts +++ b/packages/core/src/bins/rw-web-server.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromWebServer = createRequire( require.resolve('@redwoodjs/web-server/package.json') diff --git a/packages/core/src/bins/rwfw.ts b/packages/core/src/bins/rwfw.ts index 3e613a4a674f..4a2ab8940471 100644 --- a/packages/core/src/bins/rwfw.ts +++ b/packages/core/src/bins/rwfw.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromCli = createRequire( require.resolve('@redwoodjs/cli/package.json') diff --git a/packages/create-redwood-app/src/create-redwood-app.js b/packages/create-redwood-app/src/create-redwood-app.js index f40fb0fd3c65..3b943c058bfa 100644 --- a/packages/create-redwood-app/src/create-redwood-app.js +++ b/packages/create-redwood-app/src/create-redwood-app.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -import path from 'path' +import path from 'node:path' import { trace, SpanStatusCode } from '@opentelemetry/api' import checkNodeVersionCb from 'check-node-version' diff --git a/packages/create-redwood-app/templates/js/web/vite.config.js b/packages/create-redwood-app/templates/js/web/vite.config.js index 56bde9d09d8b..78fb5e971ddc 100644 --- a/packages/create-redwood-app/templates/js/web/vite.config.js +++ b/packages/create-redwood-app/templates/js/web/vite.config.js @@ -1,4 +1,4 @@ -import dns from 'dns' +import dns from 'node:dns' import { defineConfig } from 'vite' diff --git a/packages/create-redwood-app/templates/ts/web/vite.config.ts b/packages/create-redwood-app/templates/ts/web/vite.config.ts index 9f02cb335e2a..b17a646840c8 100644 --- a/packages/create-redwood-app/templates/ts/web/vite.config.ts +++ b/packages/create-redwood-app/templates/ts/web/vite.config.ts @@ -1,4 +1,4 @@ -import dns from 'dns' +import dns from 'node:dns' import { defineConfig, UserConfig } from 'vite' diff --git a/packages/create-redwood-app/tests/template.test.js b/packages/create-redwood-app/tests/template.test.js index 4b777c63fe8f..ee8e0ffe9e5c 100644 --- a/packages/create-redwood-app/tests/template.test.js +++ b/packages/create-redwood-app/tests/template.test.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import klawSync from 'klaw-sync' diff --git a/packages/eslint-plugin/src/service-type-annotations.ts b/packages/eslint-plugin/src/service-type-annotations.ts index eab27f32416a..d5509f83985b 100644 --- a/packages/eslint-plugin/src/service-type-annotations.ts +++ b/packages/eslint-plugin/src/service-type-annotations.ts @@ -1,4 +1,4 @@ -import { basename } from 'path' +import { basename } from 'node:path' import type { Identifier } from '@typescript-eslint/types/dist/generated/ast-spec' import type { Rule } from 'eslint' diff --git a/packages/graphql-server/__mocks__/@redwoodjs/paths.js b/packages/graphql-server/__mocks__/@redwoodjs/paths.js index e0393ff4d89a..668980eef5dc 100644 --- a/packages/graphql-server/__mocks__/@redwoodjs/paths.js +++ b/packages/graphql-server/__mocks__/@redwoodjs/paths.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' const BASE_PATH = path.resolve(__dirname, '../../src/__tests__/fixtures') diff --git a/packages/graphql-server/src/globalContextStore.ts b/packages/graphql-server/src/globalContextStore.ts index a8f9e1b578f9..dbaf23f59e67 100644 --- a/packages/graphql-server/src/globalContextStore.ts +++ b/packages/graphql-server/src/globalContextStore.ts @@ -1,6 +1,6 @@ /* eslint-disable react-hooks/rules-of-hooks */ -import { AsyncLocalStorage } from 'async_hooks' +import { AsyncLocalStorage } from 'node:async_hooks' import type { GlobalContext } from './globalContext' diff --git a/packages/graphql-server/src/plugins/__tests__/useRedwoodLogger.test.ts b/packages/graphql-server/src/plugins/__tests__/useRedwoodLogger.test.ts index 2e69cf2ee2b4..d745095ebb3e 100644 --- a/packages/graphql-server/src/plugins/__tests__/useRedwoodLogger.test.ts +++ b/packages/graphql-server/src/plugins/__tests__/useRedwoodLogger.test.ts @@ -1,6 +1,6 @@ -import { existsSync, readFileSync, statSync } from 'fs' -import os from 'os' -import { join } from 'path' +import { existsSync, readFileSync, statSync } from 'node:fs' +import os from 'node:os' +import { join } from 'node:path' import { useEngine } from '@envelop/core' import { createTestkit } from '@envelop/testing' diff --git a/packages/internal/src/__tests__/ast.test.ts b/packages/internal/src/__tests__/ast.test.ts index e041f8f9c8d6..64f5ebf95a89 100644 --- a/packages/internal/src/__tests__/ast.test.ts +++ b/packages/internal/src/__tests__/ast.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getGqlQueries, @@ -9,7 +9,7 @@ import { } from '../ast' jest.mock('@redwoodjs/project-config', () => { - const path = require('path') + const path = require('node:path') const baseFixturePath = path.join(__dirname, 'fixtures') return { getPaths: () => ({ diff --git a/packages/internal/src/__tests__/build_api.test.ts b/packages/internal/src/__tests__/build_api.test.ts index 8c23fb8d9d9f..a6b04361ef18 100644 --- a/packages/internal/src/__tests__/build_api.test.ts +++ b/packages/internal/src/__tests__/build_api.test.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import * as babel from '@babel/core' import compat from 'core-js-compat' diff --git a/packages/internal/src/__tests__/build_web.test.ts b/packages/internal/src/__tests__/build_web.test.ts index bdd7412afe48..154a64883aa0 100644 --- a/packages/internal/src/__tests__/build_web.test.ts +++ b/packages/internal/src/__tests__/build_web.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { ensurePosixPath, getPaths } from '@redwoodjs/project-config' diff --git a/packages/internal/src/__tests__/configPath.test.ts b/packages/internal/src/__tests__/configPath.test.ts index 173f213af8ad..a9b65d0280d5 100644 --- a/packages/internal/src/__tests__/configPath.test.ts +++ b/packages/internal/src/__tests__/configPath.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getConfigPath } from '@redwoodjs/project-config' diff --git a/packages/internal/src/__tests__/files.test.ts b/packages/internal/src/__tests__/files.test.ts index 97b341fd02f3..f8abb39b6352 100644 --- a/packages/internal/src/__tests__/files.test.ts +++ b/packages/internal/src/__tests__/files.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' const FIXTURE_PATH = path.resolve( __dirname, diff --git a/packages/internal/src/__tests__/gql.test.ts b/packages/internal/src/__tests__/gql.test.ts index 2596d4aff4ac..b038a9b5a772 100644 --- a/packages/internal/src/__tests__/gql.test.ts +++ b/packages/internal/src/__tests__/gql.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import gql from 'graphql-tag' diff --git a/packages/internal/src/__tests__/graphqlCodeGen.test.ts b/packages/internal/src/__tests__/graphqlCodeGen.test.ts index e968b14e1abd..01dffac33229 100644 --- a/packages/internal/src/__tests__/graphqlCodeGen.test.ts +++ b/packages/internal/src/__tests__/graphqlCodeGen.test.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { generateTypeDefGraphQLApi, diff --git a/packages/internal/src/__tests__/graphqlSchema.test.ts b/packages/internal/src/__tests__/graphqlSchema.test.ts index 0dd639575c7f..69fbaae40084 100644 --- a/packages/internal/src/__tests__/graphqlSchema.test.ts +++ b/packages/internal/src/__tests__/graphqlSchema.test.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import chalk from 'chalk' import terminalLink from 'terminal-link' diff --git a/packages/internal/src/__tests__/jsx.test.ts b/packages/internal/src/__tests__/jsx.test.ts index 4699be5d8e07..fe688362b30f 100644 --- a/packages/internal/src/__tests__/jsx.test.ts +++ b/packages/internal/src/__tests__/jsx.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { fileToAst } from '../ast' import { getJsxElements } from '../jsx' diff --git a/packages/internal/src/__tests__/nestedPages.test.ts b/packages/internal/src/__tests__/nestedPages.test.ts index a66c2b7128f2..a6423b79ed86 100644 --- a/packages/internal/src/__tests__/nestedPages.test.ts +++ b/packages/internal/src/__tests__/nestedPages.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { expect } from '@jest/globals' diff --git a/packages/internal/src/__tests__/project.test.ts b/packages/internal/src/__tests__/project.test.ts index f1bd6189cf2d..4eb8dd5aefcd 100644 --- a/packages/internal/src/__tests__/project.test.ts +++ b/packages/internal/src/__tests__/project.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getTsConfigs } from '../project' diff --git a/packages/internal/src/__tests__/resolverFn.test.ts b/packages/internal/src/__tests__/resolverFn.test.ts index 2d6dc7ef8740..4d4d53a51fe6 100644 --- a/packages/internal/src/__tests__/resolverFn.test.ts +++ b/packages/internal/src/__tests__/resolverFn.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getResolverFnType } from '../generate/graphqlCodeGen' diff --git a/packages/internal/src/__tests__/routes.test.ts b/packages/internal/src/__tests__/routes.test.ts index d12c4f29af5f..f1bad7e54abb 100644 --- a/packages/internal/src/__tests__/routes.test.ts +++ b/packages/internal/src/__tests__/routes.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getDuplicateRoutes, warningForDuplicateRoutes } from '../routes' diff --git a/packages/internal/src/__tests__/typeDefinitions.test.ts b/packages/internal/src/__tests__/typeDefinitions.test.ts index 99d54be99b03..592d680c0219 100644 --- a/packages/internal/src/__tests__/typeDefinitions.test.ts +++ b/packages/internal/src/__tests__/typeDefinitions.test.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { ensurePosixPath } from '@redwoodjs/project-config' diff --git a/packages/internal/src/__tests__/validateSchema.test.ts b/packages/internal/src/__tests__/validateSchema.test.ts index d910cbc946d8..95c93544dc77 100644 --- a/packages/internal/src/__tests__/validateSchema.test.ts +++ b/packages/internal/src/__tests__/validateSchema.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { loadAndValidateSdls } from '../validateSchema' diff --git a/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts b/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts index 3d745d9e1a82..903e740aa22a 100644 --- a/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts +++ b/packages/internal/src/__tests__/validateSchemaForAuthDirectives.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { CodeFileLoader } from '@graphql-tools/code-file-loader' import { loadTypedefs } from '@graphql-tools/load' diff --git a/packages/internal/src/__tests__/validateSchemaForReservedNames.test.ts b/packages/internal/src/__tests__/validateSchemaForReservedNames.test.ts index 695337441c6a..c7562aced99b 100644 --- a/packages/internal/src/__tests__/validateSchemaForReservedNames.test.ts +++ b/packages/internal/src/__tests__/validateSchemaForReservedNames.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { DocumentNode } from 'graphql' import gql from 'graphql-tag' diff --git a/packages/internal/src/__tests__/validateSchemaWithErrors.test.ts b/packages/internal/src/__tests__/validateSchemaWithErrors.test.ts index b4199212fb8d..69fd5c401446 100644 --- a/packages/internal/src/__tests__/validateSchemaWithErrors.test.ts +++ b/packages/internal/src/__tests__/validateSchemaWithErrors.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { DIRECTIVE_INVALID_ROLE_TYPES_ERROR_MESSAGE, diff --git a/packages/internal/src/ast.ts b/packages/internal/src/ast.ts index 8d4936099f21..43f720a57a91 100644 --- a/packages/internal/src/ast.ts +++ b/packages/internal/src/ast.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { types } from '@babel/core' import { parse as babelParse, ParserPlugin } from '@babel/parser' diff --git a/packages/internal/src/build/api.ts b/packages/internal/src/build/api.ts index 0e1d334bd071..6c7d28787596 100644 --- a/packages/internal/src/build/api.ts +++ b/packages/internal/src/build/api.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import * as esbuild from 'esbuild' import { removeSync } from 'fs-extra' diff --git a/packages/internal/src/build/babel/api.ts b/packages/internal/src/build/babel/api.ts index 1db5a6beed86..d4c4fe669d1c 100644 --- a/packages/internal/src/build/babel/api.ts +++ b/packages/internal/src/build/babel/api.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { transform } from '@babel/core' import type { TransformOptions } from '@babel/core' diff --git a/packages/internal/src/build/babel/common.ts b/packages/internal/src/build/babel/common.ts index 1e052288b007..dda2d6349179 100644 --- a/packages/internal/src/build/babel/common.ts +++ b/packages/internal/src/build/babel/common.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import type { TransformOptions, PluginItem } from '@babel/core' import { parseConfigFileTextToJson } from 'typescript' diff --git a/packages/internal/src/build/babel/web.ts b/packages/internal/src/build/babel/web.ts index 568dfb2f83fb..f279520de412 100644 --- a/packages/internal/src/build/babel/web.ts +++ b/packages/internal/src/build/babel/web.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import * as babel from '@babel/core' import type { TransformOptions } from '@babel/core' diff --git a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-cell.test.ts b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-cell.test.ts index 6a263d9b4423..2aa6d6100361 100644 --- a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-cell.test.ts +++ b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-cell.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import pluginTester from 'babel-plugin-tester' diff --git a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-import-dir.test.ts b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-import-dir.test.ts index a5d1dcd9054a..4b72e87ca4d0 100644 --- a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-import-dir.test.ts +++ b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-import-dir.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import pluginTester from 'babel-plugin-tester' diff --git a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-mock-cell-data.test.ts b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-mock-cell-data.test.ts index 3ff9149fbcca..c223fbc2f7dc 100644 --- a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-mock-cell-data.test.ts +++ b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-mock-cell-data.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import pluginTester from 'babel-plugin-tester' diff --git a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-remove-dev-fatal-error-page.ts b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-remove-dev-fatal-error-page.ts index f07176f13563..e79bb2c01294 100644 --- a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-remove-dev-fatal-error-page.ts +++ b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-remove-dev-fatal-error-page.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import pluginTester from 'babel-plugin-tester' diff --git a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-routes-auto-loader.test.ts b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-routes-auto-loader.test.ts index b42562f922c3..8a00c140d94a 100644 --- a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-routes-auto-loader.test.ts +++ b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-routes-auto-loader.test.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import * as babel from '@babel/core' diff --git a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-src-alias.test.ts b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-src-alias.test.ts index fd027e8d8dad..186a59e5093e 100644 --- a/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-src-alias.test.ts +++ b/packages/internal/src/build/babelPlugins/__tests__/babel-plugin-redwood-src-alias.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import pluginTester from 'babel-plugin-tester' diff --git a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-cell.ts b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-cell.ts index 09cbbe7fbc10..804451ca620a 100644 --- a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-cell.ts +++ b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-cell.ts @@ -1,4 +1,4 @@ -import { parse } from 'path' +import { parse } from 'node:path' import type { PluginObj, types } from '@babel/core' diff --git a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-directory-named-import.ts b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-directory-named-import.ts index 19a78c21e6db..38e34d87baef 100644 --- a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-directory-named-import.ts +++ b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-directory-named-import.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import type { PluginObj, types } from '@babel/core' diff --git a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-import-dir.ts b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-import-dir.ts index 58f8f6c0c907..7d1d1ceb5d46 100644 --- a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-import-dir.ts +++ b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-import-dir.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import type { PluginObj, types } from '@babel/core' import fg from 'fast-glob' diff --git a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-mock-cell-data.ts b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-mock-cell-data.ts index 9cc681aabafd..f555446ebae2 100644 --- a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-mock-cell-data.ts +++ b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-mock-cell-data.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' // TODO: Figure out why Wallaby doesn't work with a normal import. import type { PluginObj, types } from '@babel/core' diff --git a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-otel-wrapping.ts b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-otel-wrapping.ts index 03befb374bfe..749bdcbc8d66 100644 --- a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-otel-wrapping.ts +++ b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-otel-wrapping.ts @@ -1,4 +1,4 @@ -import * as nodejsPath from 'path' +import * as nodejsPath from 'node:path' import type { PluginObj, types } from '@babel/core' diff --git a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-routes-auto-loader.ts b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-routes-auto-loader.ts index ff4bdfef77cb..23cbf1549112 100644 --- a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-routes-auto-loader.ts +++ b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-routes-auto-loader.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import type { PluginObj, types } from '@babel/core' diff --git a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-src-alias.ts b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-src-alias.ts index 472aa6b7a9b7..51f7bac61d14 100644 --- a/packages/internal/src/build/babelPlugins/babel-plugin-redwood-src-alias.ts +++ b/packages/internal/src/build/babelPlugins/babel-plugin-redwood-src-alias.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import type { PluginObj, types } from '@babel/core' diff --git a/packages/internal/src/build/web.ts b/packages/internal/src/build/web.ts index 74abb565e04b..7fc281512435 100644 --- a/packages/internal/src/build/web.ts +++ b/packages/internal/src/build/web.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { removeSync } from 'fs-extra' diff --git a/packages/internal/src/files.ts b/packages/internal/src/files.ts index 8a7a0c1ecb94..cd1eb25966c2 100644 --- a/packages/internal/src/files.ts +++ b/packages/internal/src/files.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fg from 'fast-glob' diff --git a/packages/internal/src/generate/graphqlCodeGen.ts b/packages/internal/src/generate/graphqlCodeGen.ts index 8680f1e912a6..d9aba710db1a 100644 --- a/packages/internal/src/generate/graphqlCodeGen.ts +++ b/packages/internal/src/generate/graphqlCodeGen.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import * as addPlugin from '@graphql-codegen/add' import { loadCodegenConfig } from '@graphql-codegen/cli' diff --git a/packages/internal/src/generate/graphqlSchema.ts b/packages/internal/src/generate/graphqlSchema.ts index 3b6435c71eb7..24e5ffa1092d 100644 --- a/packages/internal/src/generate/graphqlSchema.ts +++ b/packages/internal/src/generate/graphqlSchema.ts @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import { codegen } from '@graphql-codegen/core' import type { Types as CodegenTypes } from '@graphql-codegen/plugin-helpers' diff --git a/packages/internal/src/generate/templates.ts b/packages/internal/src/generate/templates.ts index 6674b6ead118..696df94ad029 100644 --- a/packages/internal/src/generate/templates.ts +++ b/packages/internal/src/generate/templates.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' /** * Write the contents of the template to the destination and interpolate the variables. diff --git a/packages/internal/src/generate/typeDefinitions.ts b/packages/internal/src/generate/typeDefinitions.ts index c916c4ff221c..78ffcc56b7d2 100644 --- a/packages/internal/src/generate/typeDefinitions.ts +++ b/packages/internal/src/generate/typeDefinitions.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getPaths, processPagesDir } from '@redwoodjs/project-config' diff --git a/packages/internal/src/generate/watch.ts b/packages/internal/src/generate/watch.ts index 6364a01c3353..6d618f86620a 100644 --- a/packages/internal/src/generate/watch.ts +++ b/packages/internal/src/generate/watch.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import c from 'ansi-colors' import chokidar from 'chokidar' diff --git a/packages/internal/src/project.ts b/packages/internal/src/project.ts index d16a458e536c..ac1d2106fa06 100644 --- a/packages/internal/src/project.ts +++ b/packages/internal/src/project.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { parseConfigFileTextToJson } from 'typescript' diff --git a/packages/internal/src/routes.ts b/packages/internal/src/routes.ts index a385018fce88..5702d80eaa9e 100644 --- a/packages/internal/src/routes.ts +++ b/packages/internal/src/routes.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import chalk from 'chalk' diff --git a/packages/internal/src/ts2js.ts b/packages/internal/src/ts2js.ts index 31e483801e00..0c750a5a0787 100644 --- a/packages/internal/src/ts2js.ts +++ b/packages/internal/src/ts2js.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { transform } from '@babel/core' import fg from 'fast-glob' diff --git a/packages/prerender/src/babelPlugins/__tests__/babel-plugin-redwood-prerender-media-imports.test.ts b/packages/prerender/src/babelPlugins/__tests__/babel-plugin-redwood-prerender-media-imports.test.ts index dfdf318a7fd2..763671ebf6e1 100644 --- a/packages/prerender/src/babelPlugins/__tests__/babel-plugin-redwood-prerender-media-imports.test.ts +++ b/packages/prerender/src/babelPlugins/__tests__/babel-plugin-redwood-prerender-media-imports.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import pluginTester from 'babel-plugin-tester' diff --git a/packages/prerender/src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts b/packages/prerender/src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts index d9c58d27d812..8a529b5d40fc 100644 --- a/packages/prerender/src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts +++ b/packages/prerender/src/babelPlugins/babel-plugin-redwood-prerender-media-imports.ts @@ -1,4 +1,4 @@ -import { extname, basename, join, relative, dirname } from 'path' +import { extname, basename, join, relative, dirname } from 'node:path' import type { PluginObj, types, NodePath } from '@babel/core' import type { ManifestChunk as ViteManifestChunk } from 'vite' diff --git a/packages/prerender/src/babelPlugins/utils.ts b/packages/prerender/src/babelPlugins/utils.ts index fdc7b374b11b..a681c931e189 100644 --- a/packages/prerender/src/babelPlugins/utils.ts +++ b/packages/prerender/src/babelPlugins/utils.ts @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import mime from 'mime-types' diff --git a/packages/prerender/src/graphql/graphql.ts b/packages/prerender/src/graphql/graphql.ts index 29374e952db1..7836edb89377 100644 --- a/packages/prerender/src/graphql/graphql.ts +++ b/packages/prerender/src/graphql/graphql.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { DocumentNode, print } from 'graphql' diff --git a/packages/prerender/src/internal.ts b/packages/prerender/src/internal.ts index 5c6a6b2fb1a0..0048eff61b9e 100644 --- a/packages/prerender/src/internal.ts +++ b/packages/prerender/src/internal.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { fetch } from '@whatwg-node/fetch' diff --git a/packages/prerender/src/runPrerender.tsx b/packages/prerender/src/runPrerender.tsx index a4c17e570ea2..08ce52eaf251 100644 --- a/packages/prerender/src/runPrerender.tsx +++ b/packages/prerender/src/runPrerender.tsx @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import React from 'react' diff --git a/packages/project-config/src/__tests__/config.test.ts b/packages/project-config/src/__tests__/config.test.ts index 6e8cfc011e6f..1b9f8463f449 100644 --- a/packages/project-config/src/__tests__/config.test.ts +++ b/packages/project-config/src/__tests__/config.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { getConfig, getRawConfig } from '../config' diff --git a/packages/project-config/src/__tests__/paths.test.ts b/packages/project-config/src/__tests__/paths.test.ts index 6ff0f5c086f0..5741d0a631a2 100644 --- a/packages/project-config/src/__tests__/paths.test.ts +++ b/packages/project-config/src/__tests__/paths.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { processPagesDir, diff --git a/packages/project-config/src/config.ts b/packages/project-config/src/config.ts index 308b213a88a8..df1109ddb17d 100644 --- a/packages/project-config/src/config.ts +++ b/packages/project-config/src/config.ts @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'node:fs' import toml from '@iarna/toml' import merge from 'deepmerge' diff --git a/packages/project-config/src/findUp.ts b/packages/project-config/src/findUp.ts index 606a7ff62876..0efcbd203631 100644 --- a/packages/project-config/src/findUp.ts +++ b/packages/project-config/src/findUp.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' /** * Find a file by walking up parent directories. diff --git a/packages/project-config/src/paths.ts b/packages/project-config/src/paths.ts index 84304e5ee4f4..393f3d6ef4cf 100644 --- a/packages/project-config/src/paths.ts +++ b/packages/project-config/src/paths.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import fg from 'fast-glob' diff --git a/packages/record/src/tasks/parse.js b/packages/record/src/tasks/parse.js index 65fcda6d8e95..fcf5fb5aae03 100644 --- a/packages/record/src/tasks/parse.js +++ b/packages/record/src/tasks/parse.js @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { getDMMF } from '@prisma/internals' import * as esbuild from 'esbuild' diff --git a/packages/structure/src/ide.ts b/packages/structure/src/ide.ts index 11989306cd02..78411cadea3d 100644 --- a/packages/structure/src/ide.ts +++ b/packages/structure/src/ide.ts @@ -1,4 +1,4 @@ -import { basename } from 'path' +import { basename } from 'node:path' import * as tsm from 'ts-morph' import { TextDocuments } from 'vscode-languageserver' diff --git a/packages/structure/src/interactive_cli/dry_run.ts b/packages/structure/src/interactive_cli/dry_run.ts index bfcfffe92805..40a6e5f3e241 100644 --- a/packages/structure/src/interactive_cli/dry_run.ts +++ b/packages/structure/src/interactive_cli/dry_run.ts @@ -1,4 +1,4 @@ -import { join } from 'path' +import { join } from 'node:path' import { outputFileSync } from 'fs-extra' import proxyquire from 'proxyquire' diff --git a/packages/structure/src/model/RWEnvHelper.ts b/packages/structure/src/model/RWEnvHelper.ts index c6dfd8b503a3..04e7384819e2 100644 --- a/packages/structure/src/model/RWEnvHelper.ts +++ b/packages/structure/src/model/RWEnvHelper.ts @@ -1,4 +1,4 @@ -import { join } from 'path' +import { join } from 'node:path' import * as dotenv from 'dotenv-defaults' import { existsSync, readFileSync } from 'fs-extra' diff --git a/packages/structure/src/model/RWPage.ts b/packages/structure/src/model/RWPage.ts index 3550cedffd94..b40b21d47158 100644 --- a/packages/structure/src/model/RWPage.ts +++ b/packages/structure/src/model/RWPage.ts @@ -1,4 +1,4 @@ -import { dirname } from 'path' +import { dirname } from 'node:path' import * as tsm from 'ts-morph' diff --git a/packages/structure/src/model/RWProject.ts b/packages/structure/src/model/RWProject.ts index 7ab544b3f973..819dc1c2d079 100644 --- a/packages/structure/src/model/RWProject.ts +++ b/packages/structure/src/model/RWProject.ts @@ -1,4 +1,4 @@ -import { join } from 'path' +import { join } from 'node:path' import type { DMMF } from '@prisma/generator-helper' import { getDMMF } from '@prisma/internals' diff --git a/packages/structure/src/model/RWRoute.ts b/packages/structure/src/model/RWRoute.ts index fbe67fbd5f9a..078951527699 100644 --- a/packages/structure/src/model/RWRoute.ts +++ b/packages/structure/src/model/RWRoute.ts @@ -1,4 +1,4 @@ -import { basename } from 'path' +import { basename } from 'node:path' import * as tsm from 'ts-morph' import { Location, Range } from 'vscode-languageserver-types' diff --git a/packages/structure/src/model/RWSDL.ts b/packages/structure/src/model/RWSDL.ts index 6d2691265d89..8b770e6e4f4f 100644 --- a/packages/structure/src/model/RWSDL.ts +++ b/packages/structure/src/model/RWSDL.ts @@ -1,4 +1,4 @@ -import { basename } from 'path' +import { basename } from 'node:path' import { parse as parseGraphQL } from 'graphql/language/parser' import * as tsm from 'ts-morph' diff --git a/packages/structure/src/model/__tests__/model.test.ts b/packages/structure/src/model/__tests__/model.test.ts index a59848dbbdcc..410dd3d67c9f 100644 --- a/packages/structure/src/model/__tests__/model.test.ts +++ b/packages/structure/src/model/__tests__/model.test.ts @@ -1,4 +1,4 @@ -import { basename, resolve } from 'path' +import { basename, resolve } from 'node:path' import { DefaultHost } from '../../hosts' import { URL_file } from '../../x/URL' diff --git a/packages/structure/src/model/util/__tests__/process_env_diagnostics.test.ts b/packages/structure/src/model/util/__tests__/process_env_diagnostics.test.ts index 4000b7fcc0e9..864e61a30437 100644 --- a/packages/structure/src/model/util/__tests__/process_env_diagnostics.test.ts +++ b/packages/structure/src/model/util/__tests__/process_env_diagnostics.test.ts @@ -1,4 +1,4 @@ -import { resolve, join } from 'path' +import { resolve, join } from 'node:path' import { process_env_findInFile, process_env_findAll } from '../process_env' diff --git a/packages/structure/src/model/util/process_env.ts b/packages/structure/src/model/util/process_env.ts index 875c94749b9b..dbf8122eb11f 100644 --- a/packages/structure/src/model/util/process_env.ts +++ b/packages/structure/src/model/util/process_env.ts @@ -1,4 +1,4 @@ -import { join } from 'path' +import { join } from 'node:path' import fg from 'fast-glob' import { readFileSync } from 'fs-extra' diff --git a/packages/structure/src/outline/__tests__/outline.test.ts b/packages/structure/src/outline/__tests__/outline.test.ts index 9fd60e83c2b3..07694204c55e 100644 --- a/packages/structure/src/outline/__tests__/outline.test.ts +++ b/packages/structure/src/outline/__tests__/outline.test.ts @@ -1,4 +1,4 @@ -import { resolve } from 'path' +import { resolve } from 'node:path' import { DefaultHost } from '../../hosts' import { RWProject } from '../../model' diff --git a/packages/structure/src/x/URL.ts b/packages/structure/src/x/URL.ts index e73484c819e6..542401829bc1 100644 --- a/packages/structure/src/x/URL.ts +++ b/packages/structure/src/x/URL.ts @@ -1,4 +1,4 @@ -import { isAbsolute, join, normalize, sep as path_sep } from 'path' +import { isAbsolute, join, normalize, sep as path_sep } from 'node:path' /** * Creates a file:// URL diff --git a/packages/structure/src/x/__tests__/URL.test.ts b/packages/structure/src/x/__tests__/URL.test.ts index e3ed431060b1..7c0ad0043647 100644 --- a/packages/structure/src/x/__tests__/URL.test.ts +++ b/packages/structure/src/x/__tests__/URL.test.ts @@ -1,4 +1,4 @@ -import { sep } from 'path' +import { sep } from 'node:path' import { URL_file, URL_toFile } from '../URL' diff --git a/packages/structure/src/x/child_process.ts b/packages/structure/src/x/child_process.ts index 520273656a95..b99fa9eb017f 100644 --- a/packages/structure/src/x/child_process.ts +++ b/packages/structure/src/x/child_process.ts @@ -1,4 +1,4 @@ -import * as child_process from 'child_process' +import * as child_process from 'node:child_process' export type SpawnOut = { stderr: string; stdout: string; code: number | null } diff --git a/packages/structure/src/x/path.ts b/packages/structure/src/x/path.ts index 82edc5c53122..90f42d773efd 100644 --- a/packages/structure/src/x/path.ts +++ b/packages/structure/src/x/path.ts @@ -1,5 +1,5 @@ -import { existsSync } from 'fs' -import { basename, normalize, sep } from 'path' +import { existsSync } from 'node:fs' +import { basename, normalize, sep } from 'node:path' export function directoryNameResolver(dirName: string): string | undefined { dirName = normalize(dirName) diff --git a/packages/structure/src/x/ts-morph.ts b/packages/structure/src/x/ts-morph.ts index 2ae010f7575c..c95f61f7477f 100644 --- a/packages/structure/src/x/ts-morph.ts +++ b/packages/structure/src/x/ts-morph.ts @@ -1,4 +1,4 @@ -import * as crypto from 'crypto' +import * as crypto from 'node:crypto' import { memoize } from 'lodash' import LRU from 'lru-cache' diff --git a/packages/studio/backend/database.ts b/packages/studio/backend/database.ts index 95c7925e22ff..98d48456536a 100644 --- a/packages/studio/backend/database.ts +++ b/packages/studio/backend/database.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { open } from 'sqlite' import type { Database } from 'sqlite' diff --git a/packages/studio/backend/fastify/react.ts b/packages/studio/backend/fastify/react.ts index 0f67a3ea0786..1b698ddf59ec 100644 --- a/packages/studio/backend/fastify/react.ts +++ b/packages/studio/backend/fastify/react.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import fastifyStatic from '@fastify/static' import { FastifyInstance } from 'fastify' diff --git a/packages/studio/backend/lib/envars.ts b/packages/studio/backend/lib/envars.ts index cf7ed04bfaab..26937ce2468d 100644 --- a/packages/studio/backend/lib/envars.ts +++ b/packages/studio/backend/lib/envars.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import dotenv from 'dotenv' diff --git a/packages/telemetry/src/sendTelemetry.ts b/packages/telemetry/src/sendTelemetry.ts index fad08cca75a6..4c924c35864c 100644 --- a/packages/telemetry/src/sendTelemetry.ts +++ b/packages/telemetry/src/sendTelemetry.ts @@ -1,6 +1,6 @@ -import fs from 'fs' -import os from 'os' -import path from 'path' +import fs from 'node:fs' +import os from 'node:os' +import path from 'node:path' import { fetch } from '@whatwg-node/fetch' import ci from 'ci-info' diff --git a/packages/telemetry/src/telemetry.ts b/packages/telemetry/src/telemetry.ts index 5b8f98346480..7b77c536ece0 100644 --- a/packages/telemetry/src/telemetry.ts +++ b/packages/telemetry/src/telemetry.ts @@ -1,7 +1,7 @@ -import { spawn } from 'child_process' -import type { SpawnOptions } from 'child_process' -import os from 'os' -import path from 'path' +import { spawn } from 'node:child_process' +import type { SpawnOptions } from 'node:child_process' +import os from 'node:os' +import path from 'node:path' import { getPaths } from '@redwoodjs/project-config' diff --git a/packages/testing/config/jest/api/globalSetup.js b/packages/testing/config/jest/api/globalSetup.js index 201bbc283692..cb1bab479084 100644 --- a/packages/testing/config/jest/api/globalSetup.js +++ b/packages/testing/config/jest/api/globalSetup.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') const { getPaths } = require('@redwoodjs/project-config') @@ -12,7 +12,7 @@ const rwjsPaths = getPaths() module.exports = async function () { if (process.env.SKIP_DB_PUSH !== '1') { - const process = require('process') + const process = require('node:process') // Load dotenvs require('dotenv-defaults/config') diff --git a/packages/testing/config/jest/api/jest-preset.js b/packages/testing/config/jest/api/jest-preset.js index 37ee89c85fbf..125d1aa8cef7 100644 --- a/packages/testing/config/jest/api/jest-preset.js +++ b/packages/testing/config/jest/api/jest-preset.js @@ -1,5 +1,5 @@ // @ts-check -const path = require('path') +const path = require('node:path') const { getApiSideDefaultBabelConfig, diff --git a/packages/testing/config/jest/api/jest.setup.js b/packages/testing/config/jest/api/jest.setup.js index e1781eef73be..5e2cb606e8ae 100644 --- a/packages/testing/config/jest/api/jest.setup.js +++ b/packages/testing/config/jest/api/jest.setup.js @@ -33,7 +33,7 @@ const isIdenticalArray = (a, b) => { const configureTeardown = async () => { const { getDMMF } = require('@prisma/internals') - const fs = require('fs') + const fs = require('node:fs') // @NOTE prisma utils are available in cli lib/schemaHelpers // But avoid importing them, to prevent memory leaks in jest @@ -58,7 +58,7 @@ let quoteStyle // determine what kind of quotes are needed around table names in raw SQL const getQuoteStyle = async () => { const { getConfig: getPrismaConfig } = require('@prisma/internals') - const fs = require('fs') + const fs = require('node:fs') if (!quoteStyle) { const config = await getPrismaConfig({ @@ -98,7 +98,7 @@ const buildScenario = } return it(testName, async () => { - const path = require('path') + const path = require('node:path') const testFileDir = path.parse(testPath) // e.g. ['comments', 'test'] or ['signup', 'state', 'machine', 'test'] const testFileNameParts = testFileDir.name.split('.') @@ -134,7 +134,7 @@ const buildScenario = } const teardown = async () => { - const fs = require('fs') + const fs = require('node:fs') const quoteStyle = await getQuoteStyle() diff --git a/packages/testing/config/jest/web/RedwoodWebJestEnv.js b/packages/testing/config/jest/web/RedwoodWebJestEnv.js index 4523d4076088..0a3faceb0008 100644 --- a/packages/testing/config/jest/web/RedwoodWebJestEnv.js +++ b/packages/testing/config/jest/web/RedwoodWebJestEnv.js @@ -6,7 +6,7 @@ module.exports = class RedwoodWebJestEnv extends TestEnvironment { async setup() { await super.setup() if (typeof this.global.TextEncoder === 'undefined') { - const { TextEncoder, TextDecoder } = require('util') + const { TextEncoder, TextDecoder } = require('node:util') this.global.TextEncoder = TextEncoder this.global.TextDecoder = TextDecoder } diff --git a/packages/testing/config/jest/web/jest-preset.js b/packages/testing/config/jest/web/jest-preset.js index 0dabd959b1e7..2cb3528cc6c1 100644 --- a/packages/testing/config/jest/web/jest-preset.js +++ b/packages/testing/config/jest/web/jest-preset.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('node:path') const { getPaths } = require('@redwoodjs/project-config') diff --git a/packages/testing/config/storybook/main.js b/packages/testing/config/storybook/main.js index 2a098541103b..9d1763c239b0 100644 --- a/packages/testing/config/storybook/main.js +++ b/packages/testing/config/storybook/main.js @@ -1,5 +1,5 @@ -const fs = require('fs') -const path = require('path') +const fs = require('node:fs') +const path = require('node:path') const { mergeWithCustomize } = require('webpack-merge') diff --git a/packages/testing/src/api/__tests__/directUrlHelpers.test.ts b/packages/testing/src/api/__tests__/directUrlHelpers.test.ts index 5d6a71004d3d..10a22ac7c79e 100644 --- a/packages/testing/src/api/__tests__/directUrlHelpers.test.ts +++ b/packages/testing/src/api/__tests__/directUrlHelpers.test.ts @@ -1,5 +1,5 @@ -import fs from 'fs' -import path from 'path' +import fs from 'node:fs' +import path from 'node:path' import { checkAndReplaceDirectUrl, getDefaultDb } from '../directUrlHelpers' diff --git a/packages/testing/src/api/directUrlHelpers.ts b/packages/testing/src/api/directUrlHelpers.ts index b2b12ed16adc..bb3354ee6841 100644 --- a/packages/testing/src/api/directUrlHelpers.ts +++ b/packages/testing/src/api/directUrlHelpers.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' export function getDefaultDb(rwjsCwd: string) { return `file:${path.join(rwjsCwd, '.redwood', 'test.db')}` diff --git a/packages/testing/src/web/__tests__/findCellMocks.test.ts b/packages/testing/src/web/__tests__/findCellMocks.test.ts index 75e4d0d57307..458ace644ecb 100644 --- a/packages/testing/src/web/__tests__/findCellMocks.test.ts +++ b/packages/testing/src/web/__tests__/findCellMocks.test.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import { ensurePosixPath } from '@redwoodjs/project-config' diff --git a/packages/tui/src/index.ts b/packages/tui/src/index.ts index ea9e7b34b591..2b46ca379d9c 100644 --- a/packages/tui/src/index.ts +++ b/packages/tui/src/index.ts @@ -1,6 +1,6 @@ // -import stream from 'stream' +import stream from 'node:stream' import boxen from 'boxen' import chalk from 'chalk' diff --git a/packages/vite/src/buildFeServer.ts b/packages/vite/src/buildFeServer.ts index 9267602c1428..cedcf36c098d 100644 --- a/packages/vite/src/buildFeServer.ts +++ b/packages/vite/src/buildFeServer.ts @@ -1,5 +1,5 @@ -import fs from 'fs/promises' -import path from 'path' +import fs from 'node:fs/promises' +import path from 'node:path' import { build as esbuildBuild, PluginBuild } from 'esbuild' import type { Manifest as ViteBuildManifest } from 'vite' diff --git a/packages/vite/src/buildRscFeServer.ts b/packages/vite/src/buildRscFeServer.ts index e618bcc4034b..5adadd6d7989 100644 --- a/packages/vite/src/buildRscFeServer.ts +++ b/packages/vite/src/buildRscFeServer.ts @@ -1,5 +1,5 @@ -import fs from 'fs/promises' -import path from 'path' +import fs from 'node:fs/promises' +import path from 'node:path' import react from '@vitejs/plugin-react' import { build as viteBuild } from 'vite' diff --git a/packages/vite/src/index.ts b/packages/vite/src/index.ts index 9ae0d34a467b..5fc3fa07bf94 100644 --- a/packages/vite/src/index.ts +++ b/packages/vite/src/index.ts @@ -1,5 +1,5 @@ -import { existsSync } from 'fs' -import path from 'path' +import { existsSync } from 'node:fs' +import path from 'node:path' import react from '@vitejs/plugin-react' import type { ConfigEnv, UserConfig, PluginOption } from 'vite' diff --git a/packages/vite/src/runFeServer.ts b/packages/vite/src/runFeServer.ts index 3954cb5e6f9d..95863a866945 100644 --- a/packages/vite/src/runFeServer.ts +++ b/packages/vite/src/runFeServer.ts @@ -3,8 +3,8 @@ // Only things used during dev can be in @redwoodjs/vite. Everything else has // to go in fe-server -import fs from 'fs/promises' -import path from 'path' +import fs from 'node:fs/promises' +import path from 'node:path' // @ts-expect-error We will remove dotenv-defaults from this package anyway import { config as loadDotEnv } from 'dotenv-defaults' diff --git a/packages/vite/src/runRscFeServer.ts b/packages/vite/src/runRscFeServer.ts index af4cde8bb392..59e17070dc9b 100644 --- a/packages/vite/src/runRscFeServer.ts +++ b/packages/vite/src/runRscFeServer.ts @@ -3,8 +3,8 @@ // Only things used during dev can be in @redwoodjs/vite. Everything else has // to go in fe-server -import fs from 'fs/promises' -import path from 'path' +import fs from 'node:fs/promises' +import path from 'node:path' // @ts-expect-error We will remove dotenv-defaults from this package anyway import { config as loadDotEnv } from 'dotenv-defaults' diff --git a/packages/vite/src/streaming/createReactStreamingHandler.ts b/packages/vite/src/streaming/createReactStreamingHandler.ts index c259516ff78e..402eaaf33147 100644 --- a/packages/vite/src/streaming/createReactStreamingHandler.ts +++ b/packages/vite/src/streaming/createReactStreamingHandler.ts @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import type { Request, Response } from 'express' import isbot from 'isbot' diff --git a/packages/web-server/src/server.ts b/packages/web-server/src/server.ts index 17ee3f1ca155..66fcfdaf176b 100644 --- a/packages/web-server/src/server.ts +++ b/packages/web-server/src/server.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node -import path from 'path' +import path from 'node:path' import chalk from 'chalk' import { config } from 'dotenv-defaults' diff --git a/packages/web/src/bins/cross-env.ts b/packages/web/src/bins/cross-env.ts index 206e21e1eca8..e8f7962f2a97 100644 --- a/packages/web/src/bins/cross-env.ts +++ b/packages/web/src/bins/cross-env.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromCrossEnv = createRequire( require.resolve('cross-env/package.json') diff --git a/packages/web/src/bins/msw.ts b/packages/web/src/bins/msw.ts index 07d0dc474aa4..1c43621b1e8d 100644 --- a/packages/web/src/bins/msw.ts +++ b/packages/web/src/bins/msw.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromMSW = createRequire(require.resolve('msw')) diff --git a/packages/web/src/bins/redwood.ts b/packages/web/src/bins/redwood.ts index 7c3de49808df..f9511bf70e96 100644 --- a/packages/web/src/bins/redwood.ts +++ b/packages/web/src/bins/redwood.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromCli = createRequire( require.resolve('@redwoodjs/cli/package.json') diff --git a/packages/web/src/bins/rwfw.ts b/packages/web/src/bins/rwfw.ts index 31c3e0e8b40f..e4d3e9f24cca 100644 --- a/packages/web/src/bins/rwfw.ts +++ b/packages/web/src/bins/rwfw.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromCli = createRequire( require.resolve('@redwoodjs/cli/package.json') diff --git a/packages/web/src/bins/storybook.ts b/packages/web/src/bins/storybook.ts index 782734ba6049..220f5daf2d0d 100644 --- a/packages/web/src/bins/storybook.ts +++ b/packages/web/src/bins/storybook.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' // We do not install storybook by default, so we need to check if it is // installed before we try to run it. diff --git a/packages/web/src/bins/tsc.ts b/packages/web/src/bins/tsc.ts index 22c9992cec31..5f8e0345a010 100644 --- a/packages/web/src/bins/tsc.ts +++ b/packages/web/src/bins/tsc.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromTypeScript = createRequire( require.resolve('typescript/package.json') diff --git a/packages/web/src/bins/webpack.ts b/packages/web/src/bins/webpack.ts index 7fdbc047dabb..5b727679fb8e 100644 --- a/packages/web/src/bins/webpack.ts +++ b/packages/web/src/bins/webpack.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { createRequire } from 'module' +import { createRequire } from 'node:module' const requireFromWebpack = createRequire( require.resolve('webpack/package.json') diff --git a/packages/web/src/components/DevFatalErrorPage.tsx b/packages/web/src/components/DevFatalErrorPage.tsx index 9c27fc0058ff..43899efeb27f 100644 --- a/packages/web/src/components/DevFatalErrorPage.tsx +++ b/packages/web/src/components/DevFatalErrorPage.tsx @@ -4,7 +4,7 @@ // Stacktracey requires buffer, which Vite does not polyfill by default if (typeof window !== 'undefined') { - window.Buffer = window.Buffer || require('buffer').Buffer + window.Buffer = window.Buffer || require('node:buffer').Buffer } import { useState } from 'react'