From 52ae2a95d1e9c15e7f0abdb27c25e50273105e96 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Fri, 12 Nov 2021 23:17:45 +0800 Subject: [PATCH 1/2] chore(deps): remove mkdirp --- package.json | 3 --- packages/cli-plugin-metro/package.json | 1 - .../cli-plugin-metro/src/commands/bundle/saveAssets.ts | 3 +-- packages/cli/package.json | 2 -- packages/cli/src/commands/init/init.ts | 3 +-- packages/cli/src/tools/unzip.ts | 4 ++-- packages/tools/package.json | 1 - packages/tools/src/releaseChecker/releaseCacheManager.ts | 3 +-- scripts/build.js | 3 +-- yarn.lock | 9 +-------- 10 files changed, 7 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index ed6d4216c..e85fbf9ee 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "@react-native-community/eslint-config": "^2.0.0", "@types/glob": "^7.1.1", "@types/jest": "^26.0.15", - "@types/mkdirp": "^0.5.2", "@types/node": "^10.0.0", "@types/node-fetch": "^2.3.7", "babel-jest": "^26.6.2", @@ -51,14 +50,12 @@ "lerna": "^3.22.1", "metro-memory-fs": "^0.66.1", "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", "rimraf": "^3.0.2", "slash": "^3.0.0", "string-length": "^2.0.0", "typescript": "^3.8.0" }, "resolutions": { - "mkdirp": "^0.5.3", "@types/node": "^10.0.0" } } diff --git a/packages/cli-plugin-metro/package.json b/packages/cli-plugin-metro/package.json index e70db90bd..bf9175175 100644 --- a/packages/cli-plugin-metro/package.json +++ b/packages/cli-plugin-metro/package.json @@ -16,7 +16,6 @@ "metro-react-native-babel-transformer": "^0.66.1", "metro-resolver": "^0.66.1", "metro-runtime": "^0.66.1", - "mkdirp": "^0.5.1", "readline": "^1.3.0" }, "devDependencies": { diff --git a/packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts b/packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts index 356e2311b..f37551de7 100644 --- a/packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts +++ b/packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts @@ -6,7 +6,6 @@ * */ -import mkdirp from 'mkdirp'; import path from 'path'; import fs from 'fs'; @@ -84,7 +83,7 @@ function copy( callback: (error: NodeJS.ErrnoException) => void, ): void { const destDir = path.dirname(dest); - mkdirp(destDir, (err?: NodeJS.ErrnoException) => { + fs.mkdir(destDir, {recursive: true}, (err?) => { if (err) { callback(err); return; diff --git a/packages/cli/package.json b/packages/cli/package.json index 765eaa722..59dbe4d6a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -46,7 +46,6 @@ "leven": "^3.1.0", "lodash": "^4.17.15", "minimist": "^1.2.0", - "mkdirp": "^0.5.1", "node-stream-zip": "^1.9.1", "ora": "^3.4.0", "pretty-format": "^26.6.2", @@ -69,7 +68,6 @@ "@types/hapi__joi": "^17.1.6", "@types/lodash": "^4.14.149", "@types/minimist": "^1.2.0", - "@types/mkdirp": "^0.5.2", "@types/prompts": "^2.0.9", "@types/semver": "^6.0.2", "@types/wcwidth": "^1.0.0", diff --git a/packages/cli/src/commands/init/init.ts b/packages/cli/src/commands/init/init.ts index 79a75a057..1ab8453a4 100644 --- a/packages/cli/src/commands/init/init.ts +++ b/packages/cli/src/commands/init/init.ts @@ -3,7 +3,6 @@ import path from 'path'; import fs from 'fs-extra'; import minimist from 'minimist'; import ora from 'ora'; -import mkdirp from 'mkdirp'; import {validateProjectName} from './validate'; import DirectoryAlreadyExistsError from './errors/DirectoryAlreadyExistsError'; import printRunInstructions from './printRunInstructions'; @@ -50,7 +49,7 @@ async function setProjectDirectory(directory: string) { } try { - mkdirp.sync(directory); + fs.mkdirSync(directory, {recursive: true}); process.chdir(directory); } catch (error) { throw new CLIError( diff --git a/packages/cli/src/tools/unzip.ts b/packages/cli/src/tools/unzip.ts index cc09848ba..5bf52f955 100644 --- a/packages/cli/src/tools/unzip.ts +++ b/packages/cli/src/tools/unzip.ts @@ -1,4 +1,4 @@ -import {mkdirpSync} from 'fs-extra'; +import {mkdirSync} from 'fs'; const StreamZip = require('node-stream-zip'); const unzip = async (source: string, destination: string) => { @@ -8,7 +8,7 @@ const unzip = async (source: string, destination: string) => { storeEntries: true, }); - mkdirpSync(destination); + mkdirSync(destination, {recursive: true}); zip.on('ready', () => { zip.extract(null, destination, (err: Error | null) => { diff --git a/packages/tools/package.json b/packages/tools/package.json index a801c3d6c..bfea14be6 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -11,7 +11,6 @@ "chalk": "^3.0.0", "lodash": "^4.17.15", "mime": "^2.4.1", - "mkdirp": "^0.5.1", "node-fetch": "^2.6.0", "open": "^6.2.0", "semver": "^6.3.0", diff --git a/packages/tools/src/releaseChecker/releaseCacheManager.ts b/packages/tools/src/releaseChecker/releaseCacheManager.ts index 5cca60d67..94019640a 100644 --- a/packages/tools/src/releaseChecker/releaseCacheManager.ts +++ b/packages/tools/src/releaseChecker/releaseCacheManager.ts @@ -2,7 +2,6 @@ import path from 'path'; import fs from 'fs'; import os from 'os'; import appDirs from 'appdirsjs'; -import mkdirp from 'mkdirp'; import logger from '../logger'; type ReleaseCacheKey = 'eTag' | 'lastChecked' | 'latestVersion'; @@ -43,7 +42,7 @@ function getCacheRootPath() { const cachePath = appDirs({appName: 'react-native-cli', legacyPath}).cache; if (!fs.existsSync(cachePath)) { - mkdirp.sync(cachePath); + fs.mkdirSync(cachePath, {recursive: true}); } return cachePath; diff --git a/scripts/build.js b/scripts/build.js index 3553a60e8..33fb842ec 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -21,7 +21,6 @@ const fs = require('fs'); const path = require('path'); const glob = require('glob'); -const mkdirp = require('mkdirp'); const babel = require('@babel/core'); const chalk = require('chalk'); const micromatch = require('micromatch'); @@ -78,7 +77,7 @@ function buildFile(file, silent) { return; } - mkdirp.sync(path.dirname(destPath), '777'); + fs.mkdirSync(path.dirname(destPath), {mode: '777', recursive: true}); if ( !micromatch.isMatch(file, JS_FILES_PATTERN) && diff --git a/yarn.lock b/yarn.lock index 8bb12e79f..bac64124b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2404,13 +2404,6 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6" integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= -"@types/mkdirp@^0.5.2": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.2.tgz#503aacfe5cc2703d5484326b1b27efa67a339c1f" - integrity sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg== - dependencies: - "@types/node" "*" - "@types/node-fetch@^2.3.7", "@types/node-fetch@^2.5.5": version "2.5.5" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.5.tgz#cd264e20a81f4600a6c52864d38e7fef72485e92" @@ -8338,7 +8331,7 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@0.x.x, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@*, mkdirp@0.x.x, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== From baf75a3ff52554bfa7603acde1cd569adc36db8f Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 13 Nov 2021 00:00:19 +0800 Subject: [PATCH 2/2] fix mode --- scripts/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.js b/scripts/build.js index 33fb842ec..5061256e1 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -77,7 +77,7 @@ function buildFile(file, silent) { return; } - fs.mkdirSync(path.dirname(destPath), {mode: '777', recursive: true}); + fs.mkdirSync(path.dirname(destPath), {mode: 0o777, recursive: true}); if ( !micromatch.isMatch(file, JS_FILES_PATTERN) &&