@anansi/core 0.16.8 → 0.16.10

package/src/scripts/getWebpackConfig.ts

@@ -1,22 +1,20 @@
-import { create as createResolve } from 'enhanced-resolve';
+import { default as enhanced } from 'enhanced-resolve';
 import webpack from 'webpack';
 
-const resolve = createResolve.sync({
+const resolve = enhanced.create.sync({
   modules: ['.'],
   // or resolve.create.sync
   extensions: ['.js', '.cjs', '.mjs'],
   // see more options below
 });
 
-export function getWebpackConfig(): (
-  env: any,
-  argv: any,
-) => webpack.Configuration {
+export async function getWebpackConfig(): Promise<
+  (env: any, argv: any) => webpack.Configuration
+> {
   const configPath = resolve({}, process.cwd(), 'webpack.config');
   if (!configPath) {
     throw new Error('Cannot find webpack.config in ' + process.cwd());
   }
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const webpackConfig = require(configPath);
-  return webpackConfig;
+
+  return (await import(configPath)).default;
 }

package/src/scripts/serve.ts

@@ -13,13 +13,13 @@ import path from 'path';
 import { promisify } from 'util';
 import webpack from 'webpack';
 
-import 'cross-fetch/dist/node-polyfill';
+import 'cross-fetch/dist/node-polyfill.js';
 import getProxyMiddlewares from './getProxyMiddlewares.js';
 import { getWebpackConfig } from './getWebpackConfig.js';
 import { Render } from './types.js';
 
 // run directly from node
-if (require.main === module) {
+if ('main' in import.meta) {
   const entrypoint = process.argv[2];
 
   if (!entrypoint) {
@@ -29,7 +29,7 @@ if (require.main === module) {
   serve(entrypoint);
 }
 
-export default function serve(
+export default async function serve(
   entrypoint: string,
   options: { serveAssets?: boolean; serveProxy?: boolean } = {},
 ) {
@@ -37,7 +37,7 @@ export default function serve(
 
   const loader = ora('Initializing').start();
 
-  const webpackConfig = getWebpackConfig();
+  const webpackConfig = await getWebpackConfig();
 
   const manifestPath = getManifestPathFromWebpackconfig(
     webpackConfig({}, { mode: 'production' }),
@@ -66,7 +66,7 @@ export default function serve(
   }
 
   // Start the express server after the first compilation
-  function initializeApp(clientManifest: webpack.StatsCompilation) {
+  async function initializeApp(clientManifest: webpack.StatsCompilation) {
     loader.info('Launching server');
     if (!clientManifest) {
       loader.fail('Manifest not found');
@@ -88,7 +88,7 @@ export default function serve(
           next: NextFunction,
         ) => {
           const filename =
-            req.url?.substr(
+            req.url?.substring(
               (process.env.WEBPACK_PUBLIC_PATH as string).length,
             ) ?? '';
           const assetPath = path.join(
@@ -101,9 +101,7 @@ export default function serve(
             !diskFs.lstatSync(assetPath).isDirectory()
           ) {
             try {
-              const fileContent = (await readFile(assetPath)).toString();
-              res.contentType(filename);
-              res.send(fileContent);
+              res.sendFile(assetPath);
             } catch (e) {
               return next();
             }
@@ -129,11 +127,12 @@ export default function serve(
     }
 
     // SERVER SIDE RENDERING
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const render: Render = require(path.join(
-      process.cwd(),
-      entrypoint,
-    )).default;
+    let render: Render = (await import(path.join(process.cwd(), entrypoint)))
+      .default;
+
+    if ('default' in render) {
+      render = render.default as any;
+    }
 
     if (typeof render !== 'function') {
       throw new Error(
@@ -187,8 +186,14 @@ export default function serve(
       });
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  initializeApp(require(manifestPath));
+  let manifest = await import(manifestPath, {
+    assert: { type: 'json' },
+  });
+  // handle inconsistent import conditions
+  if ('default' in manifest) {
+    manifest = manifest.default;
+  }
+  await initializeApp(manifest);
 
   process.on('SIGINT', () => {
     loader.warn('Received SIGINT, devserver shutting down');

package/src/scripts/startDevserver.ts

@@ -15,15 +15,15 @@ import tmp from 'tmp';
 import { ufs } from 'unionfs';
 import { promisify } from 'util';
 import webpack, { MultiCompiler } from 'webpack';
-import logging from 'webpack/lib/logging/runtime';
+import logging from 'webpack/lib/logging/runtime.js';
 import WebpackDevServer from 'webpack-dev-server';
 
-import 'cross-fetch/dist/node-polyfill';
+import 'cross-fetch/dist/node-polyfill.js';
 import { getWebpackConfig } from './getWebpackConfig.js';
 import { BoundRender } from './types.js';
 
 // run directly from node
-if (require.main === module) {
+if ('main' in import.meta) {
   const entrypoint = process.argv[2];
 
   if (!entrypoint) {
@@ -34,11 +34,14 @@ if (require.main === module) {
   startDevServer(entrypoint);
 }
 
-export default function startDevServer(
+let serverFileContents: Promise<string> = Promise.resolve('');
+let serverEntry = '';
+
+export default async function startDevServer(
   entrypoint: string,
   env: Record<string, unknown> = {},
 ) {
-  const webpackConfig = getWebpackConfig();
+  const webpackConfig = await getWebpackConfig();
 
   const log = logging.getLogger('anansi-devserver');
 
@@ -148,12 +151,12 @@ export default function startDevServer(
     // ASSETS
     const clientManifest = clientStats.toJson();
 
-    const serverEntry = getServerBundle(serverStats);
+    serverEntry = getServerBundle(serverStats);
+    serverFileContents = readFile(serverEntry).then(buf => buf.toString());
     // reload modules
     Object.keys(fsRequire.cache).forEach(key => {
       delete fsRequire.cache[key];
     });
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
     render = (fsRequire(serverEntry) as any).default.bind(
       undefined,
       clientManifest,
@@ -240,6 +243,24 @@ export default function startDevServer(
             importRender((multiStats as webpack.MultiStats).stats);
           } catch (e: any) {
             log.error('Failed to load serve entrypoint');
+            const finder = new RegExp(`${serverEntry}:([\\d]+):([\\d]+)`, 'g');
+            serverFileContents.then(fileText => {
+              const textRows = fileText.split('\n');
+              log.error('>>> Stack Context [serve entrypoint] <<<');
+              for (const match of e.stack.matchAll(finder) ?? []) {
+                const row = Number.parseInt(match[1]);
+                const col = Number.parseInt(match[2]);
+                log.error(path.basename(serverEntry) + ' ' + row + ':' + col);
+                log.error(textRows[row - 2]);
+                log.error(textRows[row - 1]);
+                log.error(Array(col).join(' ') + '^');
+                log.error(textRows[row]);
+                log.error(textRows[row + 1]);
+                log.error(textRows[row + 2]);
+              }
+              diskFs.writeFileSync(serverEntry, fileText);
+            });
+
             throw e;
           }
         } else {

package/src/scripts/webpack-logging.d.ts

@@ -2,3 +2,7 @@ declare module 'webpack/lib/logging/runtime' {
   const logging: any;
   export = logging;
 }
+declare module 'webpack/lib/logging/runtime.js' {
+  const logging: any;
+  export = logging;
+}

package/lib/scripts/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}

package/src/scripts/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}