refactor(compiler): remove requireFunc

rindojs · Dec 1, 2023 · 43b765f · 43b765f
1 parent d0db3a7
commit 43b765f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/compiler/config/transpile-options.ts b/src/compiler/config/transpile-options.ts
@@ -11,7 +11,6 @@ import type {
   TranspileResults,
 } from '../../declarations';
 import { RINDO_INTERNAL_CLIENT_ID } from '../bundle/entry-alias-ids';
-import { requireFunc } from '../sys/environment';
 import { parseImportPath } from '../transformers/rindo-import-path';
 
 export const getTranspileResults = (code: string, input: TranspileOptions) => {
@@ -59,7 +58,7 @@ export const getTranspileConfig = (input: TranspileOptions): TranspileConfig =>
   if (input.sys) {
     transpileCtx.sys = input.sys;
   } else if (!transpileCtx.sys) {
-    transpileCtx.sys = requireFunc('../sys/node/index.js').createNodeSys();
+    transpileCtx.sys = require('../sys/node/index.js').createNodeSys();
   }
 
   const compileOpts: TranspileOptions = {

diff --git a/src/compiler/optimize/autoprefixer.ts b/src/compiler/optimize/autoprefixer.ts
@@ -1,7 +1,7 @@
 import { Postcss } from 'postcss';
 
 import type * as d from '../../declarations';
-import { IS_NODE_ENV, requireFunc } from '../sys/environment';
+import { IS_NODE_ENV } from '../sys/environment';
 
 type CssProcessor = ReturnType<Postcss>;
 let cssProcessor: CssProcessor;
@@ -102,7 +102,7 @@ export const autoprefixCss = async (cssText: string, opts: boolean | null | d.Au
  * @returns postCSS with the Autoprefixer plugin applied
  */
 const getProcessor = (autoprefixerOpts: d.AutoprefixerOptions): CssProcessor => {
-  const { postcss, autoprefixer } = requireFunc('../sys/node/autoprefixer.js');
+  const { postcss, autoprefixer } = require('../sys/node/autoprefixer.js');
   if (!cssProcessor) {
     cssProcessor = postcss([autoprefixer(autoprefixerOpts)]);
   }

diff --git a/src/compiler/prerender/prerender-worker.ts b/src/compiler/prerender/prerender-worker.ts
@@ -2,7 +2,6 @@ import { catchError, isFunction, isPromise, isRootPath, normalizePath } from '@u
 import { dirname, join } from 'path';
 
 import type * as d from '../../declarations';
-import { requireFunc } from '../sys/environment';
 import { crawlAnchorsForNextUrls } from './crawl-urls';
 import { getPrerenderConfig } from './prerender-config';
 import { getHydrateOptions } from './prerender-hydrate-options';
@@ -33,7 +32,7 @@ export const prerenderWorker = async (sys: d.CompilerSystem, prerenderRequest: d
     const componentGraph = getComponentGraph(sys, prerenderCtx, prerenderRequest.componentGraphPath);
 
     // webpack work-around/hack
-    const hydrateApp = requireFunc(prerenderRequest.hydrateAppFilePath);
+    const hydrateApp = require(prerenderRequest.hydrateAppFilePath);
 
     if (prerenderCtx.templateHtml == null) {
       // cache template html in this process

diff --git a/src/compiler/sys/environment.ts b/src/compiler/sys/environment.ts
@@ -20,5 +20,3 @@ export const IS_WEB_WORKER_ENV =
 export const HAS_WEB_WORKER = IS_BROWSER_ENV && typeof Worker === 'function';
 
 export const IS_FETCH_ENV = typeof fetch === 'function';
-
-export const requireFunc = IS_NODE_ENV ? require : () => {};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,5 +20,3 @@ export const IS_WEB_WORKER_ENV =
		export const HAS_WEB_WORKER = IS_BROWSER_ENV && typeof Worker === 'function';

		export const IS_FETCH_ENV = typeof fetch === 'function';

		export const requireFunc = IS_NODE_ENV ? require : () => {};