analogjs · benpsnyder · Aug 18, 2025
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,4 @@ tmpanalogapp*
 vite.config.*.timestamp*
 .vite-inspect
 vitest.config.*.timestamp*
+gradle.properties
diff --git a/apps/analog-app-e2e-playwright/tests/app.spec.ts b/apps/analog-app-e2e-playwright/tests/app.spec.ts
@@ -31,8 +31,17 @@ afterEach(async () => {
 describe('My Store', () => {
   test(`Given the user has navigated to the home page
     Then the app title is visible`, async () => {
-    await expect(
-      page.locator('role=heading[level=1] >> text=My Store'),
-    ).toContain(/My Store/i);
+    // Wait for the page to be fully loaded and Angular to be ready
+    await page.waitForLoadState('networkidle');
+
+    // Wait for the Angular app to be fully rendered
+    await page.waitForSelector('analogjs-root');
+
+    // Wait for the top bar component to be rendered
+    await page.waitForSelector('analogjs-top-bar');
+
+    // Now check for the heading - use a simpler selector that should work
+    const heading = page.locator('h1:has-text("My Store")');
+    await expect(await heading.textContent()).toContain('My Store');
   });
 });
diff --git a/apps/analog-app-e2e-playwright/tsconfig.json b/apps/analog-app-e2e-playwright/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "sourceMap": false,
+    "outDir": "../../dist/out-tsc",
+    "allowJs": true,
+    "types": ["node", "vitest/globals"],
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["tests/**/*.ts", "src/**/*.js"],
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  }
+}
diff --git a/apps/analog-app/tsconfig.app.json b/apps/analog-app/tsconfig.app.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
     "types": [],
-    "target": "ES2022",
     "useDefineForClassFields": false
   },
   "files": ["src/main.ts", "src/main.server.ts"],

