chore: apply new lint rules

unjs · Jun 14, 2023 · 879a7c3 · 879a7c3
1 parent db93afa
commit 879a7c3
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 60 deletions.
diff --git a/src/build.ts b/src/build.ts
@@ -220,9 +220,9 @@ declare module 'nitropack' {
           "./"
         ),
         join(relative(tsconfigDir, nitro.options.rootDir), "**/*"),
-        ...(nitro.options.srcDir !== nitro.options.rootDir
-          ? [join(relative(tsconfigDir, nitro.options.srcDir), "**/*")]
-          : []),
+        ...(nitro.options.srcDir === nitro.options.rootDir
+          ? []
+          : [join(relative(tsconfigDir, nitro.options.srcDir), "**/*")]),
       ],
     };
     buildFiles.push({
@@ -342,27 +342,31 @@ function startRollupWatcher(nitro: Nitro, rollupConfig: RollupConfig) {
   watcher.on("event", (event) => {
     switch (event.code) {
       // The watcher is (re)starting
-      case "START":
+      case "START": {
         return;
+      }
 
       // Building an individual bundle
-      case "BUNDLE_START":
+      case "BUNDLE_START": {
         start = Date.now();
         return;
+      }
 
       // Finished building all bundles
-      case "END":
+      case "END": {
         nitro.hooks.callHook("compiled", nitro);
         nitro.logger.success(
           "Nitro built",
           start ? `in ${Date.now() - start} ms` : ""
         );
         nitro.hooks.callHook("dev:reload");
         return;
+      }
 
       // Encountered an error while bundling
-      case "ERROR":
+      case "ERROR": {
         nitro.logger.error(formatRollupError(event.error));
+      }
     }
   });
   return watcher;

diff --git a/src/cli/commands/dev.ts b/src/cli/commands/dev.ts
@@ -49,9 +49,9 @@ export default defineCommand({
                   diff.map((entry) => `  ${entry.toString()}`).join("\n")
               );
 
-              await (!diff.every((e) => hmrKeyRe.test(e.key))
-                ? reload() // Full reload
-                : nitro.updateConfig(newConfig.config)); // Hot reload
+              await (diff.every((e) => hmrKeyRe.test(e.key))
+                ? nitro.updateConfig(newConfig.config) // Full reload
+                : reload()); // Hot reload
             },
           },
         }

diff --git a/src/presets/netlify.ts b/src/presets/netlify.ts
@@ -115,9 +115,9 @@ async function writeRedirects(nitro: Nitro) {
   )
     ? "/* /404.html 404"
     : "";
-  let contents = !nitro.options.static
-    ? "/* /.netlify/functions/server 200"
-    : staticFallback;
+  let contents = nitro.options.static
+    ? staticFallback
+    : "/* /.netlify/functions/server 200";
 
   const rules = Object.entries(nitro.options.routeRules).sort(
     (a, b) => a[0].split(/\/(?!\*)/).length - b[0].split(/\/(?!\*)/).length

diff --git a/src/presets/vercel.ts b/src/presets/vercel.ts
@@ -237,14 +237,14 @@ function generateBuildConfig(nitro: Nitro) {
         ]
       : []),
     // If we are using an ISR function as a fallback, then we do not need to output the below fallback route as well
-    ...(!nitro.options.routeRules["/**"]?.isr
-      ? [
+    ...(nitro.options.routeRules["/**"]?.isr
+      ? []
+      : [
           {
             src: "/(.*)",
             dest: "/__nitro",
           },
-        ]
-      : [])
+        ])
   );
 
   return config;

diff --git a/src/rollup/config.ts b/src/rollup/config.ts
@@ -73,9 +73,7 @@ export const getRollupConfig = (nitro: Nitro): RollupConfig => {
       entryFileNames: "index.mjs",
       chunkFileNames(chunkInfo) {
         let prefix = "";
-        const lastModule = normalize(
-          chunkInfo.moduleIds[chunkInfo.moduleIds.length - 1]
-        );
+        const lastModule = normalize(chunkInfo.moduleIds.at(-1));
         if (lastModule.startsWith(buildServerDir)) {
           prefix = join("app", relative(buildServerDir, dirname(lastModule)));
         } else if (lastModule.startsWith(runtimeAppDir)) {
@@ -313,45 +311,7 @@ export const plugins = [
   );
 
   // Externals Plugin
-  if (!nitro.options.noExternals) {
-    const externalsPlugin = nitro.options.experimental.legacyExternals
-      ? legacyExternals
-      : externals;
-    rollupConfig.plugins.push(
-      externalsPlugin(
-        defu(nitro.options.externals, {
-          outDir: nitro.options.output.serverDir,
-          moduleDirectories: nitro.options.nodeModulesDirs,
-          external: [...(nitro.options.dev ? [nitro.options.buildDir] : [])],
-          inline: [
-            "#",
-            "~",
-            "@/",
-            "~~",
-            "@@/",
-            "virtual:",
-            runtimeDir,
-            nitro.options.srcDir,
-            ...nitro.options.handlers
-              .map((m) => m.handler)
-              .filter((i) => typeof i === "string"),
-          ],
-          traceOptions: {
-            base: "/",
-            processCwd: nitro.options.rootDir,
-            exportsOnly: true,
-          },
-          exportConditions: [
-            "default",
-            nitro.options.dev ? "development" : "production",
-            "module",
-            "node",
-            "import",
-          ],
-        })
-      )
-    );
-  } else {
+  if (nitro.options.noExternals) {
     rollupConfig.plugins.push({
       name: "no-externals",
       async resolveId(id, from, options) {
@@ -389,6 +349,44 @@ export const plugins = [
         }
       },
     });
+  } else {
+    const externalsPlugin = nitro.options.experimental.legacyExternals
+      ? legacyExternals
+      : externals;
+    rollupConfig.plugins.push(
+      externalsPlugin(
+        defu(nitro.options.externals, {
+          outDir: nitro.options.output.serverDir,
+          moduleDirectories: nitro.options.nodeModulesDirs,
+          external: [...(nitro.options.dev ? [nitro.options.buildDir] : [])],
+          inline: [
+            "#",
+            "~",
+            "@/",
+            "~~",
+            "@@/",
+            "virtual:",
+            runtimeDir,
+            nitro.options.srcDir,
+            ...nitro.options.handlers
+              .map((m) => m.handler)
+              .filter((i) => typeof i === "string"),
+          ],
+          traceOptions: {
+            base: "/",
+            processCwd: nitro.options.rootDir,
+            exportsOnly: true,
+          },
+          exportConditions: [
+            "default",
+            nitro.options.dev ? "development" : "production",
+            "module",
+            "node",
+            "import",
+          ],
+        })
+      )
+    );
   }
 
   // https://github.com/rollup/plugins/tree/master/packages/node-resolve

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -222,7 +222,7 @@ export async function retry(fn: () => Promise<void>, retries: number) {
 
 export function provideFallbackValues(obj: Record<string, any>) {
   for (const key in obj) {
-    if (typeof obj[key] === "undefined" || obj[key] === null) {
+    if (obj[key] === undefined || obj[key] === null) {
       obj[key] = "";
     } else if (typeof obj[key] === "object") {
       provideFallbackValues(obj[key]);