Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 4223121

Browse files
chore: cherry-pick the changes from 0.18.5 in master (#752)
* fix(Vue): resolve full path for entry module (#744) fixes #742 * docs: merge changelog and package.json
1 parent eb48234 commit 4223121

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
<a name="0.18.5"></a>
2+
## [0.18.5](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.18.3...0.18.5) (2018-12-17)
3+
4+
5+
### Bug Fixes
6+
7+
* **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))
8+
* **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)
9+
10+
11+
### Features
12+
13+
* **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))
14+
15+
16+
117
<a name="0.18.3"></a>
218
## [0.18.3](https://github.com/NativeScript/nativescript-dev-webpack/compare/0.18.2...0.18.3) (2018-12-10)
319

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-dev-webpack",
3-
"version": "0.18.3",
3+
"version": "0.18.5",
44
"main": "index",
55
"description": "",
66
"homepage": "http://www.telerik.com",

templates/webpack.vue.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { relative, resolve, sep } = require("path");
1+
const { relative, resolve } = require("path");
22

33
const webpack = require("webpack");
44
const CleanWebpackPlugin = require("clean-webpack-plugin");
@@ -56,7 +56,7 @@ module.exports = env => {
5656
const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
5757

5858
const entryModule = nsWebpack.getEntryModule(appFullPath);
59-
const entryPath = `.${sep}${entryModule}`;
59+
const entryPath = resolve(appFullPath, entryModule);
6060
console.log(`Bundling application for entryPath ${entryPath}...`);
6161

6262
const config = {
@@ -149,7 +149,7 @@ module.exports = env => {
149149
},
150150
module: {
151151
rules: [{
152-
test: new RegExp(entryPath),
152+
test: entryPath,
153153
use: [
154154
// Require all Android app components
155155
platform === "android" && {

0 commit comments

Comments
 (0)