[legacy-framework] feat: Implement the new Architecture!

examples/store/app/admin/routes/admin/products/[id].tsx

@@ -1,5 +1,5 @@
 import {Link, useRouter, useQuery} from '@blitzjs/core'
-import getProduct from 'app/products/queries/getProduct_rpc'
+import getProduct from 'app/products/queries/getProduct'
 import ProductForm from 'app/products/components/ProductForm'
 
 export default function() {

examples/store/app/admin/routes/admin/products/index.tsx

@@ -1,5 +1,5 @@
 import {useQuery, Link} from '@blitzjs/core'
-import getProducts from 'app/products/queries/getProducts_rpc'
+import getProducts from 'app/products/queries/getProducts'
 
 export default function() {
   const [products, {status, error}] = useQuery(getProducts)

examples/store/app/products/components/ProductForm.tsx

@@ -1,7 +1,7 @@
 import {Form, Field} from 'react-final-form'
 import {Product, ProductCreateInput, ProductUpdateInput} from 'prisma'
-import createProduct from 'app/products/mutations/createProduct_rpc'
-import updateProduct from 'app/products/mutations/updateProduct_rpc'
+import createProduct from 'app/products/mutations/createProduct'
+import updateProduct from 'app/products/mutations/updateProduct'
 
 type ProductInput = ProductCreateInput | ProductUpdateInput
 

examples/store/next.config.js

@@ -0,0 +1,3 @@
+const {withBlitz} = require('@blitzjs/server')
+
+module.exports = withBlitz({})

package.json

@@ -25,7 +25,7 @@
     "cross-env": "^7.0.0",
     "debug": "^4.1.1",
     "husky": "^4.2.3",
-    "jest": "25.3.0",
+    "jest": "24.9.0",
     "lerna": "^3.20.2",
     "lint-staged": "^10.0.8",
     "npm-run-all": "^4.1.5",

packages/core/src/rpc.ts

@@ -2,6 +2,7 @@ import {BlitzApiRequest, BlitzApiResponse} from '.'
 import {serializeError, deserializeError} from 'serialize-error'
 
 export async function rpc(url: string, params: any) {
+  if (typeof window === 'undefined') return
   const result = await window.fetch(url, {
     method: 'POST',
     credentials: 'same-origin',
@@ -27,13 +28,27 @@ rpc.warm = (url: string) => {
   }
 }
 
+export function isomorphicRpc(resolver: any, cacheKey: string) {
+  if (typeof window !== 'undefined') {
+    const url = cacheKey.replace(/^app\/_rpc/, '/api')
+    const rpcFn: any = (params: any) => rpc(url, params)
+    rpcFn.cacheKey = url
+
+    // Warm the lambda
+    rpc.warm(url)
+    return rpcFn
+  } else {
+    return resolver
+  }
+}
+
 export function rpcHandler(
   type: string,
   name: string,
   resolver: (...args: any) => Promise<any>,
   connectDb?: () => any,
 ) {
-  return async function(req: BlitzApiRequest, res: BlitzApiResponse) {
+  return async function (req: BlitzApiRequest, res: BlitzApiResponse) {
     const logPrefix = `[${type}:${name}]`
     console.log(`${logPrefix} ${req.method} ${JSON.stringify(req.body)} `)
 

packages/server/package.json

@@ -48,9 +48,11 @@
     "next-compose-plugins": "2.2.0",
     "next-transpile-modules": "3.2.0",
     "node-pty": "^0.9.0",
+    "null-loader": "^3.0.0",
     "path-is-absolute": "^2.0.0",
     "pirates": "^4.0.1",
     "readable-stream": "^3.6.0",
+    "resolve-bin": "^0.4.0",
     "through2": "^3.0.1",
     "vinyl": "^2.2.0",
     "vinyl-file": "^3.0.0",

packages/server/src/build.ts

@@ -13,7 +13,7 @@ export async function build(config: ServerConfig) {
     manifestPath,
     writeManifestFile,
     includePaths,
-  } = enhance(config)
+  } = await enhance(config)
 
   const synchronizer = await synchronizeFiles({
     src: rootFolder,

packages/server/src/config.ts

@@ -1,6 +1,6 @@
 import {resolve} from 'path'
 import {ciLog} from './ciLog'
-
+import {resolveBinAsync} from './resolve-bin-async'
 export type ServerConfig = {
   rootFolder: string
   interceptNextErrors?: boolean
@@ -34,16 +34,18 @@ const defaults = {
   writeManifestFile: true,
 }
 
-export function enhance(config: ServerConfig) {
+export async function enhance(config: ServerConfig) {
   const devFolder = resolve(config.rootFolder, config.devFolder || defaults.devFolder)
   const buildFolder = resolve(config.rootFolder, config.buildFolder || defaults.buildFolder)
   const manifestPath = resolve(devFolder, config.manifestPath || defaults.manifestPath)
   const writeManifestFile =
     typeof config.writeManifestFile === 'undefined' ? defaults.writeManifestFile : config.writeManifestFile
 
+  const nextBinOrig = await resolveBinAsync('next')
+
   const nextBin = resolve(
     config.rootFolder,
-    config.interceptNextErrors ? defaults.nextBinPatched : defaults.nextBin,
+    config.interceptNextErrors ? defaults.nextBinPatched : nextBinOrig,
   )
 
   return ciLog(

packages/server/src/dev.ts

@@ -12,7 +12,7 @@ export async function dev(config: ServerConfig) {
     manifestPath,
     writeManifestFile,
     includePaths,
-  } = enhance({
+  } = await enhance({
     ...config,
     interceptNextErrors: true,
   })

packages/server/src/prod.ts

@@ -3,7 +3,7 @@ import {nextStart} from './next-utils'
 import {build} from './build'
 
 export async function prod(config: ServerConfig) {
-  const {rootFolder, nextBin} = enhance(config)
+  const {rootFolder, nextBin} = await enhance(config)
   await build(config)
   await nextStart(nextBin, rootFolder)
 }

packages/server/src/resolve-bin-async.ts

@@ -0,0 +1,12 @@
+import resolveBin from 'resolve-bin'
+
+export function resolveBinAsync(pkg: string) {
+  return new Promise<string>((resolve, reject) => {
+    resolveBin(pkg, (err, bin) => {
+      if (err) {
+        reject(err)
+      }
+      resolve(bin)
+    })
+  })
+}

packages/server/src/resolve-bin.d.ts

@@ -0,0 +1,5 @@
+declare module 'resolve-bin' {
+  type Cb = (err: Error, bin: string) => void
+  type Options = {executable?: boolean}
+  export default function resolveBin(mod: string, opts: Cb | Options, callback?: Cb): void
+}

packages/server/src/synchronizer/index.ts

@@ -1,6 +1,7 @@
 import {unlink} from './unlink'
 import {dest} from 'vinyl-fs'
-import {transformPage} from './transform-page'
+import pagesFolder from './rules/pages-folder'
+import rpc from './rules/rpc'
 import {Manifest, createManifestFile, setManifestEntry} from './manifest'
 import {watch} from './watch'
 import {FSWatcher} from 'chokidar'
@@ -10,6 +11,8 @@ import File from 'vinyl'
 import fg from 'fast-glob'
 import {remove, pathExists, ensureDir} from 'fs-extra'
 import {ciLog} from '../ciLog'
+import {runRule} from './rules-runner'
+import through from 'through2'
 
 type SynchronizeFilesInput = {
   src: string
@@ -34,13 +37,20 @@ async function clean(path: string) {
   return await ensureDir(path)
 }
 
-function countStream(stream: NodeJS.WritableStream, cb: (count: number) => void) {
+const countStream = (cb: (count: number) => void) => {
   let count = 0
-  return stream.on('data', () => {
+  return through.obj((_, __, next) => {
     cb(++count)
+    next()
   })
 }
 
+// TODO: handle files possibly corrupted out of sync
+//          * how can I know that an entry is out of sync?
+//            * add stat info modified date in the manifest
+//            * stat the entry for modified date ahead of time
+//            * if the dates are different then the entry is invalid and should be waited on
+
 export async function synchronizeFiles({
   dest: destPath,
   src: srcPath,
@@ -57,45 +67,42 @@ export async function synchronizeFiles({
     cwd: srcPath,
   }
 
-  // TODO: handle files possibly corrupted out of sync
-  //          * how can I know that an entry is out of sync?
-  //            * add stat info modified date in the manifest
-  //            * stat the entry for modified date ahead of time
-  //            * if the dates are different then the entry is invalid and should be waited on
-
   const entries = fg.sync(includePaths, {ignore: options.ignored, cwd: options.cwd})
   const manifest = Manifest.create()
-  const {stream, watcher} = watch(includePaths, options)
+  const {stream: watchStream, watcher} = watch(includePaths, options)
+
+  await clean(destPath)
 
-  const createStream = () =>
+  return await new Promise((resolve, reject) => {
     pipeline(
-      stream,
-      transformPage({
-        sourceFolder: srcPath,
-        appFolder: 'app',
-        folderName: 'routes',
-      }),
+      watchStream,
+
+      // Rules
+      runRule(pagesFolder({srcPath})),
+      runRule(rpc({srcPath})),
+
+      // File sync
       gulpIf(isUnlinkFile, unlink(destPath), dest(destPath)),
+
+      // Maintain build manifest
       setManifestEntry(manifest),
       createManifestFile(manifest, manifestPath),
       gulpIf(writeManifestFile, dest(srcPath)),
-    )
-
-  await clean(destPath)
+      countStream((count) => {
+        if (count >= entries.length) {
+          ciLog('Stream files have been created. Here is a manifest.', manifest.toObject())
 
-  return await new Promise(resolve => {
-    // TODO: add timeout/error?
-    countStream(createStream(), count => {
-      if (count >= entries.length) {
-        ciLog('Stream files have been created. Here is a manifest.', manifest.toObject())
-
-        resolve({
-          stream,
-          watcher,
-          manifest,
-        })
-      }
-    })
+          resolve({
+            stream: watchStream,
+            watcher,
+            manifest,
+          })
+        }
+      }),
+      (err) => {
+        reject(err)
+      },
+    )
   })
 }