Merge remote-tracking branch 'nativescript/master'

Author: farfromrefug

CHANGELOG.md

@@ -1,3 +1,18 @@
+## [8.3.3](https://github.com/NativeScript/nativescript-cli/compare/v8.3.2...v8.3.3) (2022-08-22)
+
+
+### Bug Fixes
+
+* **console:** disable long line splitting ([be8274d](https://github.com/NativeScript/nativescript-cli/commit/be8274d7dce5f9d43a4aa3bf78d6beb414115dfc))
+* **preview:** windows spawn error ([f737579](https://github.com/NativeScript/nativescript-cli/commit/f73757929550f54fca4509f597da4dd746297ba7))
+
+
+### Features
+
+* ensure App_Resources exists before running ([#5689](https://github.com/NativeScript/nativescript-cli/issues/5689)) ([ba8dd58](https://github.com/NativeScript/nativescript-cli/commit/ba8dd58e289c0e2b8a3bc847a4c8a4e5d1bc0d73))
+
+
+
 ## [8.3.2](https://github.com/NativeScript/nativescript-cli/compare/v8.3.1...v8.3.2) (2022-07-31)
 
 

lib/commands/preview.ts

@@ -82,9 +82,13 @@ export class PreviewCommand implements ICommand {
 
 		const commandIndex = process.argv.indexOf("preview");
 		const commandArgs = process.argv.slice(commandIndex + 1);
-		this.$childProcess.spawn(previewCLIBinPath, commandArgs, {
-			stdio: "inherit",
-		});
+		this.$childProcess.spawn(
+			process.execPath,
+			[previewCLIBinPath, ...commandArgs],
+			{
+				stdio: "inherit",
+			}
+		);
 	}
 
 	async canExecute(args: string[]): Promise<boolean> {

lib/common/mobile/device-log-provider.ts

@@ -155,19 +155,26 @@ export class DeviceLogProvider extends DeviceLogProviderBase {
 	}
 
 	private printLine(prefix: string, ...parts: string[]) {
-		const maxWidth = process.stdout.columns - 2;
 		const fullLine = parts.join(" ");
-
-		// console.log(prefix, fullLine);
-		// return;
-		if (!maxWidth || maxWidth < 10 || fullLine.length < maxWidth) {
-			console.log(prefix, fullLine);
-		} else {
-			for (let i = 0; i < fullLine.length; i += maxWidth) {
-				const part = fullLine.substring(i, i + maxWidth);
-				console.log(prefix, part);
-			}
-		}
+		console.log(prefix, fullLine);
+
+		/**
+		 * Note: Disabled
+		 *
+		 * This splits the output into lines that fit within the current
+		 * terminal width, however this makes copying json objects that
+		 * span across multiple lines difficult, as it introduces
+		 * whitespace & line breaks
+		 */
+		// const maxWidth = process.stdout.columns - 2;
+		// if (!maxWidth || maxWidth < 10 || fullLine.length < maxWidth) {
+		// 	console.log(prefix, fullLine);
+		// } else {
+		// 	for (let i = 0; i < fullLine.length; i += maxWidth) {
+		// 		const part = fullLine.substring(i, i + maxWidth);
+		// 		console.log(prefix, part);
+		// 	}
+		// }
 	}
 }
 injector.register("deviceLogProvider", DeviceLogProvider);

lib/controllers/prepare-controller.ts

@@ -18,6 +18,7 @@ import {
 	IProjectConfigService,
 	IProjectData,
 	IProjectDataService,
+	IProjectService,
 } from "../definitions/project";
 import {
 	INodeModulesDependenciesBuilder,
@@ -64,7 +65,8 @@ export class PrepareController extends EventEmitter {
 		private $watchIgnoreListService: IWatchIgnoreListService,
 		private $analyticsService: IAnalyticsService,
 		private $markingModeService: IMarkingModeService,
-		private $projectConfigService: IProjectConfigService
+		private $projectConfigService: IProjectConfigService,
+		private $projectService: IProjectService
 	) {
 		super();
 	}
@@ -127,6 +129,7 @@ export class PrepareController extends EventEmitter {
 		prepareData: IPrepareData,
 		projectData: IProjectData
 	): Promise<IPrepareResultData> {
+		await this.$projectService.ensureAppResourcesExist(projectData.projectDir);
 		await this.$platformController.addPlatformIfNeeded(
 			prepareData,
 			projectData

lib/definitions/project.d.ts

@@ -88,6 +88,13 @@ interface IProjectService {
 	 * @returns {boolean} returns true if the project is valid NativeScript project.
 	 */
 	isValidNativeScriptProject(pathToProject?: string): boolean;
+
+	/**
+	 * Checks if App_Resources exists, or pulls down a fresh set
+	 * from the default template otherwise.
+	 * @param {string} projectDir
+	 */
+	ensureAppResourcesExist(projectDir: string): Promise<void>;
 }
 
 interface INsConfigPlaform {

lib/services/project-service.ts

@@ -224,7 +224,7 @@ export class ProjectService implements IProjectService {
 	}
 
 	@performanceLog()
-	private async ensureAppResourcesExist(projectDir: string): Promise<void> {
+	public async ensureAppResourcesExist(projectDir: string): Promise<void> {
 		const projectData = this.$projectDataService.getProjectData(projectDir);
 		const appResourcesDestinationPath = projectData.getAppResourcesDirectoryPath(
 			projectDir

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.3.2",
+  "version": "8.3.3",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

test/controllers/prepare-controller.ts

@@ -19,6 +19,7 @@ const prepareData = {
 let isCompileWithWatchCalled = false;
 let isCompileWithoutWatchCalled = false;
 let isNativePrepareCalled = false;
+let isEnsuringAppResourcesExist = false;
 let emittedEventNames: string[] = [];
 let emittedEventData: any[] = [];
 
@@ -64,6 +65,12 @@ function createTestInjector(data: { hasNativeChanges: boolean }): IInjector {
 	});
 
 	injector.register("tempService", TempServiceStub);
+	injector.register("projectService", {
+		ensureAppResourcesExist(projectDir: string): Promise<void> {
+			isEnsuringAppResourcesExist = true;
+			return;
+		},
+	});
 
 	const prepareController: PrepareController = injector.resolve(
 		"prepareController"
@@ -84,6 +91,7 @@ describe("prepareController", () => {
 		isNativePrepareCalled = false;
 		isCompileWithWatchCalled = false;
 		isCompileWithoutWatchCalled = false;
+		isEnsuringAppResourcesExist = false;
 
 		emittedEventNames = [];
 		emittedEventData = [];
@@ -102,6 +110,7 @@ describe("prepareController", () => {
 
 					assert.isTrue(isCompileWithWatchCalled);
 					assert.isTrue(isNativePrepareCalled);
+					assert.isTrue(isEnsuringAppResourcesExist);
 				});
 			});
 			it(`should respect native changes that are made before the initial preparation of the project had been done for ${platform}`, async () => {
@@ -161,6 +170,7 @@ describe("prepareController", () => {
 				assert.isTrue(isNativePrepareCalled);
 				assert.isTrue(isCompileWithoutWatchCalled);
 				assert.isFalse(isCompileWithWatchCalled);
+				assert.isTrue(isEnsuringAppResourcesExist);
 			});
 		});
 	});

test/project-commands.ts

@@ -96,6 +96,10 @@ class ProjectServiceMock implements IProjectService {
 	isValidNativeScriptProject(pathToProject?: string): boolean {
 		return true;
 	}
+
+	ensureAppResourcesExist(projectDir: string): Promise<void> {
+		return;
+	}
 }
 
 class ProjectNameValidatorMock implements IProjectNameValidator {