itw-python-builder 0.1.29__tar.gz → 0.1.31__tar.gz

{itw_python_builder-0.1.29 → itw_python_builder-0.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.29
+Version: 0.1.31
 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.29 → itw_python_builder-0.1.31}/itw_python_builder/ssr_tasks.py

@@ -34,6 +34,39 @@ def _angular_major_version() -> int:
     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."""
+    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', '')
+
+
+def _pin_ssr_deps_in_package_json(target_version: str) -> list:
+    """Pin @angular/ssr and @angular/platform-server in package.json to exact target_version.
+
+    Returns the list of packages whose entries were changed (or added). Does NOT touch
+    other @angular/* packages — only the two that @angular/ssr's install touches and
+    which carry strict peer-dependencies. This prevents npm from re-resolving them to
+    a newer patch that wouldn't match the installed @angular/core.
+    """
+    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.setdefault('dependencies', {})
+    changed = []
+    for pkg in ('@angular/ssr', '@angular/platform-server'):
+        if deps.get(pkg) != target_version:
+            deps[pkg] = target_version
+            changed.append(pkg)
+    if changed:
+        with open(pkg_path, 'w', encoding='utf-8') as fp:
+            json.dump(data, fp, indent=2)
+            fp.write('\n')
+    return changed
+
+
 TEMPLATES_DIR = Path(__file__).parent / 'templates'
 
 SITEMAP_IMPORT_LINE = "import {sitemapEntries} from './src/sitemap.routes';"
@@ -51,18 +84,39 @@ def _load_template(name: str) -> str:
 
 
 def _run_ng_add_ssr(ctx: Context) -> None:
-    """Run `ng add @angular/ssr` with flags appropriate to the project's Angular version.
+    """Pin SSR deps to the installed @angular/core version, then run `ng add @angular/ssr`.
+
+    Why: @angular/platform-server (pulled in by @angular/ssr) has strict per-patch
+    peer-deps — platform-server@X.Y.Z demands @angular/core@X.Y.Z *exactly*. If
+    package.json declares platform-server as a range like ^X.Y.0, npm resolves to
+    the latest patch (often newer than the installed core), which breaks the install.
 
-    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).
+    The fix is to pin only the two new packages (@angular/ssr and @angular/platform-server)
+    in package.json to the exact patch that matches the installed @angular/core. This
+    leaves every other @angular/* package alone — no upgrades, no downgrades — and
+    lets ng add → npm install resolve cleanly without --legacy-peer-deps or --force.
+
+    Flags on `ng add`:
+    - Angular 18 and earlier: no `--server-routing` flag (schematic rejects it).
+    - Angular 19+: pass `--server-routing=false` to keep the classic setup.
     """
     major = _angular_major_version()
+    installed_core = _angular_core_installed_version()
+
+    if installed_core:
+        changed = _pin_ssr_deps_in_package_json(installed_core)
+        if changed:
+            pkgs = ', '.join(changed)
+            print(f'[itw] Pinned {pkgs} to {installed_core} in package.json (matches installed @angular/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 @angular/ssr` (Angular {major}, this may take a minute)...')
-    ctx.run(f'npx ng add @angular/ssr {flags}')
+    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.29 → itw_python_builder-0.1.31}/itw_python_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.29
+Version: 0.1.31
 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.29 → itw_python_builder-0.1.31}/pyproject.toml

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