theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: remove __BUNLDER__ flag so that HMR is available for all builds

Browse Source
This commit is contained in:
Evan You 2020-04-20 00:34:53 -04:00
parent fa40d1ef3a
commit 19223f5462
8 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jest.config.js
View File

@ -5,7 +5,6 @@ module.exports = {
__TEST__: true, __TEST__: true,
__VERSION__: require('./package.json').version, __VERSION__: require('./package.json').version,
__BROWSER__: false, __BROWSER__: false,
__BUNDLER__: true,
__RUNTIME_COMPILE__: true, __RUNTIME_COMPILE__: true,
__GLOBAL__: false, __GLOBAL__: false,
__NODE_JS__: true, __NODE_JS__: true,

1
packages/global.d.ts vendored
View File

@ -2,7 +2,6 @@
declare var __DEV__: boolean declare var __DEV__: boolean
declare var __TEST__: boolean declare var __TEST__: boolean
declare var __BROWSER__: boolean declare var __BROWSER__: boolean
declare var __BUNDLER__: boolean
declare var __RUNTIME_COMPILE__: boolean declare var __RUNTIME_COMPILE__: boolean
declare var __GLOBAL__: boolean declare var __GLOBAL__: boolean
declare var __NODE_JS__: boolean declare var __NODE_JS__: boolean

2
packages/runtime-core/src/apiCreateApp.ts
View File

@ -209,7 +209,7 @@ export function createAppAPI<HostElement>(
vnode.appContext = context vnode.appContext = context
// HMR root reload // HMR root reload
if (__BUNDLER__ && __DEV__) { if (__DEV__) {
context.reload = () => { context.reload = () => {
render(cloneVNode(vnode), rootContainer) render(cloneVNode(vnode), rootContainer)
} }

1
packages/runtime-core/src/componentRenderUtils.ts
View File

@ -213,7 +213,6 @@ export function shouldUpdateComponent(
// caused the child component's slots content to have changed, we need to // caused the child component's slots content to have changed, we need to
// force the child to update as well. // force the child to update as well.
if ( if (
__BUNDLER__ &&
__DEV__ && __DEV__ &&
(prevChildren || nextChildren) && (prevChildren || nextChildren) &&
parentComponent && parentComponent &&

2
packages/runtime-core/src/hmr.ts
View File

@ -16,7 +16,7 @@ export interface HMRRuntime {
// it easier to be used in toolings like vue-loader // it easier to be used in toolings like vue-loader
// Note: for a component to be eligible for HMR it also needs the __hmrId option // Note: for a component to be eligible for HMR it also needs the __hmrId option
// to be set so that its instances can be registered / removed. // to be set so that its instances can be registered / removed.
if (__BUNDLER__ && __DEV__) { if (__DEV__) {
const globalObject: any = const globalObject: any =
typeof global !== 'undefined' typeof global !== 'undefined'
? global ? global

10
packages/runtime-core/src/renderer.ts
View File

@ -64,8 +64,6 @@ import { createHydrationFunctions, RootHydrateFunction } from './hydration'
import { invokeDirectiveHook } from './directives' import { invokeDirectiveHook } from './directives'
import { startMeasure, endMeasure } from './profiling' import { startMeasure, endMeasure } from './profiling'
const __HMR__ = __BUNDLER__ && __DEV__
export interface Renderer<HostElement = any> { export interface Renderer<HostElement = any> {
render: RootRenderFunction<HostElement> render: RootRenderFunction<HostElement>
createApp: CreateAppFunction<HostElement> createApp: CreateAppFunction<HostElement>
@ -660,7 +658,7 @@ function baseCreateRenderer(
invokeDirectiveHook(n2, n1, parentComponent, 'beforeUpdate') invokeDirectiveHook(n2, n1, parentComponent, 'beforeUpdate')
} }
if (__HMR__ && parentComponent && parentComponent.renderUpdated) { if (__DEV__ && parentComponent && parentComponent.renderUpdated) {
// HMR updated, force full diff // HMR updated, force full diff
patchFlag = 0 patchFlag = 0
optimized = false optimized = false
@ -884,7 +882,7 @@ function baseCreateRenderer(
optimized = true optimized = true
} }
if (__HMR__ && parentComponent && parentComponent.renderUpdated) { if (__DEV__ && parentComponent && parentComponent.renderUpdated) {
// HMR updated, force full diff // HMR updated, force full diff
patchFlag = 0 patchFlag = 0
optimized = false optimized = false
@ -987,7 +985,7 @@ function baseCreateRenderer(
parentSuspense parentSuspense
)) ))
if (__HMR__ && instance.type.__hmrId) { if (__DEV__ && instance.type.__hmrId) {
registerHMR(instance) registerHMR(instance)
} }
@ -1807,7 +1805,7 @@ function baseCreateRenderer(
parentSuspense: SuspenseBoundary | null, parentSuspense: SuspenseBoundary | null,
doRemove?: boolean doRemove?: boolean
) => { ) => {
if (__HMR__ && instance.type.__hmrId) { if (__DEV__ && instance.type.__hmrId) {
unregisterHMR(instance) unregisterHMR(instance)
} }

1
packages/runtime-core/src/vnode.ts
View File

@ -200,7 +200,6 @@ export function isVNode(value: any): value is VNode {
export function isSameVNodeType(n1: VNode, n2: VNode): boolean { export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
if ( if (
__BUNDLER__ &&
__DEV__ && __DEV__ &&
n2.shapeFlag & ShapeFlags.COMPONENT && n2.shapeFlag & ShapeFlags.COMPONENT &&
(n2.type as Component).__hmrUpdated (n2.type as Component).__hmrUpdated

2
rollup.config.js
View File

@ -178,8 +178,6 @@ function createReplacePlugin(
__TEST__: false, __TEST__: false,
// If the build is expected to run directly in the browser (global / esm builds) // If the build is expected to run directly in the browser (global / esm builds)
__BROWSER__: isBrowserBuild, __BROWSER__: isBrowserBuild,
// is targeting bundlers?
__BUNDLER__: isBundlerESMBuild,
__GLOBAL__: isGlobalBuild, __GLOBAL__: isGlobalBuild,
// is targeting Node (SSR)? // is targeting Node (SSR)?
__NODE_JS__: isNodeBuild, __NODE_JS__: isNodeBuild,