@rs-x/cli 2.0.0-next.7 → 2.0.0-next.9

package/bin/rsx.cjs

@@ -5,7 +5,15 @@ const path = require('node:path');
 const readline = require('node:readline/promises');
 const { spawnSync } = require('node:child_process');
 
-const CLI_VERSION = '0.2.0';
+const CLI_VERSION = (() => {
+  try {
+    const packageJsonPath = path.join(__dirname, '..', 'package.json');
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    return packageJson.version ?? '0.0.0';
+  } catch {
+    return '0.0.0';
+  }
+})();
 const VS_CODE_EXTENSION_ID = 'rs-x.rs-x-vscode-extension';
 const ANGULAR_DEMO_TEMPLATE_DIR = path.join(
   __dirname,
@@ -268,14 +276,50 @@ function installVsCodeExtension(flags) {
     return;
   }
 
-  const args = ['--install-extension', VS_CODE_EXTENSION_ID];
+  installBundledVsix(dryRun, force);
+}
+
+function resolveBundledVsix() {
+  const packageRoot = path.resolve(__dirname, '..');
+  const candidates = fs
+    .readdirSync(packageRoot)
+    .filter((name) => /^rs-x-vscode-extension-.*\.vsix$/u.test(name))
+    .map((name) => path.join(packageRoot, name));
+
+  if (candidates.length === 0) {
+    return null;
+  }
+
+  const latest = candidates
+    .map((fullPath) => ({
+      fullPath,
+      mtimeMs: fs.statSync(fullPath).mtimeMs,
+    }))
+    .sort((a, b) => b.mtimeMs - a.mtimeMs)[0];
+
+  return latest?.fullPath ?? null;
+}
+
+function installBundledVsix(dryRun, force) {
+  const bundledVsix = resolveBundledVsix();
+  if (!bundledVsix) {
+    logWarn(
+      'No bundled VSIX found in @rs-x/cli. Skipping VS Code extension install.',
+    );
+    logInfo(
+      'If you are developing in the rs-x repo, use `rsx install vscode --local` instead.',
+    );
+    return;
+  }
+
+  const args = ['--install-extension', bundledVsix];
   if (force) {
     args.push('--force');
   }
 
-  logInfo(`Installing ${VS_CODE_EXTENSION_ID} from VS Code marketplace...`);
+  logInfo(`Installing bundled VSIX from ${bundledVsix}...`);
   run('code', args, { dryRun });
-  logOk('VS Code extension installed.');
+  logOk('VS Code extension installed from bundled VSIX.');
 }
 
 function installLocalVsix(dryRun, force) {
@@ -627,6 +671,15 @@ function removeFileOrDirectoryWithDryRun(targetPath, dryRun) {
   fs.rmSync(targetPath, { recursive: true, force: true });
 }
 
+function resolveAngularProjectTsConfig(projectRoot) {
+  const appTsConfigPath = path.join(projectRoot, 'tsconfig.app.json');
+  if (fs.existsSync(appTsConfigPath)) {
+    return appTsConfigPath;
+  }
+
+  return path.join(projectRoot, 'tsconfig.json');
+}
+
 function toFileDependencySpec(fromDir, targetPath) {
   const relative = path.relative(fromDir, targetPath).replace(/\\/gu, '/');
   const normalized = relative.startsWith('.') ? relative : `./${relative}`;
@@ -1286,12 +1339,18 @@ function applyAngularDemoStarter(projectRoot, projectName, pm, flags) {
   }
 
   const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  const angularTsConfigPath = resolveAngularProjectTsConfig(projectRoot);
+  const angularTsConfigRelative = path
+    .relative(projectRoot, angularTsConfigPath)
+    .replace(/\\/gu, '/');
   packageJson.name = projectName;
   packageJson.private = true;
   packageJson.version = '0.1.0';
   packageJson.scripts = {
-    prebuild: 'rsx build --project tsconfig.json --no-emit --prod',
-    start: 'npm run build && ng serve',
+    'build:rsx': `rsx build --project ${angularTsConfigRelative} --no-emit --prod`,
+    'typecheck:rsx': `rsx typecheck --project ${angularTsConfigRelative}`,
+    prebuild: 'npm run build:rsx',
+    start: 'npm run build:rsx && ng serve',
     build: 'ng build',
   };
   packageJson.rsx = {
@@ -1374,6 +1433,10 @@ function applyAngularDemoStarter(projectRoot, projectName, pm, flags) {
   buildOptions.polyfills = polyfills;
   build.options = buildOptions;
 
+  if (build.configurations?.production?.budgets) {
+    delete build.configurations.production.budgets;
+  }
+
   if (dryRun) {
     logInfo(`[dry-run] patch ${angularJsonPath}`);
   } else {
@@ -1423,9 +1486,6 @@ async function runProjectWithTemplate(template, flags) {
   withWorkingDirectory(projectRoot, () => {
     if (normalizedTemplate === 'angular') {
       applyAngularDemoStarter(projectRoot, projectName, pm, flags);
-      if (!Boolean(flags['skip-vscode'])) {
-        installVsCodeExtension(flags);
-      }
       return;
     }
     if (normalizedTemplate === 'react') {
@@ -2000,10 +2060,6 @@ function runInit(flags) {
     }
   }
 
-  if (!skipVscode) {
-    installVsCodeExtension(flags);
-  }
-
   logOk('RS-X init completed.');
 }
 
@@ -2471,96 +2527,15 @@ ${patchBlock}
   logOk(`Patched ${nextConfigJs} with RS-X webpack loader.`);
 }
 
-function wireRsxAngularWebpack(projectRoot, dryRun) {
-  const angularJsonPath = path.join(projectRoot, 'angular.json');
-  if (!fs.existsSync(angularJsonPath)) {
-    logWarn('angular.json not found. Skipping Angular build integration.');
-    return;
-  }
-
-  createRsxWebpackLoaderFile(projectRoot, dryRun);
-
-  const webpackConfigPath = path.join(projectRoot, 'rsx-angular-webpack.cjs');
-  const webpackConfigSource = `const path = require('node:path');
-
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\\.[jt]sx?$/u,
-        exclude: /node_modules/u,
-        use: [
-          {
-            loader: path.resolve(__dirname, './rsx-webpack-loader.cjs'),
-          },
-        ],
-      },
-    ],
-  },
-};
-`;
-
-  if (dryRun) {
-    logInfo(`[dry-run] create ${webpackConfigPath}`);
-  } else {
-    fs.writeFileSync(webpackConfigPath, webpackConfigSource, 'utf8');
-    logOk(`Created ${webpackConfigPath}`);
-  }
-
-  const angularJson = JSON.parse(fs.readFileSync(angularJsonPath, 'utf8'));
-  const projects = angularJson.projects ?? {};
-  const projectNames = Object.keys(projects);
-  if (projectNames.length === 0) {
-    logWarn('No Angular projects found in angular.json.');
-    return;
-  }
-
-  const patchPath = 'rsx-angular-webpack.cjs';
-  for (const projectName of projectNames) {
-    const project = projects[projectName];
-    const architect = project.architect ?? project.targets;
-    if (!architect?.build) {
-      continue;
-    }
-
-    const build = architect.build;
-    if (build.builder !== '@angular-builders/custom-webpack:browser') {
-      build.builder = '@angular-builders/custom-webpack:browser';
-    }
-    build.options = build.options ?? {};
-    build.options.customWebpackConfig = build.options.customWebpackConfig ?? {};
-    build.options.customWebpackConfig.path = patchPath;
-
-    if (architect.serve) {
-      const serve = architect.serve;
-      if (serve.builder !== '@angular-builders/custom-webpack:dev-server') {
-        serve.builder = '@angular-builders/custom-webpack:dev-server';
-      }
-      serve.options = serve.options ?? {};
-      serve.options.buildTarget =
-        serve.options.buildTarget ?? `${projectName}:build`;
-      serve.options.browserTarget =
-        serve.options.browserTarget ?? `${projectName}:build`;
-    }
-  }
-
-  if (dryRun) {
-    logInfo(`[dry-run] patch ${angularJsonPath}`);
-  } else {
-    fs.writeFileSync(
-      angularJsonPath,
-      `${JSON.stringify(angularJson, null, 2)}\n`,
-      'utf8',
-    );
-    logOk(`Patched ${angularJsonPath} for RS-X Angular webpack integration.`);
-  }
-}
-
 function runSetupReact(flags) {
   const dryRun = Boolean(flags['dry-run']);
   const pm = detectPackageManager(flags.pm);
   const tag = resolveInstallTag(flags);
   const projectRoot = process.cwd();
+  const angularTsConfigPath = resolveAngularProjectTsConfig(projectRoot);
+  const angularTsConfigRelative = path
+    .relative(projectRoot, angularTsConfigPath)
+    .replace(/\\/gu, '/');
   const packageJsonPath = path.join(projectRoot, 'package.json');
   if (!fs.existsSync(packageJsonPath)) {
     logError(`package.json not found in ${projectRoot}`);
@@ -2593,9 +2568,6 @@ function runSetupReact(flags) {
     logInfo('Skipping RS-X React bindings install (--skip-install).');
   }
   wireRsxVitePlugin(projectRoot, dryRun);
-  if (!Boolean(flags['skip-vscode'])) {
-    installVsCodeExtension(flags);
-  }
   logOk('RS-X React setup completed.');
 }
 
@@ -2618,9 +2590,6 @@ function runSetupNext(flags) {
     logInfo('Skipping RS-X React bindings install (--skip-install).');
   }
   wireRsxNextWebpack(process.cwd(), dryRun);
-  if (!Boolean(flags['skip-vscode'])) {
-    installVsCodeExtension(flags);
-  }
   logOk('RS-X Next.js setup completed.');
 }
 
@@ -2643,9 +2612,6 @@ function runSetupVue(flags) {
     logInfo('Skipping RS-X Vue bindings install (--skip-install).');
   }
   wireRsxVitePlugin(process.cwd(), dryRun);
-  if (!Boolean(flags['skip-vscode'])) {
-    installVsCodeExtension(flags);
-  }
   logOk('RS-X Vue setup completed.');
 }
 
@@ -2684,13 +2650,13 @@ function runSetupAngular(flags) {
   upsertScriptInPackageJson(
     projectRoot,
     'build:rsx',
-    'rsx build --project tsconfig.json --no-emit --prod',
+    `rsx build --project ${angularTsConfigRelative} --no-emit --prod`,
     dryRun,
   );
   upsertScriptInPackageJson(
     projectRoot,
     'typecheck:rsx',
-    'rsx typecheck --project tsconfig.json',
+    `rsx typecheck --project ${angularTsConfigRelative}`,
     dryRun,
   );
 
@@ -2700,14 +2666,11 @@ function runSetupAngular(flags) {
   );
   ensureAngularPolyfillsContainsFile({
     projectRoot,
-    configPath: path.join(projectRoot, 'tsconfig.json'),
+    configPath: angularTsConfigPath,
     filePath: rsxRegistrationFile,
     dryRun,
   });
 
-  if (!Boolean(flags['skip-vscode'])) {
-    installVsCodeExtension(flags);
-  }
   logOk('RS-X Angular setup completed.');
 }
 
@@ -2744,7 +2707,6 @@ function runSetupAuto(flags) {
   const pm = detectPackageManager(flags.pm);
   installRuntimePackages(pm, Boolean(flags['dry-run']), tag);
   installCompilerPackages(pm, Boolean(flags['dry-run']), tag);
-  installVsCodeExtension(flags);
 }
 
 function resolveProjectModule(projectRoot, moduleName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rs-x/cli",
-  "version": "2.0.0-next.7",
+  "version": "2.0.0-next.9",
   "description": "CLI for installing RS-X compiler tooling and VS Code integration",
   "bin": {
     "rsx": "./bin/rsx.cjs"

package/templates/angular-demo/src/app/app.component.ts

@@ -22,7 +22,7 @@ type ThemeMode = 'light' | 'dark';
 export class AppComponent implements OnInit {
   private readonly _document = inject(DOCUMENT);
   @HostBinding('class.theme-dark') public isDarkTheme = false;
-  public theme: ThemeMode = 'light';
+  public theme: ThemeMode = 'dark';
 
   public ngOnInit(): void {
     this.theme = this.getInitialTheme();
@@ -41,7 +41,7 @@ export class AppComponent implements OnInit {
       return storedTheme;
     }
 
-    return 'light';
+    return 'dark';
   }
 
   private applyTheme(theme: ThemeMode): void {