workflow: adjust esm-bundler build file name

diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json
index 9b84d9f4e4adf726122503294f07147a538da25f..7d500b33fbbb4a6440d0b3a5c0eca28026fd0991 100644 (file)
--- a/packages/compiler-core/package.json
+++ b/packages/compiler-core/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/compiler-core",
   "main": "index.js",
-  "module": "dist/compiler-core.esm.js",
+  "module": "dist/compiler-core.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "repository": {
     "type": "git",
@@ -18,4 +18,4 @@
     "url": "https://github.com/vuejs/vue/issues"
   },
   "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler-core#readme"
-}
\ No newline at end of file
+}

diff --git a/packages/compiler-dom/package.json b/packages/compiler-dom/package.json
index b2bb68afc11fff0d6c02afe18509978ec8ef7a8b..d04e769fc1a676cebb615904f95997186a98839d 100644 (file)
--- a/packages/compiler-dom/package.json
+++ b/packages/compiler-dom/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/compiler-dom",
   "main": "index.js",
-  "module": "dist/compiler-dom.esm.js",
+  "module": "dist/compiler-dom.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "repository": {
     "type": "git",
@@ -18,4 +18,4 @@
     "url": "https://github.com/vuejs/vue/issues"
   },
   "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler-dom#readme"
-}
\ No newline at end of file
+}

diff --git a/packages/compiler-server/package.json b/packages/compiler-server/package.json
index b8c1e017869ed7eceb701b8bfafe1351be67c1dc..1e508dd7bce83a0762d5323991f481cbd6baf7a0 100644 (file)
--- a/packages/compiler-server/package.json
+++ b/packages/compiler-server/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/compiler-server",
   "main": "index.js",
-  "module": "dist/compiler-server.esm.js",
+  "module": "dist/compiler-server.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "repository": {
     "type": "git",
@@ -18,4 +18,4 @@
     "url": "https://github.com/vuejs/vue/issues"
   },
   "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler-server#readme"
-}
\ No newline at end of file
+}

diff --git a/packages/core/package.json b/packages/core/package.json
index 9d27e66cb7146f03ea5c832c8cce27076560fef8..f2c1803662ee7334c40f3c355cde279af4af6923 100644 (file)
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/core",
   "main": "index.js",
-  "module": "dist/core.esm.js",
+  "module": "dist/core.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "repository": {
     "type": "git",

