@elliemae/pui-cli 9.0.0-next.68 → 9.0.0-next.69

package/dist/esm/lint-config/eslint.config.js

@@ -3,6 +3,7 @@ import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import globals from "globals";
 import eslint from "@eslint/js";
+import { defineConfig } from "eslint/config";
 import { FlatCompat } from "@eslint/eslintrc";
 import { includeIgnoreFile } from "@eslint/compat";
 import tseslint from "typescript-eslint";
@@ -23,210 +24,201 @@ const gitignorePath = path.resolve(process.cwd(), ".gitignore");
 const compat = new FlatCompat({
   baseDirectory: __dirname
 });
-const ignores = {
-  ignores: [
-    "build/*",
-    "**/node_modules/",
-    "dist/*",
-    "reports/*",
-    "allure-report/*",
-    "public/*",
-    "webroot/*",
-    "cdn/*",
-    ".tmp/*",
-    "coverage/*",
-    "demo/*",
-    "docs/*",
-    "temp/*",
-    "**/vendor/*.js",
-    ".docusaurus/*",
-    ".scannerwork/*",
-    ".DS_Store/*",
-    ".nx/*",
-    ".idea/*",
-    "*.tgz",
-    "npm-debug.log",
-    "stats.json",
-    "!.storybook"
-  ]
-};
-const options = {
-  languageOptions: {
-    ecmaVersion: "latest",
-    sourceType: "module",
-    globals: {
-      ...globals.builtin,
-      ...globals.browser,
-      ...globals.es2021,
-      ...globals.nodeBuiltin,
-      ...globals.node,
-      ...globals.serviceworker,
-      ...globals.jest,
-      ...globals.commonjs,
-      browser: true,
-      $: true
-    },
-    parserOptions: {
-      ecmaVersion: "latest",
-      sourceType: "module",
-      ecmaFeatures: {
-        jsx: true
-      },
-      project: true,
-      projectService: true,
-      tsconfigRootDir: process.cwd()
-    }
-  },
-  settings: {
-    react: {
-      version: "detect",
-      pragma: "React"
-    },
-    jest: {
-      version: "detect"
-    },
-    "import-x/parsers": {
-      espree: [".js", ".cjs", ".mjs", ".jsx"]
-    },
-    // "import-x/resolver": {
-    //   node: {
-    //     extensions: [".js", ".jsx", ".ts", ".tsx"],
-    //   },
-    //   typescript: true,
-    // },
-    "import/resolver-next": [
-      createTypeScriptImportResolver({
-        alwaysTryTypes: true
-      })
-    ]
-  }
-};
-const e2eTestConfig = {
-  files: ["**/*.func.spec.{js,ts}", "**/*.visual.spec.{js,ts}"],
-  extends: [wdioConfig["flat/recommended"]],
-  rules: {
-    "jest/valid-expect": "off"
-  }
-};
-const jestConfig = {
-  files: ["**/*.test.{js,jsx,ts,tsx}", "**/testing/**/*.{js,jsx,ts,tsx}"],
-  extends: [
-    jest.configs["flat/recommended"],
-    jest.configs["flat/style"],
-    testingLibraryConfig.configs["flat/dom"],
-    testingLibraryConfig.configs["flat/react"]
-  ]
-};
-const sbConfig = {
-  files: ["**/*.stories.{js,jsx,ts,tsx,mdx}"],
-  extends: [storybookConfig.configs["flat/recommended"]]
-};
-const jsRulesConfig = {
-  rules: {
-    complexity: ["error", { max: 10 }],
-    "import-x/no-named-as-default-member": "off",
-    "import-x/no-named-as-default": "off",
-    "import-x/no-unresolved": [
-      "error",
-      { caseSensitive: true, caseSensitiveStrict: true }
-    ],
-    "import-x/extensions": [
-      "error",
-      "never",
-      {
-        json: "ignorePackages",
-        js: "ignorePackages"
-      }
-    ],
-    "max-depth": ["error", { max: 4 }],
-    "max-nested-callbacks": ["error", { max: 3 }],
-    "max-params": ["error", { max: 3 }],
-    "max-statements": ["error", { max: 20 }],
-    "no-console": "warn",
-    "no-param-reassign": ["error", { props: false }],
-    "no-unused-vars": "off",
-    "prefer-template": "error"
-  }
-};
-const tsConfig = {
-  ignores: ["**/*.{js,jsx,mjs,cjs,mdx,md}"],
-  extends: [
-    tseslint.configs.recommendedTypeChecked,
-    tseslint.configs.stylisticTypeChecked
-  ],
-  rules: {
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-      {
-        args: "all",
-        argsIgnorePattern: "^_",
-        caughtErrors: "all",
-        caughtErrorsIgnorePattern: "^_",
-        destructuredArrayIgnorePattern: "^_",
-        varsIgnorePattern: "^_",
-        ignoreRestSiblings: true
-      }
-    ],
-    "@typescript-eslint/unbound-method": [
-      "error",
-      {
-        ignoreStatic: true
-      }
-    ]
-  }
-};
-const reactConfig = {
-  files: ["**/*.{jsx,tsx}"],
-  extends: [
-    reactPlugin.configs.flat.recommended,
-    reactPlugin.configs.flat["jsx-runtime"],
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    jsxA11yConfig.flatConfigs.recommended,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment
-    ...compat.extends("plugin:redux-saga/recommended")
-  ],
-  languageOptions: {
-    ...reactPlugin.configs.flat.recommended.languageOptions
-  },
-  plugins: {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    "react-hooks": reactHookPlugin
-  },
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  rules: {
-    "react/prop-types": ["error", { skipUndeclared: true }],
-    "react/display-name": "off",
-    "react/function-component-definition": [
-      2,
-      { namedComponents: "arrow-function" }
-    ],
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    ...reactHookPlugin.configs.recommended.rules
-  }
-};
 const gitignoreExists = existsSync(gitignorePath);
