itw-python-builder 0.1.32__tar.gz → 0.1.34__tar.gz

{itw_python_builder-0.1.32 → itw_python_builder-0.1.34}/PKG-INFO

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

@@ -139,33 +139,48 @@ def _maybe_add_ssr_scripts(ctx: Context) -> None:
         data = json.load(fp)
     scripts = data.setdefault('scripts', {})
 
-    added, preserved, skipped = [], [], []
+    # The "ng add" schematic writes `build:ssr` as the implicit form
+    # `ng build && ng run <name>:server` (relies on Angular defaults). It works
+    # but it's not explicit. We normalize JUST that exact stub to the explicit
+    # form; any other existing value (custom prebuild steps, etc.) is preserved.
+    ng_add_stub = f'ng build && ng run {project_name}:server'
+
+    added, normalized, preserved, skipped = [], [], [], []
     for config_name, script_name in script_map.items():
         if config_name not in usable_configs:
             skipped.append((script_name, config_name))
             continue
-        if script_name in scripts:
+        existing = scripts.get(script_name)
+        is_stub = (
+            script_name == 'build:ssr'
+            and existing is not None
+            and ' '.join(existing.split()) == ng_add_stub
+        )
+        if existing is not None and not is_stub:
             preserved.append(script_name)
             continue
-        scripts[script_name] = cmd_for(config_name)
-        added.append((script_name, scripts[script_name]))
-
-    if added:
+        new_cmd = cmd_for(config_name)
+        scripts[script_name] = new_cmd
+        if is_stub:
+            normalized.append((script_name, new_cmd))
+        else:
+            added.append((script_name, new_cmd))
+
+    if added or normalized:
         with open(pkg_path, 'w', encoding='utf-8') as fp:
             json.dump(data, fp, indent=2)
             fp.write('\n')
 
     print('[itw] SSR npm scripts:')
-    if added:
-        for name, cmd in added:
-            print(f'       + added:     {name}  →  {cmd}')
-    if preserved:
-        for name in preserved:
-            print(f'       = preserved: {name}  (already in package.json, not overwritten)')
-    if skipped:
-        for name, cfg in skipped:
-            print(f"       - skipped:   {name}  (no '{cfg}' config in angular.json)")
-    if not (added or preserved):
+    for name, cmd in added:
+        print(f'       + added:      {name}  →  {cmd}')
+    for name, cmd in normalized:
+        print(f'       ~ normalized: {name}  →  {cmd}  (was ng-add\'s implicit form)')
+    for name in preserved:
+        print(f'       = preserved:  {name}  (already in package.json, not overwritten)')
+    for name, cfg in skipped:
+        print(f"       - skipped:    {name}  (no '{cfg}' config in angular.json)")
+    if not (added or normalized or preserved):
         print('       (nothing added)')
 
 
@@ -244,6 +259,24 @@ def _run_ng_add_ssr(ctx: Context) -> None:
     print(f'[itw] Running `ng add {package_spec}` (Angular {major}, this may take a minute)...')
     ctx.run(f'npx ng add {package_spec} {flags}')
 
+    # `ng add` typically rewrites package.json with a caret prefix (e.g. "^18.2.14"),
+    # and its internal `npm install` then resolves that range to the LATEST patch
+    # (often newer than the installed @angular/core), reintroducing the strict-peer
+    # conflict and pulling in @angular/ssr versions that reference symbols not in
+    # the installed @angular/platform-browser. Force-pin again post-ng-add and
+    # reinstall with --save-exact to lock the exact versions across package.json,
+    # package-lock.json, and node_modules.
+    if installed_core:
+        re_pinned = _pin_ssr_deps_in_package_json(installed_core)
+        if re_pinned:
+            print(f'[itw] Re-pinned {", ".join(re_pinned)} → {installed_core} (ng add introduced a caret range).')
+        print(f'[itw] Locking installed versions to {installed_core} with --save-exact...')
+        ctx.run(
+            f'npm install --save-exact '
+            f'@angular/ssr@{installed_core} '
+            f'@angular/platform-server@{installed_core}'
+        )
+
 
 def _install_ngx_seo_helper(ctx: Context) -> None:
     print('[itw] Installing ngx-seo-helper...')

{itw_python_builder-0.1.32 → itw_python_builder-0.1.34}/itw_python_builder/tasks.py

@@ -52,11 +52,11 @@ def build_frontend(ctx: Context, branch: str, ssr: bool = False) -> None:
                 'Passed --ssr but project is not SSR-scaffolded '
                 '(missing server.ts / tsconfig.server.json). Run `itw ssr-init` first.'
             )
-        script = 'build:ssr' if branch == 'master' else 'build:ssr:staging'
+        script = 'build-ssr-master' if branch == 'master' else 'build-ssr-staging'
         ctx.run(f'npm run {script}')
         return
-    config = 'production' if branch == 'master' else 'staging'
-    ctx.run(f'npx ng build --configuration={config}')
+    script = 'build-master' if branch == 'master' else 'build-staging'
+    ctx.run(f'npm run {script}')
 
 
 def package_dist(ctx: Context) -> None:

{itw_python_builder-0.1.32 → itw_python_builder-0.1.34}/itw_python_builder.egg-info/PKG-INFO

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

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