we're close!

Signed-off-by: Logan McAnsh <[email protected]>

Author: mcansh

__scripts/test.mjs

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
 
-import path from "node:path";
 import os from "node:os";
+import path from "node:path";
 
-import { execa } from "execa";
 import { detect, getCommand } from "@antfu/ni";
+import PackageJson from "@npmcli/package-json";
+import { execa } from "execa";
 import fse from "fs-extra";
 import PQueue from "p-queue";
-import PackageJson from "@npmcli/package-json";
 
-console.log({ concurrency: os.cpus().length });
+const concurrency = os.cpus().length;
+
+console.log({ concurrency });
 
-const queue = new PQueue({ concurrency: os.cpus().length, autoStart: false });
+const queue = new PQueue({ concurrency, autoStart: false });
 
 const TO_IGNORE = [".git", ".github", "__scripts", "yarn.lock", "package.json"];
 
@@ -51,16 +53,6 @@ for (const example of examples) {
   queue.add(async () => {
     const pkgJson = await PackageJson.load(example);
 
-    // TODO: figure out why this is blowing up
-    pkgJson.update({
-      dependencies: {
-        ...pkgJson.content.dependencies,
-        "@vanilla-extract/css": "1.9.2",
-      },
-    });
-
-    await pkgJson.save();
-
     /** @type {import('execa').Options} */
     const options = { cwd: example, reject: false };
 
@@ -72,21 +64,21 @@ for (const example of examples) {
     if (hasSetup) {
       const setup = await getCommand(detected, "run", ["__setup"]);
       const setupArgs = setup.split(" ").slice(1);
-      console.log("🔧 Running setup script for", example);
+      console.log("🔧\u00A0Running setup script for", example);
       const setupResult = await execa(detected, setupArgs, options);
       if (setupResult.exitCode) {
         console.error(setupResult.stderr);
         throw new Error(`Error running setup script for ${example}`);
       }
     }
 
-    const install = await getCommand(detected, "install", [
+    const installCommand = await getCommand(detected, "install", [
       "--silent",
       "--legacy-peer-deps",
     ]);
     // this is silly, but is needed in order for execa to work
-    const installArgs = install.split(" ").slice(1, -1);
-    console.log(`📥 Installing ${example} with "${install}"`);
+    const installArgs = installCommand.split(" ").slice(1, -1);
+    console.log(`📥\u00A0Installing ${example} with "${installCommand}"`);
     const installResult = await execa(detected, installArgs, options);
 
     if (installResult.exitCode) {
@@ -100,31 +92,33 @@ for (const example of examples) {
 
     if (hasPrisma) {
       console.log("Generating prisma types for", example);
-      const prismaGenerate = await execa(
+      const prismaGenerateCommand = await execa(
         "npx",
         ["prisma", "generate"],
         options
       );
 
-      if (prismaGenerate.exitCode) {
-        console.error(prismaGenerate.stderr);
+      if (prismaGenerateCommand.exitCode) {
+        console.error(prismaGenerateCommand.stderr);
         throw new Error(`Error generating prisma types for ${example}`);
       }
     }
 
-    const build = await getCommand(detected, "run", ["build"]);
-    const buildArgs = build.split(" ").slice(1);
-    console.log(`📦 Building ${example} with "${build}"`);
+    const buildCommand = await getCommand(detected, "run", ["build"]);
+    const buildArgs = buildCommand.split(" ").slice(1);
+    console.log(`📦\u00A0Building ${example} with "${buildCommand}"`);
     const buildResult = await execa(detected, buildArgs, options);
 
     if (buildResult.exitCode) {
       console.error(buildResult.stderr);
       throw new Error(`Error building ${example}`);
     }
 
-    const typecheck = await getCommand(detected, "run", ["typecheck"]);
-    const typecheckArgs = typecheck.split(" ").slice(1);
-    console.log(`🕵️ Typechecking ${example} with "${typecheck}"`);
+    const typecheckCommand = await getCommand(detected, "run", ["typecheck"]);
+    const typecheckArgs = typecheckCommand.split(" ").slice(1);
+    console.log(
+      `🕵️\u00A0\u00A0Typechecking ${example} with "${typecheckCommand}"`
+    );
     const typecheckResult = await execa(detected, typecheckArgs, options);
 
     if (typecheckResult.exitCode) {

_official-tutorial/app/root.tsx

@@ -176,10 +176,8 @@ function OptimisticFavorite({ contact }: { contact: ContactRecord }) {
 
   // Now check if there are any pending fetchers that are changing this contact
   for (const fetcher of fetchers) {
-    // @ts-expect-error https://github.com/remix-run/remix/pull/5476
     if (fetcher.formAction === `/contacts/${contact.id}`) {
       // Ask for the optimistic version of the data
-      // @ts-expect-error https://github.com/remix-run/remix/pull/5476
       isFavorite = fetcher.formData.get("favorite") === "true";
     }
   }

_official-tutorial/app/routes/contacts.$contactId.tsx

@@ -94,9 +94,7 @@ export default function Contact() {
 function Favorite({ contact }: { contact: ContactRecord }) {
   const fetcher = useFetcher<typeof action>();
   let favorite = contact.favorite;
-  // @ts-expect-error
   if (fetcher.formData) {
-    // @ts-expect-error
     favorite = fetcher.formData.get("favorite") === "true";
   }
   return (

_official-tutorial/tsconfig.json

@@ -11,6 +11,7 @@
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
     "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"]

emotion/app/entry.server.tsx

@@ -19,6 +19,7 @@ export default function handleRequest(
   const html = renderToString(
     <ServerStyleContext.Provider value={null}>
       <CacheProvider value={cache}>
+        {/* @ts-expect-error */}
         <RemixServer context={remixContext} url={request.url} />
       </CacheProvider>
     </ServerStyleContext.Provider>
@@ -29,6 +30,7 @@ export default function handleRequest(
   const markup = renderToString(
     <ServerStyleContext.Provider value={chunks.styles}>
       <CacheProvider value={cache}>
+        {/* @ts-expect-error */}
         <RemixServer context={remixContext} url={request.url} />
       </CacheProvider>
     </ServerStyleContext.Provider>

package.json

@@ -9,11 +9,11 @@
   },
   "devDependencies": {
     "@remix-run/eslint-config": "^1.15.0",
-    "@types/react": "^18.0.35",
+    "@types/react": "^18.0.37",
     "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-cypress": "^2.13.2",
+    "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-prefer-let": "^3.0.1",
     "jest": "^29.5.0",
     "prettier": "^2.8.7",
@@ -24,10 +24,10 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@antfu/ni": "^0.18.8",
+    "@antfu/ni": "^0.21.3",
     "@npmcli/package-json": "^3.0.0",
-    "execa": "^6.1.0",
-    "fs-extra": "11.1.0",
-    "p-queue": "^7.3.0"
+    "execa": "^7.1.1",
+    "fs-extra": "11.1.1",
+    "p-queue": "^7.3.4"
   }
 }

picocss/tsconfig.json

@@ -11,6 +11,7 @@
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
     "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"]

strapi/package.json

@@ -13,6 +13,7 @@
     "@remix-run/node": "~1.14.2",
     "@remix-run/react": "~1.14.2",
     "@remix-run/serve": "~1.14.2",
+    "isbot": "^3.6.8",
     "marked": "^4.0.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

theme-ui/package.json

@@ -16,7 +16,8 @@
     "@remix-run/serve": "~1.14.2",
     "@theme-ui/core": "^0.14.6",
     "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react-dom": "^17.0.2",
+    "theme-ui": "0.15.7"
   },
   "devDependencies": {
     "@remix-run/dev": "~1.14.2",

theme-ui/tsconfig.json

@@ -11,12 +11,12 @@
     "strict": true,
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
     "jsxImportSource": "theme-ui",
     "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"]
     },
-    "skipLibCheck": true,
 
     // Remix takes care of building everything in `remix build`.
     "noEmit": true