-const tseslintConfigArgs = [ignores];
+let gitIgnoreConfig = {};
 if (gitignoreExists) {
-  tseslintConfigArgs.push(includeIgnoreFile(gitignorePath));
+  gitIgnoreConfig = includeIgnoreFile(gitignorePath) ?? {};
 }
-tseslintConfigArgs.push(
+const config = defineConfig([
+  gitIgnoreConfig,
+  {
+    ignores: [
+      "build/*",
+      "**/node_modules/",
+      "dist/*",
+      "reports/*",
+      "allure-report/*",
+      "public/*",
+      "webroot/*",
+      "cdn/*",
+      ".tmp/*",
+      "coverage/*",
+      "demo/*",
+      "docs/*",
+      "temp/*",
+      "**/vendor/*.js",
+      ".docusaurus/*",
+      ".scannerwork/*",
+      ".DS_Store/*",
+      ".nx/*",
+      ".idea/*",
+      "*.tgz",
+      "npm-debug.log",
+      "stats.json",
+      "!.storybook"
+    ]
+  },
   {
     ignores: ["**/*.stories.mdx"],
     extends: [mdx.flat]
   },
   eslint.configs.recommended,
-  tsConfig,
+  {
+    ignores: ["**/*.{js,jsx,mjs,cjs,mdx,md}"],
+    extends: [
+      tseslint.configs.recommendedTypeChecked,
+      tseslint.configs.stylisticTypeChecked
+    ],
+    rules: {
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          args: "all",
+          argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+          ignoreRestSiblings: true
+        }
+      ],
+      "@typescript-eslint/unbound-method": [
+        "error",
+        {
+          ignoreStatic: true
+        }
+      ]
+    }
+  },
   eslintPluginImportX.flatConfigs.recommended,
   eslintPluginImportX.flatConfigs.typescript,
-  jestConfig,
+  {
+    files: ["**/*.test.{js,jsx,ts,tsx}", "**/testing/**/*.{js,jsx,ts,tsx}"],
+    ...jest.configs["flat/recommended"],
+    ...jest.configs["flat/style"],
+    ...testingLibraryConfig.configs["flat/dom"],
+    ...testingLibraryConfig.configs["flat/react"]
+  },
   prettierRecommended,
-  reactConfig,
-  e2eTestConfig,
-  sbConfig,
-  jsRulesConfig,
-  options
-);
-const config = tseslint.config(...tseslintConfigArgs);
+  {
+    files: ["**/*.{jsx,tsx}"],
+    ...reactPlugin.configs.flat.recommended,
+    ...reactPlugin.configs.flat["jsx-runtime"],
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    ...jsxA11yConfig.flatConfigs.recommended,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+    ...compat.extends("plugin:redux-saga/recommended"),
+    languageOptions: {
+      ...reactPlugin.configs.flat.recommended.languageOptions
+    },
+    plugins: {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      "react-hooks": reactHookPlugin
+    },
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    rules: {
+      "react/prop-types": ["error", { skipUndeclared: true }],
+      "react/display-name": "off",
+      "react/function-component-definition": [
+        2,
+        { namedComponents: "arrow-function" }
+      ],
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      ...reactHookPlugin.configs.recommended.rules
+    }
+  },
+  {
+    files: ["**/*.func.spec.{js,ts}", "**/*.visual.spec.{js,ts}"],
+    extends: [wdioConfig["flat/recommended"]],
+    rules: {
+      "jest/valid-expect": "off"
+    }
+  },
+  {
+    files: ["**/*.stories.{js,jsx,ts,tsx,mdx}"],
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    extends: [storybookConfig.configs["flat/recommended"]]
+  },
+  {
+    rules: {
+      complexity: ["error", { max: 10 }],
+      "import-x/no-named-as-default-member": "off",
+      "import-x/no-named-as-default": "off",
+      "import-x/no-unresolved": [
+        "error",
+        { caseSensitive: true, caseSensitiveStrict: true }
+      ],
+      "import-x/extensions": [
+        "error",
+        "never",
+        {
+          json: "ignorePackages",
+          js: "ignorePackages"
+        }
+      ],
+      "max-depth": ["error", { max: 4 }],
+      "max-nested-callbacks": ["error", { max: 3 }],
+      "max-params": ["error", { max: 3 }],
+      "max-statements": ["error", { max: 20 }],
+      "no-console": "warn",
+      "no-param-reassign": ["error", { props: false }],
+      "no-unused-vars": "off",
+      "prefer-template": "error"
+    }
+  },
+  {
+    languageOptions: {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      globals: {
+        ...globals.builtin,
+        ...globals.browser,
+        ...globals.es2021,
+        ...globals.nodeBuiltin,
+        ...globals.node,
+        ...globals.serviceworker,
+        ...globals.jest,
+        ...globals.commonjs,
+        browser: true,
+        $: true
+      },
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+        ecmaFeatures: {
+          jsx: true
+        },
+        projectService: true,
+        tsconfigRootDir: process.cwd()
+      }
+    },
+    settings: {
+      react: {
+        version: "detect",
+        pragma: "React"
+      },
+      jest: {
+        version: "detect"
+      },
+      "import-x/parsers": {
+        espree: [".js", ".cjs", ".mjs", ".jsx"]
+      },
+      // "import-x/resolver": {
+      //   node: {
+      //     extensions: [".js", ".jsx", ".ts", ".tsx"],
+      //   },
+      //   typescript: true,
+      // },
+      "import/resolver-next": [
+        createTypeScriptImportResolver({
+          alwaysTryTypes: true
+        })
+      ]
+    }
+  }
+]);
 export {
   config
 };

