Skip to content

Commit

Permalink
refactor: remove create-require
Browse files Browse the repository at this point in the history
  • Loading branch information
merceyz committed Jan 9, 2021
1 parent 06e845b commit 09e56c4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
8 changes: 4 additions & 4 deletions packages/cli/lib/lib/webpack/prerender.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const { readFileSync } = require('fs');
const stackTrace = require('stack-trace');
const URL = require('url');
const { SourceMapConsumer } = require('source-map');
const createRequire = require('create-require');

module.exports = function (env, params) {
params = params || {};
Expand All @@ -27,9 +26,10 @@ module.exports = function (env, params) {
return '';
}
const { cwd } = env;
const relativeRequire = createRequire(cwd);
const preact = relativeRequire('preact');
const renderToString = relativeRequire('preact-render-to-string');
const preact = require(require.resolve('preact', { paths: [cwd] }));
const renderToString = require(require.resolve('preact-render-to-string', {
paths: [cwd],
}));
return renderToString(preact.h(app, { ...params, url }));
} catch (err) {
let stack = stackTrace.parse(err).filter(s => s.getFileName() === entry)[0];
Expand Down
5 changes: 3 additions & 2 deletions packages/cli/lib/lib/webpack/proxy-loader.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var utils = require('loader-utils');
const createRequire = require('create-require');

function proxyLoader(source, map) {
var options = utils.getOptions(this);
Expand All @@ -17,7 +16,9 @@ function proxyLoader(source, map) {

var loader;
try {
loader = createRequire(proxyOptions.cwd)(proxyOptions.loader);
loader = require.resolve(proxyOptions.loader, {
paths: [proxyOptions.cwd],
});
} catch (e) {
loader = require(proxyOptions.loader);
}
Expand Down
8 changes: 5 additions & 3 deletions packages/cli/lib/lib/webpack/utils.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
const createRequire = require('create-require');

function isInstalledVersionPreactXOrAbove(cwd) {
try {
return (
parseInt(createRequire(cwd)('preact/package.json').version, 10) >= 10
parseInt(
require(require.resolve('preact/package.json', { paths: [cwd] }))
.version,
10
) >= 10
);
} catch (e) {}
return false;
Expand Down
10 changes: 6 additions & 4 deletions packages/cli/lib/lib/webpack/webpack-base-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const { readFileSync, existsSync } = require('fs');
const { isInstalledVersionPreactXOrAbove } = require('./utils');
const autoprefixer = require('autoprefixer');
const browserslist = require('browserslist');
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');
Expand Down Expand Up @@ -96,12 +95,15 @@ 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'));
compat = dirname(
require.resolve('preact/compat/package.json', { paths: [cwd] })
);
} catch (e) {
try {
compat = dirname(requireRelative.resolve('preact-compat/package.json'));
compat = dirname(
require.resolve('preact-compat/package.json', { paths: [cwd] })
);
} catch (e) {}
}

Expand Down
1 change: 0 additions & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
"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",
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4757,11 +4757,6 @@ 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"
Expand Down

0 comments on commit 09e56c4

Please sign in to comment.