diff --git a/package.json b/package.json
index cfd53e125..230263bfe 100644
--- a/package.json
+++ b/package.json
@@ -57,14 +57,15 @@
"babel-core": "^6.8.0",
"babel-loader": "^6.2.4",
"babel-plugin-transform-runtime": "^6.8.0",
- "babel-runtime": "^6.0.0",
"babel-preset-es2015": "^6.6.0",
+ "babel-runtime": "^6.0.0",
"chai": "^3.0.0",
"coffee-loader": "^0.7.2",
"coffee-script": "^1.10.0",
"css-loader": "^0.23.1",
"eslint": "^2.9.0",
"eslint-config-vue": "^1.0.0",
+ "expose-loader": "^0.7.1",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5",
"inject-loader": "^2.0.1",
diff --git a/test/fixtures/autoprefix.js b/test/fixtures/autoprefix.js
deleted file mode 100644
index a5e9680a8..000000000
--- a/test/fixtures/autoprefix.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./autoprefix.vue')
diff --git a/test/fixtures/basic.js b/test/fixtures/basic.js
deleted file mode 100644
index b5a46fc5f..000000000
--- a/test/fixtures/basic.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./basic.vue')
diff --git a/test/fixtures/extract-css.js b/test/fixtures/extract-css.js
deleted file mode 100644
index ce602cf28..000000000
--- a/test/fixtures/extract-css.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./extract-css.vue')
diff --git a/test/fixtures/media-query.js b/test/fixtures/media-query.js
deleted file mode 100644
index 1a292f332..000000000
--- a/test/fixtures/media-query.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./media-query.vue')
diff --git a/test/fixtures/pre.js b/test/fixtures/pre.js
deleted file mode 100644
index 2238f374f..000000000
--- a/test/fixtures/pre.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./pre.vue')
diff --git a/test/fixtures/resolve.js b/test/fixtures/resolve.js
deleted file mode 100644
index 744bc2761..000000000
--- a/test/fixtures/resolve.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./resolve.vue')
diff --git a/test/fixtures/scoped-css.js b/test/fixtures/scoped-css.js
deleted file mode 100644
index 607e0d58f..000000000
--- a/test/fixtures/scoped-css.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./scoped-css.vue')
diff --git a/test/fixtures/script-import-entry.js b/test/fixtures/script-import-entry.js
deleted file mode 100644
index 5c1491e49..000000000
--- a/test/fixtures/script-import-entry.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./script-import.vue')
diff --git a/test/fixtures/template-import.js b/test/fixtures/template-import.js
deleted file mode 100644
index 9f39ecaea..000000000
--- a/test/fixtures/template-import.js
+++ /dev/null
@@ -1 +0,0 @@
-window.testModule = require('./template-import.vue')
diff --git a/test/test.js b/test/test.js
index 0e19a5d17..959ab05d5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -12,7 +12,7 @@ describe('vue-loader', function () {
var testHTML = ''
var outputDir = path.resolve(__dirname, './output')
- var loaderPath = path.resolve(__dirname, '../')
+ var loaderPath = 'expose?vueModule!'+path.resolve(__dirname, '../')
var globalConfig = {
output: {
path: outputDir,
@@ -66,9 +66,9 @@ describe('vue-loader', function () {
it('basic', function (done) {
test({
- entry: './test/fixtures/basic.js'
+ entry: './test/fixtures/basic.vue'
}, function (window) {
- var module = window.testModule
+ var module = window.vueModule
expect(module.template).to.contain('{{msg}}
')
expect(module.data().msg).to.contain('Hello from Component A!')
var style = window.document.querySelector('style').textContent
@@ -79,9 +79,9 @@ describe('vue-loader', function () {
it('pre-processors', function (done) {
test({
- entry: './test/fixtures/pre.js'
+ entry: './test/fixtures/pre.vue'
}, function (window) {
- var module = window.testModule
+ var module = window.vueModule
expect(module.template).to.contain(
'This is the app
' +
'' +
@@ -96,9 +96,9 @@ describe('vue-loader', function () {
it('scoped style', function (done) {
test({
- entry: './test/fixtures/scoped-css.js'
+ entry: './test/fixtures/scoped-css.vue'
}, function (window) {
- var module = window.testModule
+ var module = window.vueModule
var id = '_v-' + hash(require.resolve('./fixtures/scoped-css.vue'))
expect(module.template).to.contain(
'hi
\n' +
@@ -129,9 +129,9 @@ describe('vue-loader', function () {
it('template import', function (done) {
test({
- entry: './test/fixtures/template-import.js'
+ entry: './test/fixtures/template-import.vue'
}, function (window) {
- var module = window.testModule
+ var module = window.vueModule
expect(module.template).to.contain('hello
')
done()
})
@@ -139,9 +139,9 @@ describe('vue-loader', function () {
it('script import', function (done) {
test({
- entry: './test/fixtures/script-import-entry.js'
+ entry: './test/fixtures/script-import.vue'
}, function (window) {
- var module = window.testModule
+ var module = window.vueModule
expect(module.data().msg).to.contain('Hello from Component A!')
done()
})
@@ -149,7 +149,7 @@ describe('vue-loader', function () {
it('source map', function (done) {
var config = Object.assign({}, globalConfig, {
- entry: './test/fixtures/basic.js',
+ entry: './test/fixtures/basic.vue',
devtool: 'source-map'
})
webpack(config, function (err) {
@@ -181,7 +181,7 @@ describe('vue-loader', function () {
it('autoprefix', function (done) {
test({
- entry: './test/fixtures/autoprefix.js'
+ entry: './test/fixtures/autoprefix.vue'
}, function (window) {
var style = window.document.querySelector('style').textContent
expect(style).to.contain('body {\n -webkit-transform: scale(1);\n transform: scale(1);\n}')
@@ -191,7 +191,7 @@ describe('vue-loader', function () {
it('media-query', function (done) {
test({
- entry: './test/fixtures/media-query.js'
+ entry: './test/fixtures/media-query.vue'
}, function (window) {
var style = window.document.querySelector('style').textContent
var id = '_v-' + hash(require.resolve('./fixtures/media-query.vue'))
@@ -202,7 +202,7 @@ describe('vue-loader', function () {
it('extract CSS', function (done) {
webpack(Object.assign({}, globalConfig, {
- entry: './test/fixtures/extract-css.js',
+ entry: './test/fixtures/extract-css.vue',
vue: {
loaders: {
css: ExtractTextPlugin.extract('css'),
@@ -238,7 +238,7 @@ describe('vue-loader', function () {
it('translates relative URLs and respects resolve alias', function (done) {
test({
- entry: './test/fixtures/resolve.js',
+ entry: './test/fixtures/resolve.vue',
resolve: {
alias: {
fixtures: path.resolve(__dirname, 'fixtures')
@@ -251,7 +251,7 @@ describe('vue-loader', function () {
]
}
}, function (window) {
- var module = window.testModule
+ var module = window.vueModule
expect(module.template).to.contain('
\n')
var style = window.document.querySelector('style').textContent
expect(style).to.contain('html { background-image: url(logo.c9e00e.png); }')