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

chore: cherry-pick the changes from 0.18.5 in master #752

Merged
merged 3 commits into from
Dec 18, 2018
Merged

chore: cherry-pick the changes from 0.18.5 in master #752

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b74e644
fix(Vue): resolve full path for entry module (#744)
sis0k0 Dec 17, 2018
c63ef78
docs: merge changelog and package.json
SvetoslavTsenov Dec 18, 2018
73091f4
Merge branch 'master' into merge-release-in-master
SvetoslavTsenov Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nativescript-dev-webpack",
"version": "0.18.3",
"version": "0.18.5",
"main": "index",
"description": "",
"homepage": "http://www.telerik.com",
Expand Down
6 changes: 3 additions & 3 deletions templates/webpack.vue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -149,7 +149,7 @@ module.exports = env => {
},
module: {
rules: [{
test: new RegExp(entryPath),
test: entryPath,
use: [
// Require all Android app components
platform === "android" && {
Expand Down