build: implement incremental build for esbuild

jeffanddom · Jan 14, 2021 · 2b84ae1 · 2b84ae1
1 parent c29f62a
commit 2b84ae1
Show file tree

Hide file tree

Showing 5 changed files with 204 additions and 159 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "buildWeb": "npx ts-node --transpile-only src/cli/build/buildWeb.ts",
     "buildServer": "npx ts-node --transpile-only src/cli/build/buildServer.ts",
     "dev": "npx ts-node --transpile-only src/cli/build/dev.ts",
-    "devServer": "node out/server/server.js",
+    "server": "node out/server/main.js",
     "typecheck": "tsc -p . --noEmit",
     "lint": "eslint 'src/**/*.{js,ts,tsx}' --quiet --fix",
     "test": "jest",

diff --git a/src/cli/build/buildServer.ts b/src/cli/build/buildServer.ts
@@ -1,28 +1,18 @@
-import * as fs from 'fs'
-import * as path from 'path'
-
 import * as esbuild from 'esbuild'
 
-import { gameSrcPath, serverBuildVersionPath, serverOutputPath } from './common'
+import { serverBuildOpts, writeServerBuildVersion } from './common'
 
-let buildVersion = '(none)'
-if (process.argv.length > 2) {
-  buildVersion = process.argv[2]
-}
+async function main(): Promise<void> {
+  let buildVersion = '(none)'
+  if (process.argv.length > 2) {
+    buildVersion = process.argv[2]
+  }
 
-console.log(`Creating bundle for build version ${buildVersion}...`)
+  console.log(`Creating bundle for build version ${buildVersion}...`)
 
-esbuild.buildSync({
-  bundle: true,
-  entryPoints: [path.join(gameSrcPath, 'server', 'main.ts')],
-  outdir: serverOutputPath,
-  platform: 'node',
-  sourcemap: true,
-  target: 'es2019',
-})
+  await esbuild.build(serverBuildOpts)
+
+  await writeServerBuildVersion(buildVersion)
+}
 
-// Write build version
-fs.mkdirSync(path.normalize(path.join(serverBuildVersionPath, '..')), {
-  recursive: true,
-})
-fs.writeFileSync(serverBuildVersionPath, buildVersion)
+main()
diff --git a/src/cli/build/buildWeb.ts b/src/cli/build/buildWeb.ts
@@ -1,56 +1,18 @@
-import * as fs from 'fs'
-import * as path from 'path'
-
 import * as esbuild from 'esbuild'
 
-import {
-  gameSrcPath,
-  webEntrypoints,
-  webEphemeralPath,
-  webOutputPath,
-} from './common'
-
-let buildVersion = '(none)'
-if (process.argv.length > 2) {
-  buildVersion = process.argv[2]
-}
+import { copyWebHtml, updateWebBuildVersion, webBuildOpts } from './common'
 
-console.log(`Creating bundle for build version ${buildVersion}...`)
+async function main(): Promise<void> {
+  let buildVersion = '(none)'
+  if (process.argv.length > 2) {
+    buildVersion = process.argv[2]
+  }
 
-// Write build version
-fs.mkdirSync(webEphemeralPath, { recursive: true })
-fs.writeFileSync(
-  path.join(webEphemeralPath, 'buildVersion.ts'),
-  `export const buildVersion = '${buildVersion}'`,
-)
+  console.log(`Creating bundle for build version ${buildVersion}...`)
 
-esbuild.buildSync({
-  bundle: true,
-  define: {
-    'process.env.NODE_ENV': '"production"', // for react-dom
-  },
-  entryPoints: webEntrypoints.map((srcPath) =>
-    path.join(gameSrcPath, srcPath, 'main.ts'),
-  ),
-  loader: {
-    '.obj': 'text',
-    '.gltf': 'json',
-  },
-  minify: false,
-  outdir: webOutputPath,
-  sourcemap: true,
-  target: ['chrome88', 'firefox84', 'safari14'],
-})
+  await updateWebBuildVersion(buildVersion)
+  await esbuild.build(webBuildOpts)
+  await copyWebHtml()
+}
 
-// Copy index.html files
-Promise.all(
-  webEntrypoints.map(async (srcPath) => {
-    await fs.promises.mkdir(path.join(webOutputPath, srcPath), {
-      recursive: true,
-    })
-    await fs.promises.copyFile(
-      path.join(gameSrcPath, srcPath, 'index.html'),
-      path.join(webOutputPath, srcPath, 'index.html'),
-    )
-  }),
-)
+main()
diff --git a/src/cli/build/common.ts b/src/cli/build/common.ts
@@ -1,6 +1,8 @@
 import * as fs from 'fs'
 import * as path from 'path'
 
+import * as esbuild from 'esbuild'
+
 const findProjectRoot = (): string => {
   let dir = __dirname
   while (dir.length > 1) {
@@ -24,3 +26,66 @@ export const serverBuildVersionPath = path.join(
 )
 
 export const webEntrypoints = ['client', 'tools/rendertoy']
+
+export const webBuildOpts: esbuild.BuildOptions = {
+  bundle: true,
+  define: {
+    'process.env.NODE_ENV': '"production"', // for react-dom
+  },
+  entryPoints: webEntrypoints.map((srcPath) =>
+    path.join(gameSrcPath, srcPath, 'main.ts'),
+  ),
+  loader: {
+    '.obj': 'text',
+    '.gltf': 'json',
+  },
+  minify: false,
+  outdir: webOutputPath,
+  sourcemap: true,
+  target: ['chrome88', 'firefox84', 'safari14'],
+}
+
+export const serverBuildOpts: esbuild.BuildOptions = {
+  bundle: true,
+  entryPoints: [path.join(gameSrcPath, 'server', 'main.ts')],
+  outdir: serverOutputPath,
+  platform: 'node',
+  sourcemap: true,
+  target: 'es2019',
+}
+
+export async function updateWebBuildVersion(
+  buildVersion: string,
+): Promise<void> {
+  await fs.promises.mkdir(webEphemeralPath, { recursive: true })
+  await fs.promises.writeFile(
+    path.join(webEphemeralPath, 'buildVersion.ts'),
+    `export const buildVersion = '${buildVersion}'`,
+  )
+}
+
+export async function copyWebHtml(): Promise<void> {
+  await Promise.all(
+    webEntrypoints.map(async (srcPath) => {
+      await fs.promises.mkdir(path.join(webOutputPath, srcPath), {
+        recursive: true,
+      })
+      await fs.promises.copyFile(
+        path.join(gameSrcPath, srcPath, 'index.html'),
+        path.join(webOutputPath, srcPath, 'index.html'),
+      )
+    }),
+  )
+}
+
+export async function writeServerBuildVersion(
+  buildVersion: string,
+): Promise<void> {
+  await fs.promises.mkdir(
+    path.normalize(path.join(serverBuildVersionPath, '..')),
+    {
+      recursive: true,
+    },
+  )
+  await fs.promises.writeFile(serverBuildVersionPath, buildVersion)
+}