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

package/dist/cjs/commands/lint.js

@@ -56,7 +56,7 @@ const lintJS = async (args) => {
   const fixIssues = args.fix ? "--fix" : "";
   const debugFlags = args.debug ? "--env-info --debug" : "";
   await (0, import_utils.exec)(
-    `eslint --flag unstable_ts_config ${!(0, import_utils.getCIEnv)() ? "--color" : "--no-color"} ${fixIssues} ${debugFlags} .`
+    `eslint ${!(0, import_utils.getCIEnv)() ? "--color" : "--no-color"} ${fixIssues} ${debugFlags} .`
   );
 };
 const cmdArgs = {

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

@@ -36,6 +36,7 @@ var import_node_fs = require("node:fs");
 var import_node_url = require("node:url");
 var import_globals = __toESM(require("globals"));
 var import_js = __toESM(require("@eslint/js"));
+var import_config = require("eslint/config");
 var import_eslintrc = require("@eslint/eslintrc");
 var import_compat = require("@eslint/compat");
 var import_typescript_eslint = __toESM(require("typescript-eslint"));
@@ -57,207 +58,198 @@ const gitignorePath = import_node_path.default.resolve(process.cwd(), ".gitignor
 const compat = new import_eslintrc.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: {
-      ...import_globals.default.builtin,
-      ...import_globals.default.browser,
-      ...import_globals.default.es2021,
-      ...import_globals.default.nodeBuiltin,
-      ...import_globals.default.node,
-      ...import_globals.default.serviceworker,
-      ...import_globals.default.jest,
-      ...import_globals.default.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": [
-      (0, import_eslint_import_resolver_typescript.createTypeScriptImportResolver)({
-        alwaysTryTypes: true
-      })
-    ]
-  }
-};
-const e2eTestConfig = {
-  files: ["**/*.func.spec.{js,ts}", "**/*.visual.spec.{js,ts}"],
-  extends: [import_eslint_plugin_wdio.configs["flat/recommended"]],
-  rules: {
-    "jest/valid-expect": "off"
-  }
-};
-const jestConfig = {
-  files: ["**/*.test.{js,jsx,ts,tsx}", "**/testing/**/*.{js,jsx,ts,tsx}"],
-  extends: [
-    import_eslint_plugin_jest.default.configs["flat/recommended"],
-    import_eslint_plugin_jest.default.configs["flat/style"],
-    import_eslint_plugin_testing_library.default.configs["flat/dom"],
-    import_eslint_plugin_testing_library.default.configs["flat/react"]
-  ]
-};
-const sbConfig = {
-  files: ["**/*.stories.{js,jsx,ts,tsx,mdx}"],
-  extends: [import_eslint_plugin_storybook.default.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: [
-    import_typescript_eslint.default.configs.recommendedTypeChecked,
-    import_typescript_eslint.default.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: [
-    import_eslint_plugin_react.default.configs.flat.recommended,
-    import_eslint_plugin_react.default.configs.flat["jsx-runtime"],
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    import_eslint_plugin_jsx_a11y.default.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: {
-    ...import_eslint_plugin_react.default.configs.flat.recommended.languageOptions
-  },
-  plugins: {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    "react-hooks": import_eslint_plugin_react_hooks.default
-  },
-  // 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
-    ...import_eslint_plugin_react_hooks.default.configs.recommended.rules
-  }
-};
 const gitignoreExists = (0, import_node_fs.existsSync)(gitignorePath);
-const tseslintConfigArgs = [ignores];
+let gitIgnoreConfig = {};
 if (gitignoreExists) {
-  tseslintConfigArgs.push((0, import_compat.includeIgnoreFile)(gitignorePath));
+  gitIgnoreConfig = (0, import_compat.includeIgnoreFile)(gitignorePath) ?? {};
 }
-tseslintConfigArgs.push(
+const config = (0, import_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]
   },
   import_js.default.configs.recommended,
-  tsConfig,
+  {
+    ignores: ["**/*.{js,jsx,mjs,cjs,mdx,md}"],
+    extends: [
+      import_typescript_eslint.default.configs.recommendedTypeChecked,
+      import_typescript_eslint.default.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
+        }
+      ]
+    }
+  },
   import_eslint_plugin_import_x.default.flatConfigs.recommended,
   import_eslint_plugin_import_x.default.flatConfigs.typescript,
