From 42ededa1603519abf95cdb99d85128f146cc7751 Mon Sep 17 00:00:00 2001 From: mikekidder Date: Tue, 22 Nov 2016 11:46:53 -0700 Subject: [PATCH 1/2] Fix: webpack.beta.27; rimraf, cross platform support --- example/webpack.config.js | 2 +- package.json | 5 +++-- test/webpack.config.js | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/example/webpack.config.js b/example/webpack.config.js index 14b1a96..b09bdf9 100644 --- a/example/webpack.config.js +++ b/example/webpack.config.js @@ -9,7 +9,7 @@ module.exports = { { test: /\.ts$/, exclude: /node_modules|vue\/src/, - loader: 'ts' + loader: 'ts-loader' } ] }, diff --git a/package.json b/package.json index 5264472..fe8c3de 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "scripts": { "build": "tsc -p .", - "clean": "rm -rf lib", + "clean": "rimraf ./lib", "example": "npm run build && webpack --config example/webpack.config.js", "dev": "webpack --config example/webpack.config.js --watch", "test": "npm run build && webpack --config test/webpack.config.js && mocha test/test.build.js", @@ -43,9 +43,10 @@ "chai": "^3.5.0", "mocha": "^3.1.2", "node-libs-browser": "^1.0.0", + "rimraf": "^2.5.4", "ts-loader": "^0.9.5", "typescript": "^2.0.6", "vue": "^2.0.3", - "webpack": "^2.1.0-beta.25" + "webpack": "^2.1.0-beta.27" } } diff --git a/test/webpack.config.js b/test/webpack.config.js index 9848515..065d223 100644 --- a/test/webpack.config.js +++ b/test/webpack.config.js @@ -12,12 +12,12 @@ module.exports = { { test: /\.ts$/, exclude: /node_modules|vue\/src/, - loader: 'ts' + loader: 'ts-loader' }, { test: /\.js$/, exclude: /node_modules|vue\/src/, - loader: 'babel' + loader: 'babel-loader' } ] } From dc5c2f3d9f0b1d079ab6a3241839bd18358c301d Mon Sep 17 00:00:00 2001 From: mikekidder Date: Tue, 22 Nov 2016 13:56:00 -0700 Subject: [PATCH 2/2] Fix#2: mounted App twice --- example/example.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/example.ts b/example/example.ts index 5affdb4..33b5492 100644 --- a/example/example.ts +++ b/example/example.ts @@ -48,7 +48,7 @@ class App extends Vue { } // mount -new App({ +new Vue({ el: '#el', render: h => h(App, { props: { propMessage: 'World!' }}) })