refactor: update config type

Author: ije

server/app.ts

@@ -14,17 +14,15 @@ import {
   buildChecksum,
   ImportMap,
   parseExportNames,
+  ReactResolve,
   SourceType,
   transform,
   TransformOptions
 } from '../compiler/mod.ts'
 import { EventEmitter } from '../framework/core/events.ts'
 import { moduleExts, toPagePath, trimModuleExt } from '../framework/core/module.ts'
 import { RouteModule, Routing } from '../framework/core/routing.ts'
-import {
-  defaultReactEsmShBuildVersion, defaultReactVersion,
-  minDenoVersion
-} from '../shared/constants.ts'
+import { minDenoVersion } from '../shared/constants.ts'
 import {
   ensureTextFile,
   existsDirSync,
@@ -74,7 +72,7 @@ type TransformFn = (url: string, code: string) => string
 export class Application implements ServerApplication {
   readonly workingDir: string
   readonly mode: 'development' | 'production'
-  readonly config: Required<Config>
+  readonly config: Required<Config & { react: ReactResolve }>
   readonly importMap: ImportMap
   readonly ready: Promise<void>
 
@@ -145,10 +143,18 @@ export class Application implements ServerApplication {
 
     const alephPkgUri = getAlephPkgUri()
     const buildManifestFile = join(this.buildDir, 'build.manifest.json')
-    const configChecksum = computeHash(JSON.stringify({
-      ...this.sharedCompileOptions,
+    const plugins = computeHash(JSON.stringify({
       plugins: this.config.plugins.filter(isLoaderPlugin).map(({ name }) => name),
-      postcssPlugins: this.config.postcss.plugins.map(p => p.toString())
+      postcssPlugins: this.config.postcss.plugins.map(p => {
+        if (util.isString(p)) {
+          return p
+        } else if (util.isArray(p)) {
+          return p[0] + JSON.stringify(p[1])
+        } else {
+          p.toString()
+        }
+      }),
+      react: this.config.react,
     }, (key: string, value: any) => {
       if (key === 'inlineStylePreprocess') {
         return void 0
@@ -163,7 +169,7 @@ export class Application implements ServerApplication {
           typeof v !== 'object' ||
           v === null ||
           v.compiler !== buildChecksum ||
-          v.configChecksum !== configChecksum
+          v.plugins !== plugins
         )
       } catch (e) { }
     }
@@ -182,7 +188,7 @@ export class Application implements ServerApplication {
         aleph: VERSION,
         deno: Deno.version.deno,
         compiler: buildChecksum,
-        configChecksum,
+        plugins,
       }, undefined, 2))
     }
 
@@ -696,8 +702,7 @@ export class Application implements ServerApplication {
     return {
       importMap: this.importMap,
       alephPkgUri: getAlephPkgUri(),
-      reactVersion: defaultReactVersion,
-      fixedReactEsmShBuildVersion: defaultReactEsmShBuildVersion,
+      react: this.config.react,
       isDev: this.isDev,
       inlineStylePreprocess: async (key: string, type: string, tpl: string) => {
         if (type !== 'css') {

server/config.ts

@@ -1,13 +1,13 @@
 import { join } from 'https://deno.land/[email protected]/path/mod.ts'
-import type { ImportMap } from '../compiler/mod.ts'
+import type { ImportMap, ReactResolve } from '../compiler/mod.ts'
 import { defaultReactVersion } from '../shared/constants.ts'
 import { existsFileSync, existsDirSync } from '../shared/fs.ts'
 import log from '../shared/log.ts'
 import util from '../shared/util.ts'
 import type { Config, PostCSSPlugin } from '../types.ts'
 import { getAlephPkgUri, reLocaleID } from './helper.ts'
 
-export const defaultConfig: Readonly<Required<Config>> = {
+export const defaultConfig: Readonly<Required<Config> & { react: ReactResolve }> = {
   framework: 'react',
   buildTarget: 'es2015',
   baseUrl: '/',
@@ -21,6 +21,10 @@ export const defaultConfig: Readonly<Required<Config>> = {
   postcss: { plugins: ['autoprefixer'] },
   headers: {},
   env: {},
+  react: {
+    version: defaultReactVersion,
+    esmShBuildVersion: 34,
+  }
 }
 
 /** load config from `aleph.config.(ts|js|json)` */

shared/constants.ts

@@ -1,3 +1,2 @@
 export const minDenoVersion = '1.8.0'
 export const defaultReactVersion = '17.0.2'
-export const defaultReactEsmShBuildVersion = 33