Explorar o código

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

Evan You %!s(int64=6) %!d(string=hai) anos
pai
achega
19223f5462

+ 0 - 1
jest.config.js

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

+ 0 - 1
packages/global.d.ts

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

+ 1 - 1
packages/runtime-core/src/apiCreateApp.ts

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

+ 0 - 1
packages/runtime-core/src/componentRenderUtils.ts

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

+ 1 - 1
packages/runtime-core/src/hmr.ts

@@ -16,7 +16,7 @@ export interface HMRRuntime {
 // 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
 // to be set so that its instances can be registered / removed.
-if (__BUNDLER__ && __DEV__) {
+if (__DEV__) {
   const globalObject: any =
     typeof global !== 'undefined'
       ? global

+ 4 - 6
packages/runtime-core/src/renderer.ts

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

+ 0 - 1
packages/runtime-core/src/vnode.ts

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

+ 0 - 2
rollup.config.js

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