@anansi/core 0.16.7 → 0.16.9

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/src/spouts/DocumentComponent.tsx

@@ -32,11 +32,7 @@ export default function Document({
     const policy = {
       ...csPolicy,
     };
-    if (
-      nonce &&
-      // nonces negate 'unsafe-inline' so do not add it in development to keep things easier
-      process.env.NODE_ENV === 'production'
-    ) {
+    if (nonce) {
       if (typeof policy['script-src'] === 'string') {
         policy['script-src'] = [policy['script-src'], `'nonce-${nonce}'`];
       } else {

package/src/spouts/document.server.tsx

@@ -1,4 +1,5 @@
 import type { Route } from '@anansi/router';
+import { Request } from 'express';
 import React from 'react';
 import { StatsChunkGroup } from 'webpack';
 
@@ -70,6 +71,13 @@ export default function DocumentSpout(options: {
           ? { href: asset, as: 'script' }
           : { href: asset },
       );
+    const nonce =
+      // nonces negate 'unsafe-inline' so do not add it in development to keep things easier
+      props.nonce &&
+      (process.env.NODE_ENV === 'production' ||
+        (props.req as Request)?.protocol !== 'http')
+        ? props.nonce
+        : undefined;
 
     return {
       ...nextProps,
@@ -80,7 +88,7 @@ export default function DocumentSpout(options: {
           title={nextProps.title ?? options.title}
           assets={assets}
           rootId={options.rootId}
-          nonce={props.nonce}
+          nonce={nonce}
           csPolicy={options.csPolicy}
           scripts={nextProps.scripts}
         >

package/lib/scripts/package.json

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

package/src/scripts/package.json

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