@anansi/core 0.16.9 → 0.16.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/lib/scripts/serve.d.ts.map +1 -1
  3. package/lib/scripts/serve.js +4 -6
  4. package/package.json +6 -6
  5. package/src/scripts/serve.ts +2 -4
package/CHANGELOG.md CHANGED
@@ -3,6 +3,25 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ### [0.16.11](https://github.com/ntucker/anansi/compare/@anansi/core@0.16.10...@anansi/core@0.16.11) (2023-02-28)
7
+
8
+ **Note:** Version bump only for package @anansi/core
9
+
10
+ ### [0.16.10](https://github.com/ntucker/anansi/compare/@anansi/core@0.16.9...@anansi/core@0.16.10) (2023-02-28)
11
+
12
+ ### 💅 Enhancement
13
+
14
+ * Default to ESM for server ([#1861](https://github.com/ntucker/anansi/issues/1861)) ([4a656e8](https://github.com/ntucker/anansi/commit/4a656e84d1756c407e418cc8e490a3a27ee87995))
15
+ * Get rid of deprecated substr() ([79adb37](https://github.com/ntucker/anansi/commit/79adb37ff9852fc96c8fc2c7e6c4f202d3ed0c1b))
16
+
17
+ ### 🐛 Bug Fix
18
+
19
+ * Serve assets with correct type ([1507130](https://github.com/ntucker/anansi/commit/15071305a8d924737184ffa5dab1ef154dbdec8e))
20
+
21
+ ### 📦 Package
22
+
23
+ * Update `ora` to v6 ([#1859](https://github.com/ntucker/anansi/issues/1859)) ([cf1468d](https://github.com/ntucker/anansi/commit/cf1468d80482923d807b49917889a621afcf22da))
24
+
6
25
  ### [0.16.9](https://github.com/ntucker/anansi/compare/@anansi/core@0.16.8...@anansi/core@0.16.9) (2023-02-28)
7
26
 
8
27
  ### 💅 Enhancement
package/lib/scripts/serve.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/scripts/serve.ts"],"names":[],"mappings":";AAeA,OAAO,mCAAmC,CAAC;AAgB3C,wBAA8B,KAAK,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,iBA8K9D"}
1
+ {"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/scripts/serve.ts"],"names":[],"mappings":";AAeA,OAAO,mCAAmC,CAAC;AAgB3C,wBAA8B,KAAK,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,iBA4K9D"}
package/lib/scripts/serve.js CHANGED
@@ -55,14 +55,12 @@ export default async function serve(entrypoint, options = {}) {
55
55
  // ASSETS
56
56
  if (options.serveAssets) {
57
57
  wrappingApp.use(async (req, res, next) => {
58
- var _req$url$substr, _req$url, _clientManifest$outpu;
59
- const filename = (_req$url$substr = (_req$url = req.url) == null ? void 0 : _req$url.substr(process.env.WEBPACK_PUBLIC_PATH.length)) != null ? _req$url$substr : '';
58
+ var _req$url$substring, _req$url, _clientManifest$outpu;
59
+ const filename = (_req$url$substring = (_req$url = req.url) == null ? void 0 : _req$url.substring(process.env.WEBPACK_PUBLIC_PATH.length)) != null ? _req$url$substring : '';
60
60
  const assetPath = path.join((_clientManifest$outpu = clientManifest.outputPath) != null ? _clientManifest$outpu : '', filename);
61
61
  if (diskFs.existsSync(assetPath) && !diskFs.lstatSync(assetPath).isDirectory()) {
62
62
  try {
63
- const fileContent = (await readFile(assetPath)).toString();
64
- res.contentType(filename);
65
- res.send(fileContent);
63
+ res.sendFile(assetPath);
66
64
  } catch (e) {
67
65
  return next();
68
66
  }
@@ -159,4 +157,4 @@ function getManifestPathFromWebpackconfig(webpackConfig) {
159
157
  const manifestPath = path.join((_webpackConfig$output = webpackConfig == null ? void 0 : (_webpackConfig$output2 = webpackConfig.output) == null ? void 0 : _webpackConfig$output2.path) != null ? _webpackConfig$output : '', manifestFilename);
160
158
  return manifestPath;
161
159
  }
162
- //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["Object","hasOwn","it","key","prototype","hasOwnProperty","call","compress","express","diskFs","ora","path","promisify","getProxyMiddlewares","getWebpackConfig","import","meta","entrypoint","process","argv","console","log","exit","serve","options","PORT","env","loader","start","webpackConfig","manifestPath","getManifestPathFromWebpackconfig","mode","readFile","server","handleErrors","fn","req","res","next","x","initializeApp","clientManifest","info","fail","wrappingApp","use","serveAssets","_req$url$substr","_req$url","_clientManifest$outpu","filename","url","substr","WEBPACK_PUBLIC_PATH","length","assetPath","join","outputPath","existsSync","lstatSync","isDirectory","fileContent","toString","contentType","send","e","serveProxy","_devConfig$devServer","devConfig","devServer","proxy","_devConfig$devServer2","middlewares","map","middleware","render","cwd","default","Error","get","endsWith","statusCode","setHeader","socket","on","error","listen","syscall","isPipe","portOrPipe","Number","isNaN","bind","code","manifest","assert","type","_server","warn","close","_opts$filename","_webpackConfig$plugin","_webpackConfig$plugin2","_webpackConfig$plugin3","_webpackConfig$output","_webpackConfig$output2","manifestFilename","plugins","find","plugin","constructor","name","opts","output"],"sources":["../../src/scripts/serve.ts"],"sourcesContent":["#!/usr/bin/env node\nObject.hasOwn =\n  Object.hasOwn ||\n  /* istanbul ignore next */ function hasOwn(it, key) {\n    return Object.prototype.hasOwnProperty.call(it, key);\n  };\nimport compress from 'compression';\nimport express, { NextFunction } from 'express';\nimport diskFs from 'fs';\nimport { Server, IncomingMessage, ServerResponse } from 'http';\nimport ora from 'ora';\nimport path from 'path';\nimport { promisify } from 'util';\nimport webpack from 'webpack';\n\nimport 'cross-fetch/dist/node-polyfill.js';\nimport getProxyMiddlewares from './getProxyMiddlewares.js';\nimport { getWebpackConfig } from './getWebpackConfig.js';\nimport { Render } from './types.js';\n\n// run directly from node\nif ('main' in import.meta) {\n  const entrypoint = process.argv[2];\n\n  if (!entrypoint) {\n    console.log(`Usage: ${process.argv[0]} <server-entrypoint>`);\n    process.exit(-1);\n  }\n  serve(entrypoint);\n}\n\nexport default async function serve(\n  entrypoint: string,\n  options: { serveAssets?: boolean; serveProxy?: boolean } = {},\n) {\n  const PORT = process.env.PORT || 8080;\n\n  const loader = ora('Initializing').start();\n\n  const webpackConfig = await getWebpackConfig();\n\n  const manifestPath = getManifestPathFromWebpackconfig(\n    webpackConfig({}, { mode: 'production' }),\n  );\n\n  const readFile = promisify(diskFs.readFile);\n  let server: Server | undefined;\n\n  function handleErrors<\n    F extends (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n    ) => Promise<void>,\n  >(fn: F) {\n    return async function (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n      next: NextFunction,\n    ) {\n      try {\n        return await fn(req, res);\n      } catch (x) {\n        next(x);\n      }\n    };\n  }\n\n  // Start the express server after the first compilation\n  async function initializeApp(clientManifest: webpack.StatsCompilation) {\n    loader.info('Launching server');\n    if (!clientManifest) {\n      loader.fail('Manifest not found');\n      // TODO: handle more gracefully\n      process.exit(-1);\n    }\n\n    const wrappingApp = express();\n    // eslint-disable-next-line\n    //@ts-ignore\n    wrappingApp.use(compress());\n\n    // ASSETS\n    if (options.serveAssets) {\n      wrappingApp.use(\n        async (\n          req: Request | IncomingMessage,\n          res: any,\n          next: NextFunction,\n        ) => {\n          const filename =\n            req.url?.substr(\n              (process.env.WEBPACK_PUBLIC_PATH as string).length,\n            ) ?? '';\n          const assetPath = path.join(\n            clientManifest.outputPath ?? '',\n            filename,\n          );\n\n          if (\n            diskFs.existsSync(assetPath) &&\n            !diskFs.lstatSync(assetPath).isDirectory()\n          ) {\n            try {\n              const fileContent = (await readFile(assetPath)).toString();\n              res.contentType(filename);\n              res.send(fileContent);\n            } catch (e) {\n              return next();\n            }\n          } else {\n            next();\n          }\n        },\n      );\n    }\n\n    // PROXIES\n    if (options.serveProxy) {\n      const devConfig: webpack.Configuration = webpackConfig(\n        {},\n        { mode: 'development' },\n      );\n      if (devConfig.devServer?.proxy) {\n        const middlewares = getProxyMiddlewares(devConfig.devServer?.proxy);\n        if (middlewares) {\n          wrappingApp.use(...middlewares.map(({ middleware }) => middleware));\n        }\n      }\n    }\n\n    // SERVER SIDE RENDERING\n    let render: Render = (await import(path.join(process.cwd(), entrypoint)))\n      .default;\n\n    if ('default' in render) {\n      render = render.default as any;\n    }\n\n    if (typeof render !== 'function') {\n      throw new Error(\n        `default export of ${path.join(\n          process.cwd(),\n          entrypoint,\n        )} is not a function`,\n      );\n    }\n\n    wrappingApp.get(\n      '/*',\n      handleErrors(async function (req: any, res: any) {\n        if (req.url.endsWith('favicon.ico')) {\n          res.statusCode = 404;\n          res.setHeader('Content-type', 'text/html');\n          res.send('not found');\n          return;\n        }\n        res.socket.on('error', (error: unknown) => {\n          console.error('Fatal', error);\n        });\n\n        await render(clientManifest, req, res);\n      }),\n    );\n\n    server = wrappingApp\n      .listen(PORT, () => {\n        loader.info(`Listening at ${PORT}...`);\n      })\n      .on('error', function (error: any) {\n        if (error.syscall !== 'listen') {\n          throw error;\n        }\n        const isPipe = (portOrPipe: string | number) =>\n          Number.isNaN(portOrPipe);\n        const bind = isPipe(PORT) ? 'Pipe ' + PORT : 'Port ' + PORT;\n        switch (error.code) {\n          case 'EACCES':\n            loader.fail(bind + ' requires elevated privileges');\n            process.exit(1);\n          // eslint-disable-next-line no-fallthrough\n          case 'EADDRINUSE':\n            loader.fail(bind + ' is already in use');\n            process.exit(1);\n          // eslint-disable-next-line no-fallthrough\n          default:\n            throw error;\n        }\n      });\n  }\n\n  let manifest = await import(manifestPath, {\n    assert: { type: 'json' },\n  });\n  // handle inconsistent import conditions\n  if ('default' in manifest) {\n    manifest = manifest.default;\n  }\n  await initializeApp(manifest);\n\n  process.on('SIGINT', () => {\n    loader.warn('Received SIGINT, devserver shutting down');\n    if (server) console.log('Closing server');\n    server?.close(() => {\n      loader.info('Server closed');\n    });\n    process.exit(-1);\n  });\n}\n\nfunction getManifestPathFromWebpackconfig(\n  webpackConfig: webpack.Configuration,\n) {\n  const manifestFilename: string =\n    (\n      webpackConfig?.plugins?.find(plugin => {\n        return plugin.constructor.name === 'StatsWriterPlugin';\n      }) as any\n    )?.opts?.filename ?? 'manifest.json';\n\n  const manifestPath = path.join(\n    webpackConfig?.output?.path ?? '',\n    manifestFilename,\n  );\n  return manifestPath;\n}\n"],"mappings":"AAAA;AACAA,MAAM,CAACC,MAAM,GACXD,MAAM,CAACC,MAAM,IACb,0BAA2B,SAASA,MAAMA,CAACC,EAAE,EAAEC,GAAG,EAAE;EAClD,OAAOH,MAAM,CAACI,SAAS,CAACC,cAAc,CAACC,IAAI,CAACJ,EAAE,EAAEC,GAAG,CAAC;AACtD,CAAC;AACH,OAAOI,QAAQ,MAAM,aAAa;AAClC,OAAOC,OAAO,MAAwB,SAAS;AAC/C,OAAOC,MAAM,MAAM,IAAI;AAEvB,OAAOC,GAAG,MAAM,KAAK;AACrB,OAAOC,IAAI,MAAM,MAAM;AACvB,SAASC,SAAS,QAAQ,MAAM;AAGhC,OAAO,mCAAmC;AAC1C,OAAOC,mBAAmB,MAAM,0BAA0B;AAC1D,SAASC,gBAAgB,QAAQ,uBAAuB;AAGxD;AACA,IAAI,MAAM,IAAIC,MAAM,CAACC,IAAI,EAAE;EACzB,MAAMC,UAAU,GAAGC,OAAO,CAACC,IAAI,CAAC,CAAC,CAAC;EAElC,IAAI,CAACF,UAAU,EAAE;IACfG,OAAO,CAACC,GAAG,CAAE,UAASH,OAAO,CAACC,IAAI,CAAC,CAAC,CAAE,sBAAqB,CAAC;IAC5DD,OAAO,CAACI,IAAI,CAAC,CAAC,CAAC,CAAC;EAClB;EACAC,KAAK,CAACN,UAAU,CAAC;AACnB;AAEA,eAAe,eAAeM,KAAKA,CACjCN,UAAkB,EAClBO,OAAwD,GAAG,CAAC,CAAC,EAC7D;EACA,MAAMC,IAAI,GAAGP,OAAO,CAACQ,GAAG,CAACD,IAAI,IAAI,IAAI;EAErC,MAAME,MAAM,GAAGjB,GAAG,CAAC,cAAc,CAAC,CAACkB,KAAK,EAAE;EAE1C,MAAMC,aAAa,GAAG,MAAMf,gBAAgB,EAAE;EAE9C,MAAMgB,YAAY,GAAGC,gCAAgC,CACnDF,aAAa,CAAC,CAAC,CAAC,EAAE;IAAEG,IAAI,EAAE;EAAa,CAAC,CAAC,CAC1C;EAED,MAAMC,QAAQ,GAAGrB,SAAS,CAACH,MAAM,CAACwB,QAAQ,CAAC;EAC3C,IAAIC,MAA0B;EAE9B,SAASC,YAAYA,CAKnBC,EAAK,EAAE;IACP,OAAO,gBACLC,GAA8B,EAC9BC,GAA8B,EAC9BC,IAAkB,EAClB;MACA,IAAI;QACF,OAAO,MAAMH,EAAE,CAACC,GAAG,EAAEC,GAAG,CAAC;MAC3B,CAAC,CAAC,OAAOE,CAAC,EAAE;QACVD,IAAI,CAACC,CAAC,CAAC;MACT;IACF,CAAC;EACH;;EAEA;EACA,eAAeC,aAAaA,CAACC,cAAwC,EAAE;IACrEf,MAAM,CAACgB,IAAI,CAAC,kBAAkB,CAAC;IAC/B,IAAI,CAACD,cAAc,EAAE;MACnBf,MAAM,CAACiB,IAAI,CAAC,oBAAoB,CAAC;MACjC;MACA1B,OAAO,CAACI,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB;IAEA,MAAMuB,WAAW,GAAGrC,OAAO,EAAE;IAC7B;IACA;IACAqC,WAAW,CAACC,GAAG,CAACvC,QAAQ,EAAE,CAAC;;IAE3B;IACA,IAAIiB,OAAO,CAACuB,WAAW,EAAE;MACvBF,WAAW,CAACC,GAAG,CACb,OACET,GAA8B,EAC9BC,GAAQ,EACRC,IAAkB,KACf;QAAA,IAAAS,eAAA,EAAAC,QAAA,EAAAC,qBAAA;QACH,MAAMC,QAAQ,IAAAH,eAAA,IAAAC,QAAA,GACZZ,GAAG,CAACe,GAAG,qBAAPH,QAAA,CAASI,MAAM,CACZnC,OAAO,CAACQ,GAAG,CAAC4B,mBAAmB,CAAYC,MAAM,CACnD,YAAAP,eAAA,GAAI,EAAE;QACT,MAAMQ,SAAS,GAAG7C,IAAI,CAAC8C,IAAI,EAAAP,qBAAA,GACzBR,cAAc,CAACgB,UAAU,YAAAR,qBAAA,GAAI,EAAE,EAC/BC,QAAQ,CACT;QAED,IACE1C,MAAM,CAACkD,UAAU,CAACH,SAAS,CAAC,IAC5B,CAAC/C,MAAM,CAACmD,SAAS,CAACJ,SAAS,CAAC,CAACK,WAAW,EAAE,EAC1C;UACA,IAAI;YACF,MAAMC,WAAW,GAAG,CAAC,MAAM7B,QAAQ,CAACuB,SAAS,CAAC,EAAEO,QAAQ,EAAE;YAC1DzB,GAAG,CAAC0B,WAAW,CAACb,QAAQ,CAAC;YACzBb,GAAG,CAAC2B,IAAI,CAACH,WAAW,CAAC;UACvB,CAAC,CAAC,OAAOI,CAAC,EAAE;YACV,OAAO3B,IAAI,EAAE;UACf;QACF,CAAC,MAAM;UACLA,IAAI,EAAE;QACR;MACF,CAAC,CACF;IACH;;IAEA;IACA,IAAIf,OAAO,CAAC2C,UAAU,EAAE;MAAA,IAAAC,oBAAA;MACtB,MAAMC,SAAgC,GAAGxC,aAAa,CACpD,CAAC,CAAC,EACF;QAAEG,IAAI,EAAE;MAAc,CAAC,CACxB;MACD,KAAAoC,oBAAA,GAAIC,SAAS,CAACC,SAAS,aAAnBF,oBAAA,CAAqBG,KAAK,EAAE;QAAA,IAAAC,qBAAA;QAC9B,MAAMC,WAAW,GAAG5D,mBAAmB,EAAA2D,qBAAA,GAACH,SAAS,CAACC,SAAS,qBAAnBE,qBAAA,CAAqBD,KAAK,CAAC;QACnE,IAAIE,WAAW,EAAE;UACf5B,WAAW,CAACC,GAAG,CAAC,GAAG2B,WAAW,CAACC,GAAG,CAAC,CAAC;YAAEC;UAAW,CAAC,KAAKA,UAAU,CAAC,CAAC;QACrE;MACF;IACF;;IAEA;IACA,IAAIC,MAAc,GAAG,CAAC,MAAM,MAAM,CAACjE,IAAI,CAAC8C,IAAI,CAACvC,OAAO,CAAC2D,GAAG,EAAE,EAAE5D,UAAU,CAAC,CAAC,EACrE6D,OAAO;IAEV,IAAI,SAAS,IAAIF,MAAM,EAAE;MACvBA,MAAM,GAAGA,MAAM,CAACE,OAAc;IAChC;IAEA,IAAI,OAAOF,MAAM,KAAK,UAAU,EAAE;MAChC,MAAM,IAAIG,KAAK,CACZ,qBAAoBpE,IAAI,CAAC8C,IAAI,CAC5BvC,OAAO,CAAC2D,GAAG,EAAE,EACb5D,UAAU,CACV,oBAAmB,CACtB;IACH;IAEA4B,WAAW,CAACmC,GAAG,CACb,IAAI,EACJ7C,YAAY,CAAC,gBAAgBE,GAAQ,EAAEC,GAAQ,EAAE;MAC/C,IAAID,GAAG,CAACe,GAAG,CAAC6B,QAAQ,CAAC,aAAa,CAAC,EAAE;QACnC3C,GAAG,CAAC4C,UAAU,GAAG,GAAG;QACpB5C,GAAG,CAAC6C,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC;QAC1C7C,GAAG,CAAC2B,IAAI,CAAC,WAAW,CAAC;QACrB;MACF;MACA3B,GAAG,CAAC8C,MAAM,CAACC,EAAE,CAAC,OAAO,EAAGC,KAAc,IAAK;QACzClE,OAAO,CAACkE,KAAK,CAAC,OAAO,EAAEA,KAAK,CAAC;MAC/B,CAAC,CAAC;MAEF,MAAMV,MAAM,CAAClC,cAAc,EAAEL,GAAG,EAAEC,GAAG,CAAC;IACxC,CAAC,CAAC,CACH;IAEDJ,MAAM,GAAGW,WAAW,CACjB0C,MAAM,CAAC9D,IAAI,EAAE,MAAM;MAClBE,MAAM,CAACgB,IAAI,CAAE,gBAAelB,IAAK,KAAI,CAAC;IACxC,CAAC,CAAC,CACD4D,EAAE,CAAC,OAAO,EAAE,UAAUC,KAAU,EAAE;MACjC,IAAIA,KAAK,CAACE,OAAO,KAAK,QAAQ,EAAE;QAC9B,MAAMF,KAAK;MACb;MACA,MAAMG,MAAM,GAAIC,UAA2B,IACzCC,MAAM,CAACC,KAAK,CAACF,UAAU,CAAC;MAC1B,MAAMG,IAAI,GAAGJ,MAAM,CAAChE,IAAI,CAAC,GAAG,OAAO,GAAGA,IAAI,GAAG,OAAO,GAAGA,IAAI;MAC3D,QAAQ6D,KAAK,CAACQ,IAAI;QAChB,KAAK,QAAQ;UACXnE,MAAM,CAACiB,IAAI,CAACiD,IAAI,GAAG,+BAA+B,CAAC;UACnD3E,OAAO,CAACI,IAAI,CAAC,CAAC,CAAC;QACjB;QACA,KAAK,YAAY;UACfK,MAAM,CAACiB,IAAI,CAACiD,IAAI,GAAG,oBAAoB,CAAC;UACxC3E,OAAO,CAACI,IAAI,CAAC,CAAC,CAAC;QACjB;QACA;UACE,MAAMgE,KAAK;MAAC;IAElB,CAAC,CAAC;EACN;EAEA,IAAIS,QAAQ,GAAG,MAAM,MAAM,CAACjE,YAAY,EAAE;IACxCkE,MAAM,EAAE;MAAEC,IAAI,EAAE;IAAO;EACzB,CAAC,CAAC;EACF;EACA,IAAI,SAAS,IAAIF,QAAQ,EAAE;IACzBA,QAAQ,GAAGA,QAAQ,CAACjB,OAAO;EAC7B;EACA,MAAMrC,aAAa,CAACsD,QAAQ,CAAC;EAE7B7E,OAAO,CAACmE,EAAE,CAAC,QAAQ,EAAE,MAAM;IAAA,IAAAa,OAAA;IACzBvE,MAAM,CAACwE,IAAI,CAAC,0CAA0C,CAAC;IACvD,IAAIjE,MAAM,EAAEd,OAAO,CAACC,GAAG,CAAC,gBAAgB,CAAC;IACzC,CAAA6E,OAAA,GAAAhE,MAAM,qBAANgE,OAAA,CAAQE,KAAK,CAAC,MAAM;MAClBzE,MAAM,CAACgB,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC,CAAC;IACFzB,OAAO,CAACI,IAAI,CAAC,CAAC,CAAC,CAAC;EAClB,CAAC,CAAC;AACJ;AAEA,SAASS,gCAAgCA,CACvCF,aAAoC,EACpC;EAAA,IAAAwE,cAAA,EAAAC,qBAAA,EAAAC,sBAAA,EAAAC,sBAAA,EAAAC,qBAAA,EAAAC,sBAAA;EACA,MAAMC,gBAAwB,IAAAN,cAAA,GAE1BxE,aAAa,qBAAAyE,qBAAA,GAAbzE,aAAa,CAAE+E,OAAO,sBAAAL,sBAAA,GAAtBD,qBAAA,CAAwBO,IAAI,CAACC,MAAM,IAAI;IACrC,OAAOA,MAAM,CAACC,WAAW,CAACC,IAAI,KAAK,mBAAmB;EACxD,CAAC,CAAC,sBAAAR,sBAAA,GAHJD,sBAAA,CAIGU,IAAI,qBAJPT,sBAAA,CAISrD,QAAQ,YAAAkD,cAAA,GAAI,eAAe;EAEtC,MAAMvE,YAAY,GAAGnB,IAAI,CAAC8C,IAAI,EAAAgD,qBAAA,GAC5B5E,aAAa,qBAAA6E,sBAAA,GAAb7E,aAAa,CAAEqF,MAAM,qBAArBR,sBAAA,CAAuB/F,IAAI,YAAA8F,qBAAA,GAAI,EAAE,EACjCE,gBAAgB,CACjB;EACD,OAAO7E,YAAY;AACrB"}
160
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["Object","hasOwn","it","key","prototype","hasOwnProperty","call","compress","express","diskFs","ora","path","promisify","getProxyMiddlewares","getWebpackConfig","import","meta","entrypoint","process","argv","console","log","exit","serve","options","PORT","env","loader","start","webpackConfig","manifestPath","getManifestPathFromWebpackconfig","mode","readFile","server","handleErrors","fn","req","res","next","x","initializeApp","clientManifest","info","fail","wrappingApp","use","serveAssets","_req$url$substring","_req$url","_clientManifest$outpu","filename","url","substring","WEBPACK_PUBLIC_PATH","length","assetPath","join","outputPath","existsSync","lstatSync","isDirectory","sendFile","e","serveProxy","_devConfig$devServer","devConfig","devServer","proxy","_devConfig$devServer2","middlewares","map","middleware","render","cwd","default","Error","get","endsWith","statusCode","setHeader","send","socket","on","error","listen","syscall","isPipe","portOrPipe","Number","isNaN","bind","code","manifest","assert","type","_server","warn","close","_opts$filename","_webpackConfig$plugin","_webpackConfig$plugin2","_webpackConfig$plugin3","_webpackConfig$output","_webpackConfig$output2","manifestFilename","plugins","find","plugin","constructor","name","opts","output"],"sources":["../../src/scripts/serve.ts"],"sourcesContent":["#!/usr/bin/env node\nObject.hasOwn =\n  Object.hasOwn ||\n  /* istanbul ignore next */ function hasOwn(it, key) {\n    return Object.prototype.hasOwnProperty.call(it, key);\n  };\nimport compress from 'compression';\nimport express, { NextFunction } from 'express';\nimport diskFs from 'fs';\nimport { Server, IncomingMessage, ServerResponse } from 'http';\nimport ora from 'ora';\nimport path from 'path';\nimport { promisify } from 'util';\nimport webpack from 'webpack';\n\nimport 'cross-fetch/dist/node-polyfill.js';\nimport getProxyMiddlewares from './getProxyMiddlewares.js';\nimport { getWebpackConfig } from './getWebpackConfig.js';\nimport { Render } from './types.js';\n\n// run directly from node\nif ('main' in import.meta) {\n  const entrypoint = process.argv[2];\n\n  if (!entrypoint) {\n    console.log(`Usage: ${process.argv[0]} <server-entrypoint>`);\n    process.exit(-1);\n  }\n  serve(entrypoint);\n}\n\nexport default async function serve(\n  entrypoint: string,\n  options: { serveAssets?: boolean; serveProxy?: boolean } = {},\n) {\n  const PORT = process.env.PORT || 8080;\n\n  const loader = ora('Initializing').start();\n\n  const webpackConfig = await getWebpackConfig();\n\n  const manifestPath = getManifestPathFromWebpackconfig(\n    webpackConfig({}, { mode: 'production' }),\n  );\n\n  const readFile = promisify(diskFs.readFile);\n  let server: Server | undefined;\n\n  function handleErrors<\n    F extends (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n    ) => Promise<void>,\n  >(fn: F) {\n    return async function (\n      req: Request | IncomingMessage,\n      res: Response | ServerResponse,\n      next: NextFunction,\n    ) {\n      try {\n        return await fn(req, res);\n      } catch (x) {\n        next(x);\n      }\n    };\n  }\n\n  // Start the express server after the first compilation\n  async function initializeApp(clientManifest: webpack.StatsCompilation) {\n    loader.info('Launching server');\n    if (!clientManifest) {\n      loader.fail('Manifest not found');\n      // TODO: handle more gracefully\n      process.exit(-1);\n    }\n\n    const wrappingApp = express();\n    // eslint-disable-next-line\n    //@ts-ignore\n    wrappingApp.use(compress());\n\n    // ASSETS\n    if (options.serveAssets) {\n      wrappingApp.use(\n        async (\n          req: Request | IncomingMessage,\n          res: any,\n          next: NextFunction,\n        ) => {\n          const filename =\n            req.url?.substring(\n              (process.env.WEBPACK_PUBLIC_PATH as string).length,\n            ) ?? '';\n          const assetPath = path.join(\n            clientManifest.outputPath ?? '',\n            filename,\n          );\n\n          if (\n            diskFs.existsSync(assetPath) &&\n            !diskFs.lstatSync(assetPath).isDirectory()\n          ) {\n            try {\n              res.sendFile(assetPath);\n            } catch (e) {\n              return next();\n            }\n          } else {\n            next();\n          }\n        },\n      );\n    }\n\n    // PROXIES\n    if (options.serveProxy) {\n      const devConfig: webpack.Configuration = webpackConfig(\n        {},\n        { mode: 'development' },\n      );\n      if (devConfig.devServer?.proxy) {\n        const middlewares = getProxyMiddlewares(devConfig.devServer?.proxy);\n        if (middlewares) {\n          wrappingApp.use(...middlewares.map(({ middleware }) => middleware));\n        }\n      }\n    }\n\n    // SERVER SIDE RENDERING\n    let render: Render = (await import(path.join(process.cwd(), entrypoint)))\n      .default;\n\n    if ('default' in render) {\n      render = render.default as any;\n    }\n\n    if (typeof render !== 'function') {\n      throw new Error(\n        `default export of ${path.join(\n          process.cwd(),\n          entrypoint,\n        )} is not a function`,\n      );\n    }\n\n    wrappingApp.get(\n      '/*',\n      handleErrors(async function (req: any, res: any) {\n        if (req.url.endsWith('favicon.ico')) {\n          res.statusCode = 404;\n          res.setHeader('Content-type', 'text/html');\n          res.send('not found');\n          return;\n        }\n        res.socket.on('error', (error: unknown) => {\n          console.error('Fatal', error);\n        });\n\n        await render(clientManifest, req, res);\n      }),\n    );\n\n    server = wrappingApp\n      .listen(PORT, () => {\n        loader.info(`Listening at ${PORT}...`);\n      })\n      .on('error', function (error: any) {\n        if (error.syscall !== 'listen') {\n          throw error;\n        }\n        const isPipe = (portOrPipe: string | number) =>\n          Number.isNaN(portOrPipe);\n        const bind = isPipe(PORT) ? 'Pipe ' + PORT : 'Port ' + PORT;\n        switch (error.code) {\n          case 'EACCES':\n            loader.fail(bind + ' requires elevated privileges');\n            process.exit(1);\n          // eslint-disable-next-line no-fallthrough\n          case 'EADDRINUSE':\n            loader.fail(bind + ' is already in use');\n            process.exit(1);\n          // eslint-disable-next-line no-fallthrough\n          default:\n            throw error;\n        }\n      });\n  }\n\n  let manifest = await import(manifestPath, {\n    assert: { type: 'json' },\n  });\n  // handle inconsistent import conditions\n  if ('default' in manifest) {\n    manifest = manifest.default;\n  }\n  await initializeApp(manifest);\n\n  process.on('SIGINT', () => {\n    loader.warn('Received SIGINT, devserver shutting down');\n    if (server) console.log('Closing server');\n    server?.close(() => {\n      loader.info('Server closed');\n    });\n    process.exit(-1);\n  });\n}\n\nfunction getManifestPathFromWebpackconfig(\n  webpackConfig: webpack.Configuration,\n) {\n  const manifestFilename: string =\n    (\n      webpackConfig?.plugins?.find(plugin => {\n        return plugin.constructor.name === 'StatsWriterPlugin';\n      }) as any\n    )?.opts?.filename ?? 'manifest.json';\n\n  const manifestPath = path.join(\n    webpackConfig?.output?.path ?? '',\n    manifestFilename,\n  );\n  return manifestPath;\n}\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@anansi/core",
3
- "version": "0.16.9",
3
+ "version": "0.16.11",
4
4
  "description": "React 18 Framework",
5
5
  "homepage": "https://github.com/ntucker/anansi/tree/master/packages/core#readme",
6
6
  "repository": {
@@ -48,7 +48,7 @@
48
48
  "./server": {
49
49
  "types": "./lib/index.server.d.ts",
50
50
  "require": "./dist/server.js",
51
- "default": "./dist/server.js"
51
+ "default": "./lib/index.server.js"
52
52
  },
53
53
  "./scripts": {
54
54
  "types": "./lib/scripts/index.d.ts",
@@ -66,9 +66,9 @@
66
66
  "browser"
67
67
  ],
68
68
  "devDependencies": {
69
- "@anansi/babel-preset": "3.4.2",
69
+ "@anansi/babel-preset": "3.5.0",
70
70
  "@anansi/browserslist-config": "1.4.1",
71
- "@anansi/webpack-config": "14.3.0",
71
+ "@anansi/webpack-config": "14.3.2",
72
72
  "@babel/cli": "7.21.0",
73
73
  "@babel/core": "7.21.0",
74
74
  "@types/compression": "1.7.2",
@@ -81,7 +81,7 @@
81
81
  "webpack-cli": "5.0.1"
82
82
  },
83
83
  "dependencies": {
84
- "@anansi/router": "^0.7.18",
84
+ "@anansi/router": "^0.7.20",
85
85
  "@babel/runtime": "^7.17.0",
86
86
  "@rest-hooks/ssr": "^0.7.9",
87
87
  "chalk": "^4.1.2",
@@ -92,7 +92,7 @@
92
92
  "history": "^5.3.0",
93
93
  "http-proxy-middleware": "^2.0.6",
94
94
  "memfs": "^3.4.13",
95
- "ora": "^5.4.1",
95
+ "ora": "^6.1.2",
96
96
  "redux": "^4.2.1",
97
97
  "source-map-support": "^0.5.21",
98
98
  "tmp": "^0.2.1",
package/src/scripts/serve.ts CHANGED
@@ -88,7 +88,7 @@ export default async function serve(
88
88
  next: NextFunction,
89
89
  ) => {
90
90
  const filename =
91
- req.url?.substr(
91
+ req.url?.substring(
92
92
  (process.env.WEBPACK_PUBLIC_PATH as string).length,
93
93
  ) ?? '';
94
94
  const assetPath = path.join(
@@ -101,9 +101,7 @@ export default async function serve(
101
101
  !diskFs.lstatSync(assetPath).isDirectory()
102
102
  ) {
103
103
  try {
104
- const fileContent = (await readFile(assetPath)).toString();
105
- res.contentType(filename);
106
- res.send(fileContent);
104
+ res.sendFile(assetPath);
107
105
  } catch (e) {
108
106
  return next();
109
107
  }