package/dist/esm/server/appRoutes.js

@@ -30,7 +30,9 @@ const loadRoutes = async (app) => {
       const routeFileURL = pathToFileURL(routeFile).href;
       const { default: init } = await import(routeFileURL);
       try {
-        if (typeof init === "function") init(app);
+        if (typeof init === "function") {
+          await init(app);
+        }
       } catch (err) {
         console.error(
           `unable to load routes from ${routeFile}. ${err.message}`

package/dist/esm/server/csp.js

@@ -21,18 +21,22 @@ const sendFileWithCSPNonce = ({
   res,
   fileSystem = fs
 }) => {
-  fileSystem.readFile(path.resolve(buildPath, page), "utf8", (err, html) => {
-    if (err) {
-      res.sendStatus(404);
-    } else {
-      res.set("Content-Type", "text/html");
-      res.set("Reporting-Endpoints", `csp-report-uri="${CSP_REPORT_URI}"`);
-      res.set(
-        "Permissions-Policy",
-        "geolocation=(), camera=(), microphone=(), interest-cohort=()"
-      );
-      res.send(html.replace(nonceRegex, res.locals.cspNonce));
-    }
+  return new Promise((resolve) => {
+    fileSystem.readFile(path.resolve(buildPath, page), "utf8", (err, html) => {
+      const r = res;
+      if (err) {
+        r.sendStatus(404);
+      } else {
+        r.set("Content-Type", "text/html");
+        r.set("Reporting-Endpoints", `csp-report-uri="${CSP_REPORT_URI}"`);
+        r.set(
+          "Permissions-Policy",
+          "geolocation=(), camera=(), microphone=(), interest-cohort=()"
+        );
+        r.send(html.replace(nonceRegex, r.locals.cspNonce ?? ""));
+      }
+      resolve();
+    });
   });
 };
 const getScriptSrc = () => {

package/dist/esm/server/index.js

@@ -12,19 +12,28 @@ import { isHttps } from "../utils.js";
 import { loadRoutes } from "./appRoutes.js";
 import { createWSServer } from "./wsServer.js";
 void (async function startServer() {
-  const app = express();
-  setupDefaultMiddlewares(app);
-  await loadRoutes(app);
-  setupAdditionalMiddlewars(app);
-  const server = isHttps() ? https.createServer(getCertOptions(), app) : http.createServer(app);
-  server.listen(port, host, () => {
-    logger.appStarted(port.toString(), host || "localhost");
-  }).on("error", (err) => {
+  try {
+    const app = express();
+    setupDefaultMiddlewares(app);
+    await loadRoutes(app);
+    setupAdditionalMiddlewars(app);
+    const server = isHttps() ? https.createServer(getCertOptions(), app) : http.createServer(app);
+    server.listen(port, host, () => {
+      logger.appStarted(port.toString(), host || "localhost");
+    }).on("error", (err) => {
+      logger.error(err);
+      process.exit(1);
+    });
+    const { wsServer } = await createWSServer({
+      port: wsPort
+    });
+    app.locals.wsServer = wsServer;
+  } catch (err) {
     logger.error(err);
     process.exit(1);
-  });
-  const { wsServer } = await createWSServer({
-    port: wsPort
-  });
-  app.locals.wsServer = wsServer;
+  }
 })();
+process.on("unhandledRejection", (reason) => {
+  logger.error(reason);
+  process.exit(1);
+});

package/dist/esm/server/middlewares.js

@@ -2,12 +2,12 @@ import express from "express";
 import cors from "cors";
 import compression from "compression";
 import expressStaticGzip from "express-static-gzip";
-import pinoLogger from "pino-http";
+import { pinoHttp } from "pino-http";
 import { csp, sendFileWithCSPNonce } from "./csp.js";
 import { getPaths } from "../webpack/helpers.js";
 const paths = getPaths();
 const setupDefaultMiddlewares = (app) => {
-  const pino = pinoLogger({
+  const pino = pinoHttp({
     transport: {
       target: "pino-pretty",
       options: {
@@ -27,8 +27,8 @@ const setupDefaultMiddlewares = (app) => {
 const setupAdditionalMiddlewars = (app, options = {}) => {
   const { buildPath = paths.buildPath, basePath = paths.basePath } = options;
   app.use(compression());
-  app.get(basePath, (_req, res) => {
-    sendFileWithCSPNonce({ buildPath, res });
+  app.get(basePath, async (_req, res) => {
+    await sendFileWithCSPNonce({ buildPath, res });
   });
   app.use(
     basePath,
@@ -39,10 +39,13 @@ const setupAdditionalMiddlewars = (app, options = {}) => {
     })
   );
   app.use(expressStaticGzip("cdn", {}));
-  app.get(
-    "*",
-    (_req, res) => sendFileWithCSPNonce({ buildPath, res })
-  );
+  app.get("*", async (_req, res) => {
+    await sendFileWithCSPNonce({ buildPath, res });
+  });
+  app.use(function(err, _req, res, _next) {
+    console.error("Express error:", err);
+    res.status(500).send("Internal Server Error");
+  });
   return app;
 };
 export {

package/dist/types/eslint.config.d.ts

@@ -1,2 +1,2 @@
-import { config } from './lib/lint-config/eslint.config';
+import { config } from './lib/lint-config/eslint.config.js';
 export default config;

package/dist/types/lib/lint-config/eslint.config.d.ts

@@ -1,3 +1,3 @@
-export type { TSESLint } from "@typescript-eslint/utils";
-declare const config: import("@typescript-eslint/utils/dist/ts-eslint").FlatConfig.ConfigArray;
+import { Linter } from "eslint";
+declare const config: Linter.Config<Linter.RulesRecord>[];
 export { config };

package/dist/types/lib/server/csp.d.ts

@@ -7,6 +7,6 @@ interface CSPConfig {
     res: Response<unknown, Record<string, unknown>>;
     fileSystem?: typeof fs;
 }
-export declare const sendFileWithCSPNonce: ({ buildPath, page, nonceRegex, res, fileSystem, }: CSPConfig) => void;
+export declare const sendFileWithCSPNonce: ({ buildPath, page, nonceRegex, res, fileSystem, }: CSPConfig) => Promise<void>;
 export declare const csp: (app: Application) => void;
 export {};