refactor: use createRequire instead of require-relative and resolve-from

Author: merceyz

packages/cli/lib/lib/webpack/prerender.js

@@ -4,7 +4,7 @@ const { readFileSync } = require('fs');
 const stackTrace = require('stack-trace');
 const URL = require('url');
 const { SourceMapConsumer } = require('source-map');
-const requireRelative = require('require-relative');
+const createRequire = require('create-require');
 
 module.exports = function (env, params) {
 	params = params || {};
@@ -27,8 +27,9 @@ module.exports = function (env, params) {
 			return '';
 		}
 		const { cwd } = env;
-		const preact = require(requireRelative.resolve('preact', cwd));
-		const renderToString = require(requireRelative.resolve('preact-render-to-string', cwd));
+		const relativeRequire = createRequire(cwd);
+		const preact = relativeRequire('preact');
+		const renderToString = relativeRequire('preact-render-to-string');
 		return renderToString(preact.h(app, { ...params, url }));
 	} catch (err) {
 		let stack = stackTrace.parse(err).filter(s => s.getFileName() === entry)[0];

packages/cli/lib/lib/webpack/proxy-loader.js

@@ -1,5 +1,5 @@
 var utils = require('loader-utils');
-var requireRelative = require('require-relative');
+const createRequire = require('create-require');
 
 function proxyLoader(source, map) {
 	var options = utils.getOptions(this);
@@ -17,7 +17,7 @@ function proxyLoader(source, map) {
 
 	var loader;
 	try {
-		loader = requireRelative(proxyOptions.loader, proxyOptions.cwd);
+		loader = createRequire(proxyOptions.cwd)(proxyOptions.loader);
 	} catch (e) {
 		loader = require(proxyOptions.loader);
 	}

packages/cli/lib/lib/webpack/utils.js

@@ -1,10 +1,9 @@
-const resolveFrom = require('resolve-from');
+const createRequire = require('create-require');
 
 function isInstalledVersionPreactXOrAbove(cwd) {
 	try {
 		return (
-			parseInt(require(resolveFrom(cwd, 'preact/package.json')).version, 10) >=
-			10
+			parseInt(createRequire(cwd)('preact/package.json').version, 10) >= 10
 		);
 	} catch (e) {}
 	return false;

packages/cli/lib/lib/webpack/webpack-base-config.js

@@ -5,7 +5,7 @@ const { readFileSync, existsSync } = require('fs');
 const { isInstalledVersionPreactXOrAbove } = require('./utils');
 const autoprefixer = require('autoprefixer');
 const browserslist = require('browserslist');
-const requireRelative = require('require-relative');
+const createRequire = require('create-require');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const FixStyleOnlyEntriesPlugin = require('webpack-fix-style-only-entries');
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
@@ -96,15 +96,12 @@ module.exports = function (env) {
 	let nodeModules = [...new Set([...userNodeModules, ...cliNodeModules])];
 
 	let compat = 'preact-compat';
+	const requireRelative = createRequire(cwd);
 	try {
-		compat = dirname(
-			requireRelative.resolve('preact/compat/package.json', cwd)
-		);
+		compat = dirname(requireRelative.resolve('preact/compat/package.json'));
 	} catch (e) {
 		try {
-			compat = dirname(
-				requireRelative.resolve('preact-compat/package.json', cwd)
-			);
+			compat = dirname(requireRelative.resolve('preact-compat/package.json'));
 		} catch (e) {}
 	}
 

packages/cli/package.json

@@ -103,6 +103,7 @@
 		"compression-webpack-plugin": "^4.0.0",
 		"console-clear": "^1.0.0",
 		"copy-webpack-plugin": "^5.0.4",
+		"create-require": "^1.0.2",
 		"critters-webpack-plugin": "^2.5.0",
 		"cross-spawn-promise": "^0.10.1",
 		"css-loader": "^3.1.0",
@@ -135,8 +136,6 @@
 		"prompts": "^2.2.1",
 		"raw-loader": "^4.0.0",
 		"react-refresh": "0.8.3",
-		"require-relative": "^0.8.7",
-		"resolve-from": "^5.0.0",
 		"rimraf": "^3.0.2",
 		"sade": "^1.4.1",
 		"size-plugin": "^2.0.1",

yarn.lock

@@ -4757,6 +4757,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+create-require@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.0.2.tgz#03f97ad0822826e506965f385fd90388f5051624"
+  integrity sha512-ZizhnQtkxsH1XNsnRy8z2SHRTDAem7fmEJbw1oeuTEkgf5sLXtjrm4nhDcYkO0aiZnAk5dwAze65EvTRaOvxZw==
+
 critters-webpack-plugin@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/critters-webpack-plugin/-/critters-webpack-plugin-2.5.0.tgz#32deb4c5b1590bc8f943638dbf379170043b7dab"
@@ -12373,11 +12378,6 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-require-relative@^0.8.7:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-  integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
-
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"