-  jestConfig,
+  {
+    files: ["**/*.test.{js,jsx,ts,tsx}", "**/testing/**/*.{js,jsx,ts,tsx}"],
+    ...import_eslint_plugin_jest.default.configs["flat/recommended"],
+    ...import_eslint_plugin_jest.default.configs["flat/style"],
+    ...import_eslint_plugin_testing_library.default.configs["flat/dom"],
+    ...import_eslint_plugin_testing_library.default.configs["flat/react"]
+  },
   import_recommended.default,
-  reactConfig,
-  e2eTestConfig,
-  sbConfig,
-  jsRulesConfig,
-  options
-);
-const config = import_typescript_eslint.default.config(...tseslintConfigArgs);
+  {
+    files: ["**/*.{jsx,tsx}"],
+    ...import_eslint_plugin_react.default.configs.flat.recommended,
+    ...import_eslint_plugin_react.default.configs.flat["jsx-runtime"],
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    ...import_eslint_plugin_jsx_a11y.default.flatConfigs.recommended,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+    ...compat.extends("plugin:redux-saga/recommended"),
+    languageOptions: {
+      ...import_eslint_plugin_react.default.configs.flat.recommended.languageOptions
+    },
+    plugins: {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      "react-hooks": import_eslint_plugin_react_hooks.default
+    },
+    // 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
+      ...import_eslint_plugin_react_hooks.default.configs.recommended.rules
+    }
+  },
+  {
+    files: ["**/*.func.spec.{js,ts}", "**/*.visual.spec.{js,ts}"],
+    extends: [import_eslint_plugin_wdio.configs["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: [import_eslint_plugin_storybook.default.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: {
+        ...import_globals.default.builtin,
+        ...import_globals.default.browser,
+        ...import_globals.default.es2021,
+        ...import_globals.default.nodeBuiltin,
+        ...import_globals.default.node,
+        ...import_globals.default.serviceworker,
+        ...import_globals.default.jest,
+        ...import_globals.default.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": [
+        (0, import_eslint_import_resolver_typescript.createTypeScriptImportResolver)({
+          alwaysTryTypes: true
+        })
+      ]
+    }
+  }
+]);

package/dist/cjs/server/appRoutes.js

