@o3r/components 14.4.1 → 14.4.2

package/migration.json

@@ -5,6 +5,11 @@
       "version": "10.0.0-alpha.0",
       "description": "Updates of @o3r/components to v10.0.*",
       "factory": "./schematics/ng-update/v10-0/index#updateV10_0"
+    },
+    "migration-v14_4": {
+      "version": "14.4.0-alpha.0",
+      "description": "Updates of @o3r/components to v14.4.*",
+      "factory": "./schematics/ng-update/v14-4/index#updateV14_4"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/components",
-  "version": "14.4.1",
+  "version": "14.4.2",
   "publishConfig": {
     "access": "public"
   },
@@ -44,16 +44,16 @@
     "@ngrx/effects": "^21.0.0",
     "@ngrx/entity": "^21.0.0",
     "@ngrx/store": "^21.0.0",
-    "@o3r/analytics": "~14.4.1",
-    "@o3r/configuration": "~14.4.1",
-    "@o3r/core": "~14.4.1",
-    "@o3r/dynamic-content": "~14.4.1",
-    "@o3r/extractors": "~14.4.1",
-    "@o3r/localization": "~14.4.1",
-    "@o3r/logger": "~14.4.1",
-    "@o3r/rules-engine": "~14.4.1",
-    "@o3r/schematics": "~14.4.1",
-    "@o3r/transloco": "~14.4.1",
+    "@o3r/analytics": "~14.4.2",
+    "@o3r/configuration": "~14.4.2",
+    "@o3r/core": "~14.4.2",
+    "@o3r/dynamic-content": "~14.4.2",
+    "@o3r/extractors": "~14.4.2",
+    "@o3r/localization": "~14.4.2",
+    "@o3r/logger": "~14.4.2",
+    "@o3r/rules-engine": "~14.4.2",
+    "@o3r/schematics": "~14.4.2",
+    "@o3r/transloco": "~14.4.2",
     "@schematics/angular": "^21.0.0",
     "@yarnpkg/cli": "^4.0.0",
     "@yarnpkg/core": "^4.1.1",
@@ -137,7 +137,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "~14.4.1",
+    "@o3r/schematics": "~14.4.2",
     "tslib": "^2.6.2"
   },
   "engines": {

package/schematics/ng-update/v14-4/index.d.ts

@@ -0,0 +1,6 @@
+import { type Rule } from '@angular-devkit/schematics';
+/**
+ * Update of `@o3r/components` v14.4
+ */
+export declare const updateV14_4: (options: any) => Rule;
+//# sourceMappingURL=index.d.ts.map

package/schematics/ng-update/v14-4/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/v14-4/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AA4GpC;;GAEG;AAEH,eAAO,MAAM,WAAW,wBAAsC,CAAC"}

package/schematics/ng-update/v14-4/index.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateV14_4 = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
+const TRANSLOCO_PACKAGE = '@o3r/transloco';
+/** Angular builders that perform JavaScript bundling and support the externalDependencies option */
+const BUNDLING_BUILDERS = new Set([
+    '@angular-devkit/build-angular:browser',
+    '@angular-devkit/build-angular:browser-esbuild',
+    '@angular/build:application',
+    '@angular-devkit/build-angular:server',
+    '@angular-devkit/build-angular:app-shell',
+    '@angular-devkit/build-angular:prerender',
+    '@angular-devkit/build-angular:karma'
+]);
+/**
+ * Builders from `@angular-builders/custom-webpack` that bundle JavaScript through a user-provided webpack config file.
+ * These do not support the `externalDependencies` option, so the equivalent fix must be applied in the webpack config
+ * referenced by their `customWebpackConfig.path` option.
+ */
+const CUSTOM_WEBPACK_BUILDERS = new Set([
+    '@angular-builders/custom-webpack:browser',
+    '@angular-builders/custom-webpack:server',
+    '@angular-builders/custom-webpack:karma'
+]);
+/**
+ * Add `@o3r/transloco` to externalDependencies in bundling targets of angular.json
+ * when it is not a direct dependency of the project.
+ * This is required because `@o3r/components` performs a dynamic `import('@o3r/transloco')` at runtime,
+ * and webpack/esbuild will fail at build time if the module is not installed and not marked as external.
+ * @param tree
+ * @param context
+ */
+const addTranslocoExternalDependency = (tree, context) => {
+    const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+    if (!workspace) {
+        context.logger.warn('No angular.json found, skipping migration.');
+        return;
+    }
+    const packageJson = tree.exists('/package.json')
+        ? tree.readJson('/package.json')
+        : null;
+    const isTranslocoInstalled = !!packageJson?.dependencies?.[TRANSLOCO_PACKAGE]
+        || !!packageJson?.devDependencies?.[TRANSLOCO_PACKAGE];
+    if (isTranslocoInstalled) {
+        context.logger.info(`${TRANSLOCO_PACKAGE} is already installed, no externalDependencies update needed.`);
+        return;
+    }
+    let modified = false;
+    for (const [projectName, project] of Object.entries(workspace.projects || {})) {
+        if (project.projectType !== 'application') {
+            continue;
+        }
+        const architect = project.architect || {};
+        for (const [targetName, target] of Object.entries(architect)) {
+            if (CUSTOM_WEBPACK_BUILDERS.has(target.builder)) {
+                const webpackConfigPath = target.options?.customWebpackConfig?.path;
+                const webpackConfigLabel = webpackConfigPath ? `the webpack config "${webpackConfigPath}"` : 'your webpack config';
+                context.logger.warn(`${projectName}/${targetName} uses the custom-webpack builder "${target.builder}", which does not support the externalDependencies option.\n`
+                    + `Please add the following to ${webpackConfigLabel} manually so the bundler skips the optional ${TRANSLOCO_PACKAGE} import:\n`
+                    + '  const { IgnorePlugin } = require(\'webpack\');\n'
+                    + '  config.plugins.push(new IgnorePlugin({\n'
+                    + `    resourceRegExp: /^${TRANSLOCO_PACKAGE.replace('/', '\\/')}$/\n`
+                    + '  }));');
+                continue;
+            }
+            if (!BUNDLING_BUILDERS.has(target.builder)) {
+                continue;
+            }
+            if (!target.options) {
+                target.options = {};
+            }
+            const existingExternals = (target.options).externalDependencies ?? [];
+            if (!existingExternals.includes(TRANSLOCO_PACKAGE)) {
+                (target.options).externalDependencies = [...existingExternals, TRANSLOCO_PACKAGE];
+                context.logger.info(`Added ${TRANSLOCO_PACKAGE} to externalDependencies in ${projectName}/${targetName}.`);
+                modified = true;
+            }
+        }
+    }
+    if (modified) {
+        (0, schematics_2.writeAngularJson)(tree, workspace);
+    }
+};
+// eslint-disable-next-line @typescript-eslint/naming-convention -- version in the function name
+function updateV14_4Fn() {
+    return (tree, context) => (0, schematics_1.chain)([
+        addTranslocoExternalDependency
+    ])(tree, context);
+}
+/**
+ * Update of `@o3r/components` v14.4
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- version in the function name
+exports.updateV14_4 = (0, schematics_2.createOtterSchematic)(updateV14_4Fn);
+//# sourceMappingURL=index.js.map

package/schematics/ng-update/v14-4/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-update/v14-4/index.ts"],"names":[],"mappings":"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"}