From b74e644a06eaec85df81c861f3c4b1e55a6c65a7 Mon Sep 17 00:00:00 2001
From: Stanimira Vlaeva <stanimira.vlaeva@gmail.com>
Date: Mon, 17 Dec 2018 12:47:47 +0200
Subject: [PATCH 1/2] fix(Vue): resolve full path for entry module (#744)

fixes #742
---
 templates/webpack.vue.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/webpack.vue.js b/templates/webpack.vue.js
index ba91deff..bd6a23e3 100644
--- a/templates/webpack.vue.js
+++ b/templates/webpack.vue.js
@@ -1,4 +1,4 @@
-const { relative, resolve, sep } = require("path");
+const { relative, resolve } = require("path");
 
 const webpack = require("webpack");
 const CleanWebpackPlugin = require("clean-webpack-plugin");
@@ -56,7 +56,7 @@ module.exports = env => {
     const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
 
     const entryModule = nsWebpack.getEntryModule(appFullPath);
-    const entryPath = `.${sep}${entryModule}`;
+    const entryPath = resolve(appFullPath, entryModule);
     console.log(`Bundling application for entryPath ${entryPath}...`);
 
     const config = {
@@ -149,7 +149,7 @@ module.exports = env => {
         },
         module: {
             rules: [{
-                    test: new RegExp(entryPath),
+                    test: entryPath,
                     use: [
                         // Require all Android app components
                         platform === "android" && {

From c63ef780c671c6a7f4bfa1683e4b59e21ddbcc91 Mon Sep 17 00:00:00 2001
From: SvetoslavTsenov <tsenov.svetoslav@gmail.com>
Date: Tue, 18 Dec 2018 13:49:30 +0200
Subject: [PATCH 2/2] docs: merge changelog and package.json

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87f98095..06032eee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+<a name="0.18.5"></a>
+## [0.18.5](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.18.3...0.18.5) (2018-12-17)
+
+
+### Bug Fixes
+
+* **JS/TS:** use webpack resolver instead of Node.js resolver ([#681](https://github.com/NativeScript/nativescript-dev-webpack/issues/681)) ([9adc7e7](https://github.com/NativeScript/nativescript-dev-webpack/commit/9adc7e7))
+* **Vue:** resolve full path for entry module ([#744](https://github.com/NativeScript/nativescript-dev-webpack/issues/744)) ([4d31ea0](https://github.com/NativeScript/nativescript-dev-webpack/commit/4d31ea0)), closes [#742](https://github.com/NativeScript/nativescript-dev-webpack/issues/742)
+
+
+### Features
+
+* **Vue:** add support for TypeScript ([#734](https://github.com/NativeScript/nativescript-dev-webpack/issues/734)) ([d290515](https://github.com/NativeScript/nativescript-dev-webpack/commit/d290515))
+
+
+
 <a name="0.18.3"></a>
 ## [0.18.3](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.18.2...0.18.3) (2018-12-10)
 
diff --git a/package.json b/package.json
index 96f3a3b9..80e9e897 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-webpack",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "main": "index",
   "description": "",
   "homepage": "http://www.telerik.com",