itw-python-builder 0.1.28__tar.gz → 0.1.30__tar.gz

{itw_python_builder-0.1.28 → itw_python_builder-0.1.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.28
+Version: 0.1.30
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.1.28 → itw_python_builder-0.1.30}/itw_python_builder/ssr_tasks.py

@@ -13,6 +13,7 @@ on which Angular SSR setup the project ended up with:
   modern application builder (Angular 17+, fresh `ng add @angular/ssr`)
                            →  ng build --configuration=X
 """
+import json
 import os
 import re
 from pathlib import Path
@@ -22,6 +23,31 @@ from invoke import task, Context
 from itw_python_builder.utils import detect_project_type, _read_package_name, is_ssr_project
 
 
+def _angular_major_version() -> int:
+    """Read @angular/core's major version from package.json. Returns 0 if not found."""
+    pkg_path = os.path.join(os.getcwd(), 'package.json')
+    with open(pkg_path, 'r', encoding='utf-8') as fp:
+        data = json.load(fp)
+    deps = {**data.get('dependencies', {}), **data.get('devDependencies', {})}
+    spec = deps.get('@angular/core', '')
+    match = re.match(r'[\^~>=<]*(\d+)', spec)
+    return int(match.group(1)) if match else 0
+
+
+def _angular_core_installed_version() -> str:
+    """Return the exact installed @angular/core version from node_modules, or '' if not found.
+
+    Used to pin `ng add @angular/ssr@<this>` so platform-server's strict peer-deps
+    (which demand the same patch across all @angular/* packages) align with what's
+    already installed — no need for --legacy-peer-deps or --force.
+    """
+    pkg_path = os.path.join(os.getcwd(), 'node_modules', '@angular', 'core', 'package.json')
+    if not os.path.isfile(pkg_path):
+        return ''
+    with open(pkg_path, 'r', encoding='utf-8') as fp:
+        return json.load(fp).get('version', '')
+
+
 TEMPLATES_DIR = Path(__file__).parent / 'templates'
 
 SITEMAP_IMPORT_LINE = "import {sitemapEntries} from './src/sitemap.routes';"
@@ -39,8 +65,31 @@ def _load_template(name: str) -> str:
 
 
 def _run_ng_add_ssr(ctx: Context) -> None:
-    print('[itw] Running `ng add @angular/ssr` (this may take a minute)...')
-    ctx.run('npx ng add @angular/ssr --skip-confirmation --server-routing=false')
+    """Run `ng add @angular/ssr` pinned to the project's installed @angular/core patch.
+
+    Angular's @angular/platform-server (pulled in by @angular/ssr) has strict
+    peer-dependencies — every patch version demands the exact same patch across
+    all @angular/* packages. Without pinning, `ng add` grabs the latest patch and
+    breaks any project not on that exact patch. Pinning to the installed core
+    version aligns everything cleanly without bypassing npm's resolver.
+
+    Flags:
+    - Angular 18 and earlier: no `--server-routing` flag (schematic rejects it).
+    - Angular 19+: pass `--server-routing=false` to keep the classic setup,
+      matching the layout itw expects (single `server` target, not the new
+      server router).
+    """
+    major = _angular_major_version()
+    installed_core = _angular_core_installed_version()
+    if installed_core:
+        package_spec = f'@angular/ssr@{installed_core}'
+    else:
+        package_spec = '@angular/ssr'
+    flags = '--skip-confirmation'
+    if major >= 19:
+        flags += ' --server-routing=false'
+    print(f'[itw] Running `ng add {package_spec}` (Angular {major}, this may take a minute)...')
+    ctx.run(f'npx ng add {package_spec} {flags}')
 
 
 def _install_ngx_seo_helper(ctx: Context) -> None:

{itw_python_builder-0.1.28 → itw_python_builder-0.1.30}/itw_python_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.28
+Version: 0.1.30
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.1.28 → itw_python_builder-0.1.30}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itw_python_builder"
-version = "0.1.28"
+version = "0.1.30"
 description = "Standardized Django deployment pipeline with Docker, testing, and SonarQube integration"
 readme = "README.md"
 requires-python = ">=3.10"