Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions flow-typed/graceful-fs.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/metro-file-map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"debug": "^4.4.0",
"fb-watchman": "^2.0.0",
"flow-enums-runtime": "^0.0.6",
"graceful-fs": "^4.2.4",
"invariant": "^2.2.4",
"jest-worker": "^29.7.0",
"nullthrows": "^1.1.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/metro-file-map/src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ describe('FileMap', () => {
// $FlowFixMe[incompatible-type]
mockChangedFiles = null;

fs = require('graceful-fs');
fs = require('node:fs');

consoleWarn = console.warn;
consoleError = console.error;
Expand Down
8 changes: 4 additions & 4 deletions packages/metro-file-map/src/__tests__/worker-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {Worker} from '../worker';
import * as path from 'node:path';
import * as vm from 'node:vm';

jest.mock('fs', () => {
jest.mock('node:fs', () => {
const path = require('node:path');
const mockFs = {
[path.join('/project', 'fruits', 'Banana.js')]: `
Expand Down Expand Up @@ -47,7 +47,7 @@ jest.mock('fs', () => {
};

return {
...jest.createMockFromModule('fs'),
...jest.createMockFromModule('node:fs'),
readFileSync: jest.fn((path, options) => {
const entry = mockFs[path];
if (entry) {
Expand All @@ -64,7 +64,7 @@ jest.mock('fs', () => {
};
});

const fs: FS = jest.requireMock('fs');
const fs: FS = jest.requireMock('node:fs');

const defaults: WorkerMessage = {
computeSha1: false,
Expand Down Expand Up @@ -240,7 +240,7 @@ describe('worker', () => {

test('can be loaded directly without transpilation', async () => {
const code = await jest
.requireActual<FS>('fs')
.requireActual<FS>('node:fs')
.promises.readFile(require.resolve('../worker.js'), 'utf8');
expect(() => new vm.Script(code)).not.toThrow();
});
Expand Down
8 changes: 4 additions & 4 deletions packages/metro-file-map/src/crawlers/__tests__/node-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import type TreeFSType from '../../lib/TreeFS';
let mockPathModule;
jest.mock('node:path', () => mockPathModule);

// The platform-specific path helper `p` for the graceful-fs mock
// The platform-specific path helper `p` for the fs mock
let mockP: string => string;

jest.useRealTimers();

jest.mock('graceful-fs', () => {
jest.mock('node:fs', () => {
const slash = require('slash');
let mtime = 32;
const size = 42;
Expand Down Expand Up @@ -265,7 +265,7 @@ describe.each([['win32'], ['posix']])('node crawler on %s', platform => {

test('uses the withFileTypes option with readdir', async () => {
nodeCrawl = require('../node').default;
const fs = require('graceful-fs');
const fs = require('node:fs');

const {changedFiles, removedFiles} = await nodeCrawl({
console: global.console,
Expand Down Expand Up @@ -374,7 +374,7 @@ describe.each([['win32'], ['posix']])('node crawler on %s', platform => {
});

test('crawls from a filesystem root without doubling separators', async () => {
const fs = require('graceful-fs');
const fs = require('node:fs');
nodeCrawl = require('../node').default;
const ignore = jest.fn(pearMatcher);

Expand Down
2 changes: 1 addition & 1 deletion packages/metro-file-map/src/crawlers/node/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import type {CrawlerOptions, CrawlResult, FileData} from '../../flow-types';

import {RootPathUtils} from '../../lib/RootPathUtils';
import * as fs from 'graceful-fs';
import fs from 'node:fs';
import * as path from 'node:path';

function find(options: CrawlerOptions): Promise<FileData> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ describe('processRegularFile', () => {
jest.resetModules();
jest.clearAllMocks();
jest.unmock('../../worker.js');
jest.mock('fs', () => ({
jest.mock('node:fs', () => ({
readFileSync: mockReadFileSync,
}));
FileProcessor = require('../FileProcessor').FileProcessor;
Expand Down
2 changes: 1 addition & 1 deletion packages/metro-file-map/src/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import type {

'use strict';

const fs = require('graceful-fs');
const {createHash} = require('node:crypto');
const fs = require('node:fs');

function sha1hex(content /*: string | Buffer */) /*: string */ {
return createHash('sha1').update(content).digest('hex');
Expand Down
1 change: 0 additions & 1 deletion packages/metro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"debug": "^4.4.0",
"error-stack-parser": "^2.0.6",
"flow-enums-runtime": "^0.0.6",
"graceful-fs": "^4.2.4",
"flow-parser": "0.335.0",
"invariant": "^2.2.4",
"jest-worker": "^29.7.0",
Expand Down
1 change: 0 additions & 1 deletion packages/metro/src/DeltaBundler/__tests__/resolver-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jest
endianness: () => 'LE',
release: () => '',
}))
.mock('graceful-fs', () => jest.requireMock('node:fs'))
.spyOn(console, 'warn')
.mockImplementation(() => {});

Expand Down
2 changes: 1 addition & 1 deletion packages/metro/src/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ import symbolicate from './Server/symbolicate';
import {SourcePathsMode} from './shared/types';
import {codeFrameColumns} from '@babel/code-frame';
import debugModule from 'debug';
import * as fs from 'graceful-fs';
import * as jscSafeUrl from 'jsc-safe-url';
import {Logger} from 'metro-core';
import mime from 'mime-types';
import fs from 'node:fs';
import path from 'node:path';
import {performance} from 'node:perf_hooks';
import querystring from 'node:querystring';
Expand Down
Loading