Skip to content

Commit f3a1698

Browse files
committed
Merge pull request vuejs#306 from kewah/master
ViewModel.require with component@1.0.0
2 parents c853d21 + 93f7b74 commit f3a1698

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/main.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ var config = require('./config'),
22
ViewModel = require('./viewmodel'),
33
utils = require('./utils'),
44
makeHash = utils.hash,
5-
assetTypes = ['directive', 'filter', 'partial', 'effect', 'component']
6-
7-
// require these so Browserify can catch them
8-
// so they can be used in Vue.require
9-
require('./observer')
10-
require('./transition')
5+
assetTypes = ['directive', 'filter', 'partial', 'effect', 'component'],
6+
// Internal modules that are exposed for plugins
7+
pluginAPI = {
8+
utils: utils,
9+
config: config,
10+
transition: require('./transition'),
11+
observer: require('./observer')
12+
}
1113

1214
ViewModel.options = config.globalAssets = {
1315
directives : require('./directives'),
@@ -83,8 +85,8 @@ ViewModel.use = function (plugin) {
8385
/**
8486
* Expose internal modules for plugins
8587
*/
86-
ViewModel.require = function (path) {
87-
return require('./' + path)
88+
ViewModel.require = function (module) {
89+
return pluginAPI[module]
8890
}
8991

9092
ViewModel.extend = extend

0 commit comments

Comments
 (0)