diff --git a/apps/analog-app/tsconfig.json b/apps/analog-app/tsconfig.json
@@ -17,14 +17,8 @@
     }
   ],
   "compilerOptions": {
-    "target": "es2020",
     "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "resolveJsonModule": true
+    "noImplicitReturns": true
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

diff --git a/apps/astro-app/tsconfig.app.json b/apps/astro-app/tsconfig.app.json
@@ -18,7 +18,6 @@
     "importHelpers": true,
     "noEmit": false,
     "target": "es2020",
-    "module": "es2020",
     "lib": ["es2020", "dom"],
     "skipLibCheck": true,
     "ignoreDeprecations": "5.0"

diff --git a/apps/blog-app/tsconfig.json b/apps/blog-app/tsconfig.json
@@ -1,13 +1,8 @@
 {
   "compilerOptions": {
-    "target": "es2022",
     "useDefineForClassFields": false,
     "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noImplicitReturns": true
   },
   "files": [],
   "include": [],

diff --git a/apps/ng-app/tsconfig.json b/apps/ng-app/tsconfig.json
@@ -1,14 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es2022",
     "useDefineForClassFields": false,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noImplicitReturns": true
   },
   "files": [],
   "include": [],

diff --git a/apps/trpc-app-e2e-playwright/tests/app.spec.ts b/apps/trpc-app-e2e-playwright/tests/app.spec.ts
@@ -35,12 +35,18 @@ afterEach(async () => {
   await page.close();
 });
 
-describe.skip('tRPC Demo App', () => {
+describe('tRPC Demo App', () => {
   test(`Given the user has navigated to the home page
     Then the app title is visible`, async () => {
-    await expect(
-      page.locator('role=heading[level=1] >> text=Analog + tRPC'),
-    ).toContain(/Analog + tRPC/i);
+    // Wait for the page to be fully loaded and Angular to be ready
+    await page.waitForLoadState('networkidle');
+
+    // Wait for the Angular app to be fully rendered
+    await page.waitForSelector('trpc-app-home');
+
+    // Now check for the heading - use a simpler selector that should work
+    const heading = page.locator('h1:has-text("Analog + tRPC")');
+    await expect(await heading.textContent()).toContain('Analog + tRPC');
   });
 
   test<TRPCTestContext>(`

diff --git a/apps/trpc-app-e2e-playwright/vite.config.ts b/apps/trpc-app-e2e-playwright/vite.config.ts
@@ -5,12 +5,11 @@ import { defineConfig } from 'vite';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
-    root: 'tests',
     test: {
       reporters: ['default'],
       globals: true,
-      environment: 'node',
-      include: ['**/*.spec.ts'],
+      environment: 'jsdom',
+      include: ['tests/**/*.spec.ts'],
       cache: {
         dir: `../../node_modules/.vitest`,
       },

diff --git a/apps/trpc-app/tsconfig.json b/apps/trpc-app/tsconfig.json
@@ -15,13 +15,8 @@
     }
   ],
   "compilerOptions": {
-    "target": "es2020",
     "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noImplicitReturns": true
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "rxjs": "7.8.2",
-    "semver": "^7.5.1",
+    "semver": "^7.7.2",
     "superjson": "^2.2.1",
     "tslib": "^2.7.0",
     "ufo": "^1.5.4",
@@ -132,6 +132,7 @@
     "@types/prismjs": "^1.26.5",
     "@types/react": "^18.3.23",
     "@types/react-dom": "^18.3.7",
+    "@types/semver": "^7.7.0",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "@typescript-eslint/utils": "^8.13.0",

diff --git a/packages/astro-angular/src/index.ts b/packages/astro-angular/src/index.ts
@@ -1,7 +1,16 @@
 import viteAngular, { PluginOptions } from '@analogjs/vite-plugin-angular';
 import { enableProdMode } from '@angular/core';
 import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro';
-import type { DeepPartial } from 'astro/dist/type-utils';
+
+// Define DeepPartial locally using Astro's implementation instead of importing from astro/dist/type-utils
+// Source: https://raw.githubusercontent.com/withastro/astro/92881331d1138ae146bbc4b0bfb9c675ca3f3d55/packages/astro/src/type-utils.ts
+type DeepPartial<T> = {
+  [P in keyof T]?: T[P] extends (infer U)[]
+    ? DeepPartial<U>[]
+    : T[P] extends object | undefined
+      ? DeepPartial<T[P]>
+      : T[P];
+};
 
 interface AngularOptions {
   vite?: PluginOptions;

diff --git a/packages/astro-angular/tsconfig.spec.json b/packages/astro-angular/tsconfig.spec.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
     "types": ["node", "vitest/globals"]
   },
   "files": ["src/test-setup.ts"],

diff --git a/packages/content-plugin/tsconfig.json b/packages/content-plugin/tsconfig.json
@@ -1,8 +1,6 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "module": "CommonJS"
-  },
+  "compilerOptions": {},
   "files": [],
   "include": [],
   "references": [

diff --git a/packages/content-plugin/tsconfig.spec.json b/packages/content-plugin/tsconfig.spec.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
     "types": ["jest", "node"]
   },
   "include": ["src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"],

diff --git a/packages/content/tsconfig.spec.json b/packages/content/tsconfig.spec.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
     "types": ["node", "vitest/globals"]
   },
   "files": ["src/test-setup.ts"],

diff --git a/packages/create-analog/template-blog/tsconfig.json b/packages/create-analog/template-blog/tsconfig.json
@@ -18,9 +18,12 @@
     "importHelpers": true,
     "target": "ES2022",
     "module": "ES2022",
+    "moduleDetection": "force",
+    "allowJs": true,
     "lib": ["ES2022", "dom"],
     "useDefineForClassFields": false,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "noUncheckedIndexedAccess": true,
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

diff --git a/packages/create-analog/template-latest/tsconfig.json b/packages/create-analog/template-latest/tsconfig.json
@@ -18,9 +18,12 @@
     "importHelpers": true,
     "target": "ES2022",
     "module": "ES2022",
+    "moduleDetection": "force",
+    "allowJs": true,
     "lib": ["ES2022", "dom"],
     "useDefineForClassFields": false,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "noUncheckedIndexedAccess": true,
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

diff --git a/packages/create-analog/template-minimal/tsconfig.json b/packages/create-analog/template-minimal/tsconfig.json
@@ -19,9 +19,12 @@
     "importHelpers": true,
     "target": "ES2022",
     "module": "ES2022",
+    "moduleDetection": "force",
+    "allowJs": true,
     "lib": ["ES2022", "dom"],
     "useDefineForClassFields": false,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "noUncheckedIndexedAccess": true,
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

diff --git a/packages/create-analog/tsconfig.lib.json b/packages/create-analog/tsconfig.lib.json
@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "commonjs",
     "outDir": "../../dist/out-tsc",
     "inlineSourceMap": true,
     "sourceMap": false,

diff --git a/packages/create-analog/tsconfig.spec.json b/packages/create-analog/tsconfig.spec.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
     "types": ["vitest/globals", "node"]
   },
   "include": ["**/*.test.ts", "**/*.spec.ts", "**/*.d.ts"]

diff --git a/packages/nx-plugin/package-lock.json b/packages/nx-plugin/package-lock.json
diff --git a/packages/nx-plugin/package.json b/packages/nx-plugin/package.json
@@ -1,5 +1,11 @@
 {
   "name": "@analogjs/nx",
   "version": "0.0.1",
-  "main": "src/index.js"
+  "main": "src/index.js",
+  "dependencies": {
+    "semver": "^7.7.2"
+  },
+  "devDependencies": {
+    "@types/semver": "^7.7.0"
+  }
 }
diff --git a/packages/nx-plugin/src/generators/app/generator.ts b/packages/nx-plugin/src/generators/app/generator.ts
@@ -127,7 +127,18 @@ export async function appGenerator(
   });
 
   const angularVersion = getInstalledPackageVersion(tree, '@angular/core');
-  const majorAngularVersion = major(coerce(angularVersion));
+
+  if (!angularVersion) {
+    throw new Error('@angular/core version not found in package.json');
+  }
+
+  const coercedAngularVersion = coerce(angularVersion);
+
+  if (!coercedAngularVersion) {
+    throw new Error(`Invalid Angular version: ${angularVersion}`);
+  }
+
+  const majorAngularVersion = major(coercedAngularVersion);
   addFiles(tree, normalizedOptions, majorAngularVersion);
   addDependenciesToPackageJson(
     tree,
@@ -140,19 +151,23 @@ export async function appGenerator(
     {},
   );
 
-  updateJson<{ dependencies: object }>(tree, '/package.json', (json) => {
-    json.dependencies['@angular/platform-server'] = `~${angularVersion}`;
+  updateJson<{ dependencies: Record<string, string> }>(
+    tree,
+    '/package.json',
+    (json) => {
+      json.dependencies['@angular/platform-server'] = `~${angularVersion}`;
 
-    return json;
-  });
+      return json;
+    },
+  );
 
   updateIndex(tree, normalizedOptions.analogAppName);
 
   if (normalizedOptions.addTailwind) {
     await addTailwindConfig(tree, normalizedOptions.projectName);
   }
 
-  if (normalizedOptions.addTRPC) {
+  if (normalizedOptions.addTRPC && nxVersion) {
     await addTrpc(
       tree,
       normalizedOptions.projectRoot,