feat(vite): improve workspace resolutions

NathanWalker · NathanWalker · commit 58f5ba9326fe · 2025-12-04T10:06:18.000-08:00
diff --git a/packages/vite/configuration/angular.ts b/packages/vite/configuration/angular.ts
@@ -305,7 +305,7 @@ export const angularConfig = ({ mode }): UserConfig => {
 
 	const enableRollupLinker = process.env.NS_ENABLE_ROLLUP_LINKER === '1' || process.env.NS_ENABLE_ROLLUP_LINKER === 'true' || hmrActive;
 
-	return mergeConfig(baseConfig({ mode }), {
+	return mergeConfig(baseConfig({ mode, flavor: 'angular' }), {
 		plugins: [...plugins, ...(enableRollupLinker ? [angularRollupLinker(process.cwd())] : []), renderChunkLinker, postLinker],
 		// Always alias fesm2022 deep imports to package root so vendor bridge can externalize properly
 		resolve: {
diff --git a/packages/vite/configuration/base.ts b/packages/vite/configuration/base.ts
@@ -331,12 +331,12 @@ export const baseConfig = ({ mode, flavor }: { mode: string; flavor?: string }):
 			// Simplified CommonJS handling - let Vite's optimizeDeps do the heavy lifting
 			commonjs({
 				include: [/node_modules/],
-				// Force specific problematic modules to be treated as CommonJS
+				// Let Rollup/Vite decide default mapping for CommonJS modules.
 				requireReturnsDefault: 'auto',
 				defaultIsModuleExports: 'auto',
 				transformMixedEsModules: true,
 				// Ignore optional dependencies that are meant to fail gracefully
-				ignore: ['@nativescript/android', '@nativescript/ios'],
+				ignore: ['@nativescript/android', '@nativescript/ios', '@nativescript/visionos'],
 			}),
 			nsConfigAsJsonPlugin(),
 			NativeScriptPlugin({ platform }),
diff --git a/packages/vite/configuration/react.ts b/packages/vite/configuration/react.ts
@@ -86,7 +86,7 @@ export default React;
 ];
 
 export const reactConfig = ({ mode }): UserConfig => {
-	return mergeConfig(baseConfig({ mode }), {
+	return mergeConfig(baseConfig({ mode, flavor: 'react' }), {
 		plugins,
 	});
 };
diff --git a/packages/vite/configuration/solid.ts b/packages/vite/configuration/solid.ts
@@ -47,7 +47,7 @@ const plugins = [
 ];
 
 export const solidConfig = ({ mode }): UserConfig => {
-	return mergeConfig(baseConfig({ mode }), {
+	return mergeConfig(baseConfig({ mode, flavor: 'solid' }), {
 		plugins,
 	});
 };
diff --git a/packages/vite/configuration/typescript.ts b/packages/vite/configuration/typescript.ts
@@ -154,7 +154,7 @@ function createXmlLoaderPlugin(): Plugin {
 }
 
 export const typescriptConfig = ({ mode }): UserConfig => {
-	return mergeConfig(baseConfig({ mode }), {
+	return mergeConfig(baseConfig({ mode, flavor: 'typescript' }), {
 		plugins: [createXmlLoaderPlugin(), createBundlerContextPlugin()],
 	});
 };
diff --git a/packages/vite/configuration/vue.ts b/packages/vite/configuration/vue.ts
@@ -21,7 +21,7 @@ export const vueConfig = ({ mode }): UserConfig => {
 	const isDevMode = targetMode === 'development';
 	const hmrActive = isDevMode && !!cliFlags.hmr;
 
-	return mergeConfig(baseConfig({ mode }), {
+	return mergeConfig(baseConfig({ mode, flavor: 'vue' }), {
 		plugins: [
 			{
 				...alias({
diff --git a/packages/vite/helpers/main-entry.ts b/packages/vite/helpers/main-entry.ts
@@ -22,8 +22,21 @@ const mainEntryRelPosix = (() => {
 const flavor = getProjectFlavor() as string;
 
 // Optional polyfills support (non-HMR specific but dev friendly)
-const polyfillsPath = getProjectFilePath(getProjectAppRelativePath('polyfills.ts'));
-const polyfillsExists = fs.existsSync(polyfillsPath);
+// Resolve polyfills relative to the main entry directory so it works both for standalone projects and monorepos/workspaces where the workspace root and app root differ.
+// We keep both the absolute filesystem path (for existsSync) and a project-root-relative POSIX path (for the import specifier used in Vite).
+const mainEntryDir = path.dirname(mainEntry);
+const polyfillsFsPath = path.resolve(mainEntryDir, 'polyfills.ts');
+const polyfillsExists = fs.existsSync(polyfillsFsPath);
+const polyfillsImportSpecifier = (() => {
+	try {
+		// Normalize to "/..." posix-style (similar to mainEntryRelPosix)
+		const rel = path.relative(projectRoot, polyfillsFsPath).replace(/\\/g, '/');
+		return ('/' + rel).replace(/\/+/g, '/');
+	} catch {
+		// Fallback to a simple relative specifier next to main entry
+		return './polyfills.ts';
+	}
+})();
 
 const VIRTUAL_ID = 'virtual:entry-with-polyfills';
 const RESOLVED = '\0' + VIRTUAL_ID;
@@ -167,9 +180,9 @@ export function mainEntryPlugin(opts: { platform: 'ios' | 'android' | 'visionos'
 
 			// ---- Optional polyfills ----
 			if (polyfillsExists) {
-				imports += `import '${polyfillsPath}';\n`;
+				imports += `import '${polyfillsImportSpecifier}';\n`;
 				if (opts.verbose) {
-					imports += `console.info('[ns-entry] polyfills imported from', ${JSON.stringify(polyfillsPath)});\n`;
+					imports += `console.info('[ns-entry] polyfills imported from', ${JSON.stringify(polyfillsImportSpecifier)});\n`;
 				}
 			} else if (opts.verbose) {
 				imports += "console.info('[ns-entry] no polyfills file found');\n";

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ function createXmlLoaderPlugin(): Plugin {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`export const typescriptConfig = ({ mode }): UserConfig => {`
`157`		`- return mergeConfig(baseConfig({ mode }), {`
	`157`	`+ return mergeConfig(baseConfig({ mode, flavor: 'typescript' }), {`
`158`	`158`	`plugins: [createXmlLoaderPlugin(), createBundlerContextPlugin()],`
`159`	`159`	`});`
`160`	`160`	`};`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export const vueConfig = ({ mode }): UserConfig => {`
`21`	`21`	`const isDevMode = targetMode === 'development';`
`22`	`22`	`const hmrActive = isDevMode && !!cliFlags.hmr;`
`23`	`23`
`24`		`- return mergeConfig(baseConfig({ mode }), {`
	`24`	`+ return mergeConfig(baseConfig({ mode, flavor: 'vue' }), {`
`25`	`25`	`plugins: [`
`26`	`26`	`{`
`27`	`27`	`...alias({`