From dfc5a827eb8c454599c8589861b584bf5643afb5 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Sun, 18 Jun 2023 11:48:28 -0700 Subject: [PATCH] chore: remove rimraf/mkdirp (#338) --- bin/buildI18n.js | 9 +++------ bin/buildStylesForJest.js | 5 ++--- bin/bundlesize.js | 6 +++--- bin/fs.js | 11 +++++------ bin/generateCssDocs.js | 2 +- bin/processCustomEmoji.js | 7 ++----- package.json | 2 -- test/storage/test.js | 6 +----- yarn.lock | 5 ----- 9 files changed, 17 insertions(+), 36 deletions(-) diff --git a/bin/buildI18n.js b/bin/buildI18n.js index 93f4ad6..3faa8c4 100644 --- a/bin/buildI18n.js +++ b/bin/buildI18n.js @@ -1,15 +1,12 @@ -import path from 'path' -import { copyFile, readdir, writeFile } from './fs.js' -import mkdirp from 'mkdirp' -import rimraf from 'rimraf' -import { promisify } from 'util' +import path from 'node:path' +import { copyFile, readdir, writeFile, mkdirp, rimraf } from './fs.js' const __dirname = path.dirname(new URL(import.meta.url).pathname) async function main () { const targetDir = path.join(__dirname, '../i18n') - await promisify(rimraf)(targetDir) + await rimraf(targetDir) await mkdirp(targetDir) const sourceDir = path.join(__dirname, '../src/picker/i18n') diff --git a/bin/buildStylesForJest.js b/bin/buildStylesForJest.js index a511bd1..bca7cdd 100644 --- a/bin/buildStylesForJest.js +++ b/bin/buildStylesForJest.js @@ -1,7 +1,6 @@ import { buildStyles } from './buildStyles.js' -import { writeFile } from './fs.js' -import mkdirp from 'mkdirp' -import path from 'path' +import { writeFile, mkdirp } from './fs.js' +import path from 'node:path' const __dirname = path.dirname(new URL(import.meta.url).pathname) diff --git a/bin/bundlesize.js b/bin/bundlesize.js index c747a5f..9f5b765 100644 --- a/bin/bundlesize.js +++ b/bin/bundlesize.js @@ -1,9 +1,9 @@ // Simple script to check bundlesize based on https://github.com/siddharthkp/bundlesize import { minify } from 'terser' -import { gzip } from 'zlib' -import { promisify } from 'util' +import { gzip } from 'node:zlib' +import { promisify } from 'node:util' import prettyBytes from 'pretty-bytes' -import fs from 'fs/promises' +import fs from 'node:fs/promises' const MAX_SIZE_MIN = '42.5 kB' const MAX_SIZE_MINGZ = '15 kB' diff --git a/bin/fs.js b/bin/fs.js index ef4b4f1..6fe84d1 100644 --- a/bin/fs.js +++ b/bin/fs.js @@ -1,7 +1,6 @@ -import fs from 'fs' -import { promisify } from 'util' +import { rm, mkdir } from 'node:fs/promises' -export const readFile = promisify(fs.readFile) -export const writeFile = promisify(fs.writeFile) -export const copyFile = promisify(fs.copyFile) -export const readdir = promisify(fs.readdir) +export { readFile, writeFile, copyFile, readdir } from 'node:fs/promises' + +export const rimraf = (...args) => rm(...args, { recursive: true, force: true }) +export const mkdirp = (...args) => mkdir(...args, { recursive: true }) diff --git a/bin/generateCssDocs.js b/bin/generateCssDocs.js index a7d9450..fd687f6 100644 --- a/bin/generateCssDocs.js +++ b/bin/generateCssDocs.js @@ -1,4 +1,4 @@ -import path from 'path' +import path from 'node:path' import sass from 'sass' import { markdownTable as table } from 'markdown-table' import { readFile, writeFile } from './fs.js' diff --git a/bin/processCustomEmoji.js b/bin/processCustomEmoji.js index 3655dfa..8634874 100644 --- a/bin/processCustomEmoji.js +++ b/bin/processCustomEmoji.js @@ -1,7 +1,4 @@ -import { readdir, writeFile, readFile } from './fs.js' -import rimraf from 'rimraf' -import { promisify } from 'util' -import mkdirp from 'mkdirp' +import { readdir, writeFile, readFile, rimraf, mkdirp } from './fs.js' import { optimize } from 'svgo' const categories = [ @@ -144,7 +141,7 @@ function remove (name) { } async function main () { - await promisify(rimraf)('./docs/custom') + await rimraf('./docs/custom') await mkdirp('./docs/custom') const emojis = await readdir('./node_modules/flat-color-icons/svg') diff --git a/package.json b/package.json index e065795..f56ef7b 100644 --- a/package.json +++ b/package.json @@ -105,14 +105,12 @@ "lodash-es": "^4.17.15", "markdown-table": "^3.0.2", "markdown-toc": "^1.2.0", - "mkdirp": "^1.0.4", "node-fetch": "^2.6.7", "npm-run-all": "^4.1.5", "playwright": "^1.29.0", "pretty-bytes": "^6.0.0", "puppeteer": "^13.3.2", "recursive-readdir": "^2.2.3", - "rimraf": "^3.0.2", "rollup": "^2.67.3", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-svelte": "^7.1.5", diff --git a/test/storage/test.js b/test/storage/test.js index 33e6519..90c097f 100644 --- a/test/storage/test.js +++ b/test/storage/test.js @@ -1,15 +1,11 @@ import playwright from 'playwright' -import { promisify } from 'util' -import mkdirp from 'mkdirp' -import rimrafCB from 'rimraf' +import { mkdirp, rimraf } from '../../bin/fs.js' import getFolderSize from 'get-folder-size' import path from 'path' import prettyBytes from 'pretty-bytes' import { markdownTable as table } from 'markdown-table' import process from 'process' -const rimraf = promisify(rimrafCB) - const port = process.env.PORT || 3000 function printBytes (bytes) { diff --git a/yarn.lock b/yarn.lock index 0f0cac2..70b9304 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5977,11 +5977,6 @@ mkdirp@^0.5.1: dependencies: minimist "^1.2.6" -mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"