restructure: remove entires directory

yyx990803 · yyx990803 · commit 7b8b0e48f7b3 · 2017-04-18T12:38:27.000+08:00
diff --git a/build/alias.js b/build/alias.js
@@ -1,7 +1,7 @@
 const path = require('path')
 
 module.exports = {
-  vue: path.resolve(__dirname, '../src/entries/web-runtime-with-compiler'),
+  vue: path.resolve(__dirname, '../src/platforms/web/runtime-with-compiler'),
   compiler: path.resolve(__dirname, '../src/compiler'),
   core: path.resolve(__dirname, '../src/core'),
   shared: path.resolve(__dirname, '../src/shared'),
diff --git a/build/config.js b/build/config.js
@@ -22,19 +22,27 @@ const weexFactoryPlugin = {
   }
 }
 
-const resolve = p => path.resolve(__dirname, '../' + p)
+const aliases = require('./alias')
+const resolve = p => {
+  const base = p.split('/')[0]
+  if (aliases[base]) {
+    return path.resolve(aliases[base], p.slice(base.length + 1))
+  } else {
+    return path.resolve(__dirname, '../', p)
+  }
+}
 
 const builds = {
   // Runtime only (CommonJS). Used by bundlers e.g. Webpack & Browserify
   'web-runtime-cjs': {
-    entry: resolve('src/entries/web-runtime.js'),
+    entry: resolve('web/runtime.js'),
     dest: resolve('dist/vue.runtime.common.js'),
     format: 'cjs',
     banner
   },
   // Runtime+compiler CommonJS build (CommonJS)
   'web-full-cjs': {
-    entry: resolve('src/entries/web-runtime-with-compiler.js'),
+    entry: resolve('web/runtime-with-compiler.js'),
     dest: resolve('dist/vue.common.js'),
     format: 'cjs',
     alias: { he: './entity-decoder' },
@@ -43,38 +51,38 @@ const builds = {
   // Runtime only (ES Modules). Used by bundlers that support ES Modules,
   // e.g. Rollup & Webpack 2
   'web-runtime-esm': {
-    entry: resolve('src/entries/web-runtime.js'),
+    entry: resolve('web/runtime.js'),
     dest: resolve('dist/vue.runtime.esm.js'),
     format: 'es',
     banner
   },
   // Runtime+compiler CommonJS build (ES Modules)
   'web-full-esm': {
-    entry: resolve('src/entries/web-runtime-with-compiler.js'),
+    entry: resolve('web/runtime-with-compiler.js'),
     dest: resolve('dist/vue.esm.js'),
     format: 'es',
     alias: { he: './entity-decoder' },
     banner
   },
   // runtime-only build (Browser)
   'web-runtime-dev': {
-    entry: resolve('src/entries/web-runtime.js'),
+    entry: resolve('web/runtime.js'),
     dest: resolve('dist/vue.runtime.js'),
     format: 'umd',
     env: 'development',
     banner
   },
   // runtime-only production build (Browser)
   'web-runtime-prod': {
-    entry: resolve('src/entries/web-runtime.js'),
+    entry: resolve('web/runtime.js'),
     dest: resolve('dist/vue.runtime.min.js'),
     format: 'umd',
     env: 'production',
     banner
   },
   // Runtime+compiler development build (Browser)
   'web-full-dev': {
-    entry: resolve('src/entries/web-runtime-with-compiler.js'),
+    entry: resolve('web/runtime-with-compiler.js'),
     dest: resolve('dist/vue.js'),
     format: 'umd',
     env: 'development',
@@ -83,7 +91,7 @@ const builds = {
   },
   // Runtime+compiler production build  (Browser)
   'web-full-prod': {
-    entry: resolve('src/entries/web-runtime-with-compiler.js'),
+    entry: resolve('web/runtime-with-compiler.js'),
     dest: resolve('dist/vue.min.js'),
     format: 'umd',
     env: 'production',
@@ -92,49 +100,49 @@ const builds = {
   },
   // Web compiler (CommonJS).
   'web-compiler': {
-    entry: resolve('src/entries/web-compiler.js'),
+    entry: resolve('web/compiler.js'),
     dest: resolve('packages/vue-template-compiler/build.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/vue-template-compiler/package.json').dependencies)
   },
   // Web server renderer (CommonJS).
   'web-server-renderer': {
-    entry: resolve('src/entries/web-server-renderer.js'),
+    entry: resolve('server/index.js'),
     dest: resolve('packages/vue-server-renderer/build.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
   },
   'web-server-renderer-webpack-server-plugin': {
-    entry: resolve('src/server/webpack-plugin/server.js'),
+    entry: resolve('server/webpack-plugin/server.js'),
     dest: resolve('packages/vue-server-renderer/server-plugin.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
   },
   'web-server-renderer-webpack-client-plugin': {
-    entry: resolve('src/server/webpack-plugin/client.js'),
+    entry: resolve('server/webpack-plugin/client.js'),
     dest: resolve('packages/vue-server-renderer/client-plugin.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/vue-server-renderer/package.json').dependencies)
   },
   // Weex runtime factory
   'weex-factory': {
     weex: true,
-    entry: resolve('src/entries/weex-factory.js'),
+    entry: resolve('weex/runtime-factory.js'),
     dest: resolve('packages/weex-vue-framework/factory.js'),
     format: 'cjs',
     plugins: [weexFactoryPlugin]
   },
   // Weex runtime framework (CommonJS).
   'weex-framework': {
     weex: true,
-    entry: resolve('src/entries/weex-framework.js'),
+    entry: resolve('weex/framework.js'),
     dest: resolve('packages/weex-vue-framework/index.js'),
     format: 'cjs'
   },
   // Weex compiler (CommonJS). Used by Weex's Webpack loader.
   'weex-compiler': {
     weex: true,
-    entry: resolve('src/entries/weex-compiler.js'),
+    entry: resolve('weex/compiler.js'),
     dest: resolve('packages/weex-template-compiler/build.js'),
     format: 'cjs',
     external: Object.keys(require('../packages/weex-template-compiler/package.json').dependencies)
@@ -157,7 +165,7 @@ function genConfig (opts) {
       }),
       flow(),
       buble(),
-      alias(Object.assign({}, require('./alias'), opts.alias))
+      alias(Object.assign({}, aliases, opts.alias))
     ].concat(opts.plugins || [])
   }
 
diff --git a/src/entries/web-compiler.js b/src/entries/web-compiler.js
diff --git a/src/entries/weex-framework.js b/src/entries/weex-framework.js
diff --git a/src/platforms/web/compiler.js b/src/platforms/web/compiler.js
@@ -0,0 +1,4 @@
+/* @flow */
+
+export { parseComponent } from 'sfc/parser'
+export { compile, compileToFunctions } from './compiler/index'
diff --git a/src/platforms/web/runtime-with-compiler.js b/src/platforms/web/runtime-with-compiler.js
@@ -1,12 +1,13 @@
 /* @flow */
 
-import Vue from './web-runtime'
 import config from 'core/config'
-import { query } from 'web/util/index'
 import { warn, cached } from 'core/util/index'
 import { mark, measure } from 'core/util/perf'
-import { shouldDecodeNewlines } from 'web/util/compat'
-import { compileToFunctions } from 'web/compiler/index'
+
+import Vue from './runtime/index'
+import { query } from './util/index'
+import { shouldDecodeNewlines } from './util/compat'
+import { compileToFunctions } from './compiler/index'
 
 const idToTemplate = cached(id => {
   const el = query(id)
diff --git a/src/platforms/web/runtime.js b/src/platforms/web/runtime.js
@@ -0,0 +1,5 @@
+/* @flow */
+
+import Vue from './runtime/index'
+
+export default Vue
diff --git a/src/platforms/web/runtime/index.js b/src/platforms/web/runtime/index.js
@@ -2,12 +2,9 @@
 
 import Vue from 'core/index'
 import config from 'core/config'
-import { patch } from 'web/runtime/patch'
 import { extend, noop } from 'shared/util'
 import { mountComponent } from 'core/instance/lifecycle'
 import { devtools, inBrowser, isChrome } from 'core/util/index'
-import platformDirectives from 'web/runtime/directives/index'
-import platformComponents from 'web/runtime/components/index'
 
 import {
   query,
@@ -18,6 +15,10 @@ import {
   isUnknownElement
 } from 'web/util/index'
 
+import { patch } from './patch'
+import platformDirectives from './directives/index'
+import platformComponents from './components/index'
+
 // install platform specific utils
 Vue.config.mustUseProp = mustUseProp
 Vue.config.isReservedTag = isReservedTag
diff --git a/src/platforms/weex/compiler.js b/src/platforms/weex/compiler.js
@@ -1,3 +1 @@
-/* @flow */
-
 export { compile } from 'weex/compiler/index'
diff --git a/src/platforms/weex/runtime-factory.js b/src/platforms/weex/runtime-factory.js
@@ -1,6 +1,6 @@
 // this entry is built and wrapped with a factory function
 // used to generate a fresh copy of Vue for every Weex instance.
 
-import Vue from 'weex/runtime/index'
+import Vue from './runtime/index'
 
 exports.Vue = Vue
diff --git a/src/server/index.js b/src/server/index.js
@@ -2,11 +2,12 @@
 
 process.env.VUE_ENV = 'server'
 
-import { createRenderer as _createRenderer } from 'server/create-renderer'
-import { createBundleRendererCreator } from 'server/bundle-renderer/create-bundle-renderer'
-import { isUnaryTag, canBeLeftOpenTag } from 'web/compiler/util'
 import modules from 'web/server/modules/index'
 import baseDirectives from 'web/server/directives/index'
+import { isUnaryTag, canBeLeftOpenTag } from 'web/compiler/util'
+
+import { createRenderer as _createRenderer } from './create-renderer'
+import { createBundleRendererCreator } from './bundle-renderer/create-bundle-renderer'
 
 export function createRenderer (options?: Object = {}): {
   renderToString: Function,
diff --git a/test/unit/features/options/render.spec.js b/test/unit/features/options/render.spec.js
@@ -1,4 +1,4 @@
-import Vue from 'entries/web-runtime'
+import Vue from 'vue'
 
 describe('Options render', () => {
   it('basic usage', () => {
diff --git a/test/unit/modules/compiler/compiler-options.spec.js b/test/unit/modules/compiler/compiler-options.spec.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { compile } from 'entries/web-compiler'
+import { compile } from 'web/compiler'
 import { getAndRemoveAttr } from 'compiler/helpers'
 
 describe('compile options', () => {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-/* @flow */`
`2`		`-`
`3`	`1`	`export { compile } from 'weex/compiler/index'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Vue from 'entries/web-runtime'`
	`1`	`+import Vue from 'vue'`
`2`	`2`
`3`	`3`	`describe('Options render', () => {`
`4`	`4`	`it('basic usage', () => {`