@@ -63,7 +63,9 @@ const loadRoutes = async (app) => {
       const routeFileURL = (0, import_node_url.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/cjs/server/csp.js

@@ -55,18 +55,22 @@ const sendFileWithCSPNonce = ({
   res,
   fileSystem = import_node_fs.default
 }) => {
-  fileSystem.readFile(import_node_path.default.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(import_node_path.default.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/cjs/server/index.js

@@ -32,19 +32,28 @@ var import_utils2 = require("../utils.js");
 var import_appRoutes = require("./appRoutes.js");
 var import_wsServer = require("./wsServer.js");
 void (async function startServer() {
-  const app = (0, import_express.default)();
-  (0, import_middlewares.setupDefaultMiddlewares)(app);
-  await (0, import_appRoutes.loadRoutes)(app);
-  (0, import_middlewares.setupAdditionalMiddlewars)(app);
-  const server = (0, import_utils2.isHttps)() ? import_node_https.default.createServer((0, import_cert.getCertOptions)(), app) : import_node_http.default.createServer(app);
-  server.listen(import_utils.port, import_utils.host, () => {
-    import_logger.logger.appStarted(import_utils.port.toString(), import_utils.host || "localhost");
-  }).on("error", (err) => {
+  try {
+    const app = (0, import_express.default)();
+    (0, import_middlewares.setupDefaultMiddlewares)(app);
+    await (0, import_appRoutes.loadRoutes)(app);
+    (0, import_middlewares.setupAdditionalMiddlewars)(app);
+    const server = (0, import_utils2.isHttps)() ? import_node_https.default.createServer((0, import_cert.getCertOptions)(), app) : import_node_http.default.createServer(app);
+    server.listen(import_utils.port, import_utils.host, () => {
+      import_logger.logger.appStarted(import_utils.port.toString(), import_utils.host || "localhost");
+    }).on("error", (err) => {
+      import_logger.logger.error(err);
+      process.exit(1);
+    });
+    const { wsServer } = await (0, import_wsServer.createWSServer)({
+      port: import_utils.wsPort
+    });
+    app.locals.wsServer = wsServer;
+  } catch (err) {
     import_logger.logger.error(err);
     process.exit(1);
-  });
-  const { wsServer } = await (0, import_wsServer.createWSServer)({
-    port: import_utils.wsPort
-  });
-  app.locals.wsServer = wsServer;
+  }
 })();
+process.on("unhandledRejection", (reason) => {
+  import_logger.logger.error(reason);
+  process.exit(1);
+});

package/dist/cjs/server/middlewares.js

@@ -36,12 +36,12 @@ var import_express = __toESM(require("express"));
 var import_cors = __toESM(require("cors"));
 var import_compression = __toESM(require("compression"));
 var import_express_static_gzip = __toESM(require("express-static-gzip"));
-var import_pino_http = __toESM(require("pino-http"));
+var import_pino_http = require("pino-http");
 var import_csp = require("./csp.js");
 var import_helpers = require("../webpack/helpers.js");
 const paths = (0, import_helpers.getPaths)();
 const setupDefaultMiddlewares = (app) => {
-  const pino = (0, import_pino_http.default)({
+  const pino = (0, import_pino_http.pinoHttp)({
     transport: {
       target: "pino-pretty",
       options: {
@@ -61,8 +61,8 @@ const setupDefaultMiddlewares = (app) => {
 const setupAdditionalMiddlewars = (app, options = {}) => {
   const { buildPath = paths.buildPath, basePath = paths.basePath } = options;
   app.use((0, import_compression.default)());
-  app.get(basePath, (_req, res) => {
-    (0, import_csp.sendFileWithCSPNonce)({ buildPath, res });
+  app.get(basePath, async (_req, res) => {
+    await (0, import_csp.sendFileWithCSPNonce)({ buildPath, res });
   });
   app.use(
     basePath,
@@ -73,9 +73,12 @@ const setupAdditionalMiddlewars = (app, options = {}) => {
     })
   );
   app.use((0, import_express_static_gzip.default)("cdn", {}));
-  app.get(
-    "*",
-    (_req, res) => (0, import_csp.sendFileWithCSPNonce)({ buildPath, res })
-  );
+  app.get("*", async (_req, res) => {
+    await (0, import_csp.sendFileWithCSPNonce)({ buildPath, res });
+  });
+  app.use(function(err, _req, res, _next) {
+    console.error("Express error:", err);
+    res.status(500).send("Internal Server Error");
+  });
   return app;
 };

package/dist/esm/commands/lint.js

@@ -30,7 +30,7 @@ const lintJS = async (args) => {
   const fixIssues = args.fix ? "--fix" : "";
   const debugFlags = args.debug ? "--env-info --debug" : "";
   await exec(
-    `eslint --flag unstable_ts_config ${!getCIEnv() ? "--color" : "--no-color"} ${fixIssues} ${debugFlags} .`
+    `eslint ${!getCIEnv() ? "--color" : "--no-color"} ${fixIssues} ${debugFlags} .`
   );
 };
 const cmdArgs = {