fixing the deploy

Author: AlexErrant

app-ugc/package.json

@@ -6,7 +6,8 @@
     "start": "vite",
     "dev": "vite",
     "deploy": "./deploy.sh",
-    "build": "vite build",
+    "//build": "`vite build` doesn't support custom tsconfigs as per https://github.com/vitejs/vite/issues/10531 so we have to do this shuffle. I am too dumb to get @rollup/plugin-typescript and/or esbuild's tsconfigRaw working, and vite-plugin-custom-tsconfig doesn't like it if you already have a `tsconfig.json`. grep 18D6F474-350E-4C59-AD61-7604C5D0758F",
+    "build": "mv tsconfig.json tsconfig.json.temp && mv tsconfig.dist.json tsconfig.json && vite build; mv tsconfig.json tsconfig.dist.json && mv tsconfig.json.temp tsconfig.json",
     "build-watch": "vite build --watch",
     "serve": "vite preview",
     "tsc-build": "tsc --build",

app-ugc/tsconfig.dist.json

@@ -0,0 +1,44 @@
+{
+  "extends": "../tsconfig.options.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "strict": true,
+    "target": "ES2021",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "jsx": "preserve",
+    "jsxImportSource": "solid-js",
+    "lib": [
+      "WebWorker",
+      "DOM",
+      "DOM.Iterable",
+      "ES2021.String"
+    ],
+    "types": [
+      "@cloudflare/workers-types",
+      "vite/client",
+    ]
+  },
+  "references": [
+    // grep 18D6F474-350E-4C59-AD61-7604C5D0758F
+    // `app` has two possible compile outputs - dist and publish.
+    // (These names are scoped to this comment only - they aren't reflected anywhere else in code!)
+    // * dist is the output of `pnpm build` and is shipped to Cloudflare
+    // * publish is the output of `pnpm tsc-build` and is what's (eventually) published to npm
+    // CICD produces `publish` first using `tsconfig.json`. It then produces `dist` using `tsconfig.dist.json`
+    // Including the `app` reference below causes the build to complain with
+    //     Output file '/app/dist/src/index.d.ts' has not been built from source file '/app/src/index.tsx'.
+    // because the `dist` has been run. Someday I'll figure out how to split the compiled output folders.
+    // Today is not that day.
+    // {
+    //   "path": "../app"
+    // },
+    {
+      "path": "../shared"
+    },
+  ],
+}

hub/package.json

@@ -2,7 +2,8 @@
   "name": "hub",
   "scripts": {
     "dev": "solid-start dev",
-    "build": "solid-start build",
+    "//build": "`vite build` doesn't support custom tsconfigs as per https://github.com/vitejs/vite/issues/10531 so we have to do this shuffle. I am too dumb to get @rollup/plugin-typescript and/or esbuild's tsconfigRaw working, and vite-plugin-custom-tsconfig doesn't like it if you already have a `tsconfig.json`. grep 18D6F474-350E-4C59-AD61-7604C5D0758F",
+    "build": "mv tsconfig.json tsconfig.json.temp && mv tsconfig.dist.json tsconfig.json && solid-start build; mv tsconfig.json tsconfig.dist.json && mv tsconfig.json.temp tsconfig.json",
     "start": "solid-start start",
     "deploy": "wrangler publish",
     "tsc-build": "tsc --build",

hub/tsconfig.dist.json

@@ -0,0 +1,50 @@
+{
+  "extends": "../tsconfig.options.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "jsxImportSource": "solid-js",
+    "jsx": "preserve",
+    "strict": true,
+    "types": [
+      "vite/client"
+    ],
+    "paths": {
+      "~/*": [
+        "./src/*"
+      ]
+    }
+  },
+  "references": [
+    // grep 18D6F474-350E-4C59-AD61-7604C5D0758F
+    // `app` has two possible compile outputs - dist and publish.
+    // (These names are scoped to this comment only - they aren't reflected anywhere else in code!)
+    // * dist is the output of `pnpm build` and is shipped to Cloudflare
+    // * publish is the output of `pnpm tsc-build` and is what's (eventually) published to npm
+    // CICD produces `publish` first using `tsconfig.json`. It then produces `dist` using `tsconfig.dist.json`
+    // Including the `app` reference below causes the build to complain with
+    //     Output file '/app/dist/src/index.d.ts' has not been built from source file '/app/src/index.tsx'.
+    // because the `dist` has been run. Someday I'll figure out how to split the compiled output folders.
+    // Today is not that day.
+    // {
+    //   "path": "../app"
+    // },
+    {
+      "path": "../cwa"
+    },
+    {
+      "path": "../shared"
+    },
+    {
+      "path": "../shared-dom"
+    },
+    {
+      "path": "../shared-edge"
+    },
+  ]
+}

lrpc/tsconfig.json

@@ -29,7 +29,8 @@
     "**/*.tsx"
   ],
   "exclude": [
-    "node_modules"
+    "node_modules",
+    "dist"
   ],
   "ts-node": {
     "esm": true

tsconfig.options.json

@@ -3,7 +3,7 @@
         "composite": true,
         "declaration": true,
         "declarationMap": true,
-        "emitDeclarationOnly": true,
+        // "emitDeclarationOnly": true, // commenting out for now because I'm out of patience
         "incremental": true,
         "noEmitOnError": true,
         "skipLibCheck": true