Use require.context for hot reload of ream entry

ream · Jun 5, 2018 · 5688c70 · 5688c70
1 parent bd4ee22
commit 5688c70
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/app/create-app-template.js b/app/create-app-template.js
@@ -15,15 +15,9 @@ const pathToId = file => {
   return path.basename(slash(file)).replace(/\W/g, '_')
 }
 
-module.exports = api => {
-  let entryExists = false
-  if (api.options.entry) {
-    try {
-      require.resolve(api.resolveBaseDir(api.options.entry))
-      entryExists = true
-    } catch (err) {}
-  }
+const escapeRegexp = s => s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
 
+module.exports = api => {
   const enhanceAppFiles = [...api.enhanceAppFiles].map((filepath, index) => ({
     id: `${pathToId(filepath)}_${index}`,
     filepath: slash(filepath)
@@ -33,7 +27,7 @@ module.exports = api => {
   import Vue from 'vue'
   import Meta from 'vue-meta'
   import Router from 'vue-router'
-  import { getRequireDefault } from '#app/utils'
+  import { getRequireDefault, importContextModule } from '#app/utils'
 
   Vue.config.productionTip = false
 
@@ -47,8 +41,19 @@ module.exports = api => {
   })
 
   const _entry = ${
-    entryExists ? `getRequireDefault(require('#app-entry'))` : `{}`
-  }
+    api.options.entry
+      ? `
+    getRequireDefault(
+      importContextModule(
+        require.context(
+          ${JSON.stringify(api.baseDir)},
+          false,
+          /^${escapeRegexp('./' + api.options.entry)}$/
+        ),
+        ${JSON.stringify('./' + api.options.entry)}
+      )`
+      : `undefined`
+  }) || {}
 
   const enhanceApp = getRequireDefault(require('#app/enhance-app'))
 

diff --git a/app/utils.js b/app/utils.js
@@ -8,6 +8,18 @@ export const getRequireDefault = obj => {
   return obj && obj.hasOwnProperty('default') ? obj.default : obj
 }
 
+export const importContextModule = (context, path) => {
+  let moduleExists = false
+  try {
+    context.resolve(path)
+    moduleExists = true
+  } catch (err) {}
+
+  if (moduleExists) {
+    return context(path)
+  }
+}
+
 export const setInitialData = vm => {
   const { getInitialData, initialDataKey } = vm.$options
 

diff --git a/lib/webpack/webpack.config.base.js b/lib/webpack/webpack.config.base.js
@@ -20,13 +20,6 @@ const resolveModules = config => {
 }
 
 module.exports = (api, config, type) => {
-  if (api.options.entry) {
-    config.resolve.alias.set(
-      '#app-entry$',
-      api.resolveBaseDir(api.options.entry)
-    )
-  }
-
   config.resolve.alias
     .set('#create-app$', api.resolveOutDir('create-app.js'))
     .set('#base', api.baseDir)