From 33a703e1291b242fe7b218aa1e6bd746a5217f88 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Thu, 27 Aug 2020 19:43:42 -0700
Subject: [PATCH] feat(webpack): using new nativescript.config (#8796)

---
 packages/webpack/helpers/projectHelpers.js       | 10 +++++++++-
 packages/webpack/package.json                    |  2 +-
 packages/webpack/templates/webpack.angular.js    |  1 +
 packages/webpack/templates/webpack.javascript.js |  1 +
 packages/webpack/templates/webpack.typescript.js |  1 +
 packages/webpack/templates/webpack.vue.js        |  1 +
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/webpack/helpers/projectHelpers.js b/packages/webpack/helpers/projectHelpers.js
index 30895a93e..c4cd68d18 100644
--- a/packages/webpack/helpers/projectHelpers.js
+++ b/packages/webpack/helpers/projectHelpers.js
@@ -88,7 +88,15 @@ const getIndentationCharacter = (jsonContent) => {
 
 const getProjectDir = hook.findProjectDir;
 
-const getPackageJsonPath = projectDir => resolve(projectDir, "package.json");
+const getPackageJsonPath = projectDir => {
+  const packagePath = resolve(projectDir, "package.json");
+  if (fs.existsSync(packagePath)) {
+    return packagePath;
+  } else {
+    return getPackageJsonPath(resolve(projectDir, '..'));
+  }
+  
+}
 const getNsConfigPath = projectDir => resolve(projectDir, "nsconfig.json");
 
 const isAndroid = platform => /android/i.test(platform);
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 7584c179c..665ce99a2 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/webpack",
-  "version": "2.1.3",
+  "version": "3.0.0-rc.0",
   "main": "index",
   "description": "Webpack plugin for NativeScript",
   "homepage": "https://nativescript.org",
diff --git a/packages/webpack/templates/webpack.angular.js b/packages/webpack/templates/webpack.angular.js
index 25b1765e0..be7cba6ba 100644
--- a/packages/webpack/templates/webpack.angular.js
+++ b/packages/webpack/templates/webpack.angular.js
@@ -214,6 +214,7 @@ module.exports = env => {
         'node_modules'
       ],
       alias: {
+        '~/package.json': resolve(projectRoot, 'package.json'),
         '~': appFullPath,
         "tns-core-modules": "@nativescript/core",
         "nativescript-angular": "@nativescript/angular"
diff --git a/packages/webpack/templates/webpack.javascript.js b/packages/webpack/templates/webpack.javascript.js
index 7073eebe9..589ef274e 100644
--- a/packages/webpack/templates/webpack.javascript.js
+++ b/packages/webpack/templates/webpack.javascript.js
@@ -67,6 +67,7 @@ module.exports = env => {
     const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
     let coreModulesPackageName = "tns-core-modules";
     const alias = env.alias || {};
+    alias['~/package.json'] = resolve(projectRoot, 'package.json');
     alias['~'] = appFullPath;
 
     if (hasRootLevelScopedModules) {
diff --git a/packages/webpack/templates/webpack.typescript.js b/packages/webpack/templates/webpack.typescript.js
index 4ce9aabe5..bde3a35b0 100644
--- a/packages/webpack/templates/webpack.typescript.js
+++ b/packages/webpack/templates/webpack.typescript.js
@@ -70,6 +70,7 @@ module.exports = env => {
     const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
     let coreModulesPackageName = "tns-core-modules";
     const alias = env.alias || {};
+    alias['~/package.json'] = resolve(projectRoot, 'package.json');
     alias['~'] = appFullPath;
 
     if (hasRootLevelScopedModules) {
diff --git a/packages/webpack/templates/webpack.vue.js b/packages/webpack/templates/webpack.vue.js
index a25c714b5..e61f20362 100644
--- a/packages/webpack/templates/webpack.vue.js
+++ b/packages/webpack/templates/webpack.vue.js
@@ -68,6 +68,7 @@ module.exports = env => {
     const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
     let coreModulesPackageName = "tns-core-modules";
     const alias = env.alias || {};
+    alias['~/package.json'] = resolve(projectRoot, 'package.json');
     alias['~'] = appFullPath;
     alias['@'] = appFullPath;
     alias['vue'] = 'nativescript-vue';