refactor: Switch from fs.promises to fs/promises

preactjs · Dec 20, 2022 · 7c74e35 · 7c74e35
1 parent c0cde55
commit 7c74e35
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 17 deletions.
diff --git a/packages/cli/src/commands/build.js b/packages/cli/src/commands/build.js
@@ -1,4 +1,4 @@
-const { readdir, rm } = require('fs').promises;
+const { readdir, rm } = require('fs/promises');
 const { join, resolve } = require('path');
 const runWebpack = require('../lib/webpack/run-webpack');
 const { toBool } = require('../util');

diff --git a/packages/cli/src/commands/watch.js b/packages/cli/src/commands/watch.js
@@ -1,7 +1,7 @@
+const { resolve } = require('path');
+const getPort = require('get-port');
 const runWebpack = require('../lib/webpack/run-webpack');
 const { isPortFree, toBool, warn } = require('../util');
-const getPort = require('get-port');
-const { resolve } = require('path');
 
 exports.watch = async function watchCommand(argv) {
 	if (argv.sw) {

diff --git a/packages/cli/src/lib/webpack/transform-config.js b/packages/cli/src/lib/webpack/transform-config.js
@@ -1,6 +1,6 @@
 const { resolve } = require('path');
 const webpack = require('webpack');
-const { stat } = require('fs').promises;
+const { stat } = require('fs/promises');
 const { error, esmImport, tryResolveConfig, warn } = require('../../util');
 
 const FILE = 'preact.config';

diff --git a/packages/cli/src/util.js b/packages/cli/src/util.js
@@ -1,8 +1,8 @@
-const { blue, yellow, red } = require('kleur');
-const { normalize, resolve } = require('path');
 const { statSync, existsSync } = require('fs');
+const { normalize, resolve } = require('path');
+const { createServer } = require('net');
+const { blue, yellow, red } = require('kleur');
 const symbols = require('./symbols');
-const net = require('net');
 
 exports.isDir = function (str) {
 	return existsSync(str) && statSync(str).isDirectory();
@@ -42,7 +42,7 @@ exports.esmImport = require('esm')(module);
 exports.isPortFree = async function (port) {
 	try {
 		await new Promise((resolve, reject) => {
-			const server = net.createServer();
+			const server = createServer();
 			server.unref();
 			server.on('error', reject);
 			server.listen({ port }, () => {

diff --git a/packages/cli/tests/build.test.js b/packages/cli/tests/build.test.js
@@ -1,6 +1,12 @@
 const { join } = require('path');
-const { access, mkdir, readdir, readFile, rename, writeFile } =
-	require('fs').promises;
+const {
+	access,
+	mkdir,
+	readdir,
+	readFile,
+	rename,
+	writeFile,
+} = require('fs/promises');
 const looksLike = require('html-looks-like');
 const { create, build, buildFast } = require('./lib/cli');
 const { snapshot } = require('./lib/utils');

diff --git a/packages/cli/tests/config-formats.test.js b/packages/cli/tests/config-formats.test.js
@@ -1,5 +1,5 @@
 const { join } = require('path');
-const { access } = require('fs').promises;
+const { access } = require('fs/promises');
 const { build, buildFast } = require('./lib/cli');
 const { subject } = require('./lib/output');
 

diff --git a/packages/cli/tests/lib/cli.js b/packages/cli/tests/lib/cli.js
@@ -1,5 +1,5 @@
 const { join } = require('path');
-const { mkdir } = require('fs').promises;
+const { mkdir } = require('fs/promises');
 const { build: buildCmd } = require('../../src/commands/build');
 const { watch: watchCmd } = require('../../src/commands/watch');
 const {

diff --git a/packages/cli/tests/lib/output.js b/packages/cli/tests/lib/output.js
@@ -1,4 +1,4 @@
-const { mkdir } = require('fs').promises;
+const { mkdir } = require('fs/promises');
 const copy = require('ncp');
 const { resolve } = require('path');
 const { promisify } = require('util');

diff --git a/packages/cli/tests/lib/utils.js b/packages/cli/tests/lib/utils.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 const { join, relative, resolve } = require('path');
-const { stat, symlink, readFile, writeFile } = require('fs').promises;
+const { stat, symlink, readFile, writeFile } = require('fs/promises');
 const pRetry = require('p-retry');
 const { promisify } = require('util');
 const glob = promisify(require('glob').glob);
@@ -101,7 +101,10 @@ async function handleOptimize(cwd, config) {
 		let config = await readFile(configFile, 'utf8');
 		// Don't alter config in subsequent runs of same subject
 		if (/optimizePlugin/.test(config)) return;
-		config = config.replace(/}(?![\s\S]*})(?:;?)/m, `${disableOptimizePluginConfig}};`);
+		config = config.replace(
+			/}(?![\s\S]*})(?:;?)/m,
+			`${disableOptimizePluginConfig}};`
+		);
 		await writeFile(configFile, config);
 	} catch {
 		await writeFile(configFile, disableOptimizePluginConfigFile);

diff --git a/packages/cli/tests/service-worker.test.js b/packages/cli/tests/service-worker.test.js
@@ -1,5 +1,5 @@
 const { join } = require('path');
-const { readFile, writeFile } = require('fs').promises;
+const { readFile, writeFile } = require('fs/promises');
 const { create, build } = require('./lib/cli');
 const { sleep } = require('./lib/utils');
 const { getServer } = require('./server');

diff --git a/packages/cli/tests/watch.test.js b/packages/cli/tests/watch.test.js
@@ -1,4 +1,4 @@
-const { mkdir, readFile, rename, writeFile } = require('fs').promises;
+const { mkdir, readFile, rename, writeFile } = require('fs/promises');
 const { join, resolve } = require('path');
 const startChrome = require('./lib/chrome');
 const { create, watch } = require('./lib/cli');