May 7, 2020 · May 7, 2020 · May 7, 2020 · May 7, 2020 · May 7, 2020 · May 7, 2020
diff --git a/index.js b/index.js
 const path = require("path");
 const { existsSync } = require("fs");
 const { existsSync, readFileSync } = require("fs");
 const { ANDROID_APP_PATH } = require("./androidProjectHelpers");
 const {
    getPackageJson,
    }
 };

 exports.getNSConfigPaths = (projectDir, defaultAppPath, defaultAppResourcePath) => {
    let appPath = defaultAppPath || "app";
    let appResourcesPath = defaultAppResourcePath || "app/App_Resources";
    const nsConfigPath = path.join(projectDir, 'nsconfig.json');
    if (existsSync(nsConfigPath)) {
        const nsConfig = readFileSync(nsConfigPath).toJSON();
        if (nsConfig.appPath) {
            appPath = nsConfig.appPath;
        }
        if (nsConfig.appResourcesPath) {
            appResourcesPath = nsConfig.appResourcesPath;
        }
    }
    return { appPath, appResourcesPath };
 };

 /**
 * For backward compatibility. This method is deprecated. Do not use it anymore.
 * This method also has a bug of not escaping valid regex symbols in entry path.
diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js
    // Default destination inside platforms/<platform>/...
    const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));


    const {
        // The 'appPath' and 'appResourcesPath' values are fetched from
        // the nsconfig.json configuration file.
        appPath = "src",
        appResourcesPath = "App_Resources",

        // the nsconfig.json configuration file
        appPath,
        appResourcesPath
    } = nsWebpack.getNSConfigPaths(projectRoot, "src")
    const {
        // You can provide the following flags when running 'tns run android|ios'
        aot, // --env.aot
        snapshot, // --env.snapshot,
diff --git a/templates/webpack.config.spec.ts b/templates/webpack.config.spec.ts
    WatchStateLoggerPlugin: EmptyClass,
    PlatformFSPlugin: EmptyClass,
    getAppPath: () => 'app',
    getNSConfigPaths: () => ({ appPath: 'app', appResourcesPath: 'app/App_Resources' }),
    getEntryModule: () => 'EntryModule',
    hasRootLevelScopedModules: () => false,
    hasRootLevelScopedAngular: () => false,
diff --git a/templates/webpack.javascript.js b/templates/webpack.javascript.js

    const {
        // The 'appPath' and 'appResourcesPath' values are fetched from
        // the nsconfig.json configuration file.
        appPath = "app",
        appResourcesPath = "app/App_Resources",

        // the nsconfig.json configuration file
        appPath,
        appResourcesPath
    } = nsWebpack.getNSConfigPaths(projectRoot)
    const {
        // You can provide the following flags when running 'tns run android|ios'
        snapshot, // --env.snapshot
        production, // --env.production
diff --git a/templates/webpack.typescript.js b/templates/webpack.typescript.js

    const {
        // The 'appPath' and 'appResourcesPath' values are fetched from
        // the nsconfig.json configuration file.
        appPath = "app",
        appResourcesPath = "app/App_Resources",

        // the nsconfig.json configuration file
        appPath,
        appResourcesPath
    } = nsWebpack.getNSConfigPaths(projectRoot)
    const {
        // You can provide the following flags when running 'tns run android|ios'
        snapshot, // --env.snapshot
        production, // --env.production
diff --git a/templates/webpack.vue.js b/templates/webpack.vue.js

    const {
        // The 'appPath' and 'appResourcesPath' values are fetched from
        // the nsconfig.json configuration file.
        appPath = "app",
        appResourcesPath = "app/App_Resources",

        // the nsconfig.json configuration file
        appPath,
        appResourcesPath
    } = nsWebpack.getNSConfigPaths(projectRoot)
    const {
        // You can provide the following flags when running 'tns run android|ios'
        snapshot, // --env.snapshot
        production, // --env.production
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,5 @@
		const path = require("path");
		const { existsSync } = require("fs");
		const { existsSync, readFileSync } = require("fs");
		const { ANDROID_APP_PATH } = require("./androidProjectHelpers");
		const {
		getPackageJson,
Expand DownExpand Up		@@ -110,6 +110,22 @@ exports.getAppPath = (platform, projectDir) => {
		}
		};

		exports.getNSConfigPaths = (projectDir, defaultAppPath, defaultAppResourcePath) => {
		let appPath = defaultAppPath \|\| "app";
		let appResourcesPath = defaultAppResourcePath \|\| "app/App_Resources";
		const nsConfigPath = path.join(projectDir, 'nsconfig.json');
		if (existsSync(nsConfigPath)) {
		const nsConfig = readFileSync(nsConfigPath).toJSON();
		if (nsConfig.appPath) {
		appPath = nsConfig.appPath;
		}
		if (nsConfig.appResourcesPath) {
		appResourcesPath = nsConfig.appResourcesPath;
		}
		}
		return { appPath, appResourcesPath };
		};

		/**
		* For backward compatibility. This method is deprecated. Do not use it anymore.
		* This method also has a bug of not escaping valid regex symbols in entry path.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,12 +35,14 @@ module.exports = env => {
		// Default destination inside platforms/<platform>/...
		const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));


		const {
		// The 'appPath' and 'appResourcesPath' values are fetched from
		// the nsconfig.json configuration file.
		appPath = "src",
		appResourcesPath = "App_Resources",

		// the nsconfig.json configuration file
		appPath,
		appResourcesPath
		} = nsWebpack.getNSConfigPaths(projectRoot, "src")
		const {
		// You can provide the following flags when running 'tns run android\|ios'
		aot, // --env.aot
		snapshot, // --env.snapshot,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,6 +28,7 @@ const nativeScriptDevWebpack = {
		WatchStateLoggerPlugin: EmptyClass,
		PlatformFSPlugin: EmptyClass,
		getAppPath: () => 'app',
		getNSConfigPaths: () => ({ appPath: 'app', appResourcesPath: 'app/App_Resources' }),
		getEntryModule: () => 'EntryModule',
		hasRootLevelScopedModules: () => false,
		hasRootLevelScopedAngular: () => false,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,10 +35,11 @@ module.exports = env => {

		const {
		// The 'appPath' and 'appResourcesPath' values are fetched from
		// the nsconfig.json configuration file.
		appPath = "app",
		appResourcesPath = "app/App_Resources",

		// the nsconfig.json configuration file
		appPath,
		appResourcesPath
		} = nsWebpack.getNSConfigPaths(projectRoot)
		const {
		// You can provide the following flags when running 'tns run android\|ios'
		snapshot, // --env.snapshot
		production, // --env.production
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,10 +37,11 @@ module.exports = env => {

		const {
		// The 'appPath' and 'appResourcesPath' values are fetched from
		// the nsconfig.json configuration file.
		appPath = "app",
		appResourcesPath = "app/App_Resources",

		// the nsconfig.json configuration file
		appPath,
		appResourcesPath
		} = nsWebpack.getNSConfigPaths(projectRoot)
		const {
		// You can provide the following flags when running 'tns run android\|ios'
		snapshot, // --env.snapshot
		production, // --env.production
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,10 +39,11 @@ module.exports = env => {

		const {
		// The 'appPath' and 'appResourcesPath' values are fetched from
		// the nsconfig.json configuration file.
		appPath = "app",
		appResourcesPath = "app/App_Resources",

		// the nsconfig.json configuration file
		appPath,
		appResourcesPath
		} = nsWebpack.getNSConfigPaths(projectRoot)
		const {
		// You can provide the following flags when running 'tns run android\|ios'
		snapshot, // --env.snapshot
		production, // --env.production
Expand Down