diff --git a/packages/core/src/createRenderer.ts b/packages/core/src/createRenderer.ts
index ddae8cf435e7c554f307fe3a5816f29883a92b6c..7d5ccd63396b049e8a60f50954a15d88c83f667d 100644 (file)
--- a/packages/core/src/createRenderer.ts
+++ b/packages/core/src/createRenderer.ts
@@ -1283,7 +1283,7 @@ export function createRenderer(options: RendererOptions) {
 
   // API -----------------------------------------------------------------------
 
-  function render(vnode: VNode | null, container: RenderNode) {
+  function render(vnode: VNode | null, container: any) {
     const prevVNode = container.vnode
     if (vnode && vnode.el) {
       vnode = cloneVNode(vnode)

diff --git a/packages/core/src/h.ts b/packages/core/src/h.ts
index 9236fb5a0cceb1fe7dcecb2bfb008048f6c81fcf..be913246e1a241f79de472303b3aa7bfa92b4c1a 100644 (file)
--- a/packages/core/src/h.ts
+++ b/packages/core/src/h.ts
@@ -22,7 +22,7 @@ type ElementType =
   | typeof Portal
 
 export interface createElement {
-  (tag: ElementType, data: any, children: any): VNode
+  (tag: ElementType, data?: any, children?: any): VNode
   c: typeof createComponentVNode
   e: typeof createElementVNode
   t: typeof createTextVNode
@@ -30,7 +30,7 @@ export interface createElement {
   p: typeof createPortal
 }
 
-export const h = ((tag: ElementType, data: any, children: any): VNode => {
+export const h = ((tag: ElementType, data?: any, children?: any): VNode => {
   if (Array.isArray(data) || (data !== void 0 && typeof data !== 'object')) {
     children = data
     data = null

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index f37e98e324434b081db9bf4d23ba002047959e16..14fa9679e52c60205c8008948dd22b03b505d743 100644 (file)
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -4,23 +4,11 @@ export { cloneVNode, createPortal, createFragment } from './vdom'
 export { createRenderer } from './createRenderer'
 
 import { Component as InternalComponent, ComponentClass } from './component'
-
 // the public component constructor with proper type inference.
 export const Component = InternalComponent as ComponentClass
 
 // observer api
-export {
-  autorun,
-  stop,
-  observable,
-  immutable,
-  computed,
-  isObservable,
-  isImmutable,
-  markImmutable,
-  markNonReactive,
-  unwrap
-} from '@vue/observer'
+export * from '@vue/observer'
 
 // flags & types
 export { FunctionalComponent } from './component'

diff --git a/packages/observer/package.json b/packages/observer/package.json
index d5fa3f5e6ea262ef2e7eab88f183190932d02b74..8150a7cd2dfeaaf9e21fd1b4a0b555aa44282552 100644 (file)
--- a/packages/observer/package.json
+++ b/packages/observer/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/observer",
   "main": "index.js",
-  "module": "dist/observer.esm.js",
+  "module": "dist/observer.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "unpkg": "dist/observer.global.js",
   "repository": {

diff --git a/packages/renderer-dom/package.json b/packages/renderer-dom/package.json
index a379956b7d6d75bd009025536dc9b0224a30f43e..a45d035b9d2d6a93588a5d0491d33bb067336f78 100644 (file)
--- a/packages/renderer-dom/package.json
+++ b/packages/renderer-dom/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/renderer-dom",
   "main": "index.js",
-  "module": "dist/renderer-dom.esm.js",
+  "module": "dist/renderer-dom.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "unpkg": "dist/renderer-dom.global.js",
   "buildOptions": {

diff --git a/packages/renderer-dom/src/index.ts b/packages/renderer-dom/src/index.ts
index bb9e3ad68042acfd38f83978ee341351e017a978..423f9a1ea50b89f06f6be6629d106ddef89583e3 100644 (file)
--- a/packages/renderer-dom/src/index.ts
+++ b/packages/renderer-dom/src/index.ts
@@ -1,46 +1,23 @@
-import {
-  h,
-  cloneVNode,
-  createPortal,
-  Component,
-  createRenderer
-} from '@vue/core'
-
-import { queueJob, nextTick } from '@vue/scheduler'
+import { createRenderer, VNode } from '@vue/core'
+import { queueJob } from '@vue/scheduler'
 
 import { nodeOps } from './nodeOps'
 import { patchData } from './patchData'
 import { teardownVNode } from './teardownVNode'
 
-const { render } = createRenderer({
+const { render: _render } = createRenderer({
   queueJob,
   nodeOps,
   patchData,
   teardownVNode
 })
 
-// important: inline the definition for nextTick
-const publicNextTick = nextTick as (fn: Function) => Promise<void>
+type publicRender = (node: VNode | null, container: HTMLElement) => void
+export const render = _render as publicRender
 
-export {
-  h,
-  cloneVNode,
-  createPortal,
-  Component,
-  render,
-  publicNextTick as nextTick
-}
+// nextTick from scheduler
+export { nextTick } from '@vue/scheduler'
 
-// also expose observer API
-export {
-  autorun,
-  stop,
-  observable,
-  immutable,
-  computed,
-  isObservable,
-  isImmutable,
-  markImmutable,
-  markNonReactive,
-  unwrap
-} from '@vue/core'
+// re-export everything from core
+// h, Component, observer API, flags & types
+export * from '@vue/core'

diff --git a/packages/renderer-server/package.json b/packages/renderer-server/package.json
index 9c776548e9e2e49cc62558c2451f77136b8c18d2..2c1ee2565a2095e3f2c934b80e860db2728b997e 100644 (file)
--- a/packages/renderer-server/package.json
+++ b/packages/renderer-server/package.json
@@ -3,8 +3,10 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/renderer-server",
   "main": "index.js",
-  "module": "dist/renderer-server.esm.js",
   "typings": "dist/index.d.ts",
+  "buildOptions": {
+    "formats": ["cjs"]
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue.git"
@@ -18,4 +20,4 @@
     "url": "https://github.com/vuejs/vue/issues"
   },
   "homepage": "https://github.com/vuejs/vue/tree/dev/packages/renderer-server#readme"
-}
\ No newline at end of file
+}

diff --git a/packages/scheduler/package.json b/packages/scheduler/package.json
index b65d87c852552e5881bbbf12c63076b449a0ec02..6898c2ff238d56f9afc094944f5fbe1c71817f85 100644 (file)
--- a/packages/scheduler/package.json
+++ b/packages/scheduler/package.json
@@ -3,7 +3,7 @@
   "version": "3.0.0-alpha.1",
   "description": "@vue/scheduler",
   "main": "index.js",
-  "module": "dist/scheduler.esm.js",
+  "module": "dist/scheduler.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "repository": {
     "type": "git",

diff --git a/rollup.config.js b/rollup.config.js
index 99d8e5ce8f989a3cb6c5210864f92c3b6b947e6d..6e4690543873eebf4dd0a175834095d1e84a702a 100644 (file)
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -18,7 +18,10 @@ const packageOptions = pkg.buildOptions || {}
 // build aliases dynamically
 const aliasOptions = { resolve: ['.ts'] }
 fs.readdirSync(packagesDir).forEach(dir => {
-  if (fs.statSync(path.resolve(packagesDir, dir)).isDirectory()) {
+  if (
+    dir !== 'vue' &&
+    fs.statSync(path.resolve(packagesDir, dir)).isDirectory()
+  ) {
     aliasOptions[`@vue/${dir}`] = path.resolve(packagesDir, `${dir}/src/index`)
   }
 })
@@ -71,6 +74,7 @@ function createConfig(output, plugins = []) {
   const isGlobalBuild = /\.global(\.prod)?\.js$/.test(output.file)
   const isBunlderESMBuild = /\.esm\.js$/.test(output.file)
   const isBrowserESMBuild = /esm-browser(\.prod)?\.js$/.test(output.file)
+  const isCompat = /dist\/vue\./.test(output.file)
 
   if (isGlobalBuild) {
     output.name = packageOptions.name
@@ -100,7 +104,7 @@ function createConfig(output, plugins = []) {
     plugins: [
       tsPlugin,
       aliasPlugin,
-      createReplacePlugin(isProductionBuild, isBunlderESMBuild),
+      createReplacePlugin(isProductionBuild, isBunlderESMBuild, isCompat),
       ...plugins
     ],
     output,
@@ -112,7 +116,7 @@ function createConfig(output, plugins = []) {
   }
 }
 
-function createReplacePlugin(isProduction, isBunlderESMBuild) {
+function createReplacePlugin(isProduction, isBunlderESMBuild, isCompat) {
   return replace({
     __DEV__: isBunlderESMBuild
       ? // preserve to be handled by bundlers
@@ -120,7 +124,7 @@ function createReplacePlugin(isProduction, isBunlderESMBuild) {
       : // hard coded dev/prod builds
         !isProduction,
     // compatibility builds
-    __COMPAT__: !!process.env.COMPAT
+    __COMPAT__: !!packageOptions.compat
   })
 }
 

diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
index 21098b3fb44cab571b320b038a462154c8127f2c..021aa40a459c425b617c16ea013ac820b9d6ed5c 100644 (file)
--- a/scripts/bootstrap.js
+++ b/scripts/bootstrap.js
@@ -21,7 +21,7 @@ files.forEach(shortName => {
       version: baseVersion,
       description: name,
       main: 'index.js',
-      module: `dist/${shortName}.esm.js`,
+      module: `dist/${shortName}.esm-bundler.js`,
       typings: 'dist/index.d.ts',
       repository: {
         type: 'git',

diff --git a/tsconfig.json b/tsconfig.json
index cc1cedfa7ca4c557a37dc235fb837ef9f3bd72a0..3a20339745db745c54cc0ea5fa09a906b1ba3039 100644 (file)
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,7 +21,12 @@
     "paths": {
       "@vue/core": ["packages/core/src"],
       "@vue/observer": ["packages/observer/src"],
-      "@vue/scheduler": ["packages/scheduler/src"]
+      "@vue/scheduler": ["packages/scheduler/src"],
+      "@vue/renderer-dom": ["packages/renderer-dom/src"],
+      "@vue/renderer-server": ["packages/renderer-server/src"],
+      "@vue/compiler-core": ["packages/compiler-core/src"],
+      "@vue/compiler-dom": ["packages/compiler-dom/src"],
+      "@vue/compiler-server": ["packages/compiler-server/src"]
     }
   },
   "include": [