@o3r/transloco 14.5.0-prerelease.35 → 14.5.0-prerelease.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/transloco",
-  "version": "14.5.0-prerelease.35",
+  "version": "14.5.0-prerelease.36",
   "publishConfig": {
     "access": "public"
   },
@@ -45,11 +45,11 @@
     "@jsverse/transloco": "^8.0.0",
     "@jsverse/transloco-messageformat": "^8.0.0",
     "@ngrx/store": "^21.0.0",
-    "@o3r/core": "~14.5.0-prerelease.35",
-    "@o3r/dynamic-content": "~14.5.0-prerelease.35",
-    "@o3r/extractors": "~14.5.0-prerelease.35",
-    "@o3r/logger": "~14.5.0-prerelease.35",
-    "@o3r/schematics": "~14.5.0-prerelease.35",
+    "@o3r/core": "~14.5.0-prerelease.36",
+    "@o3r/dynamic-content": "~14.5.0-prerelease.36",
+    "@o3r/extractors": "~14.5.0-prerelease.36",
+    "@o3r/logger": "~14.5.0-prerelease.36",
+    "@o3r/schematics": "~14.5.0-prerelease.36",
     "@schematics/angular": "^21.0.0",
     "@yarnpkg/cli": "^4.3.1",
     "@yarnpkg/core": "^4.1.1",
@@ -110,7 +110,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "~14.5.0-prerelease.35",
+    "@o3r/schematics": "~14.5.0-prerelease.36",
     "tslib": "^2.6.2"
   },
   "engines": {

package/schematics/ng-add/helpers/remove-transloco-external-dependency.d.ts

@@ -0,0 +1,13 @@
+import { type Rule } from '@angular-devkit/schematics';
+/**
+ * Remove `@o3r/transloco` from the `externalDependencies` of all application bundling targets in angular.json.
+ *
+ * The `@o3r/components` `ng update` migration adds `@o3r/transloco` to `externalDependencies` when the package is not
+ * installed, so that the bundler skips its dynamic `import()`. Once `@o3r/transloco` is added to the project (via this
+ * `ng add`), it must be bundled again, so the previously added entry has to be cleaned up.
+ * Custom-webpack builders cannot be updated automatically, so a warning is logged to revert the manual `IgnorePlugin`.
+ * @param tree
+ * @param context
+ */
+export declare const removeTranslocoExternalDependency: Rule;
+//# sourceMappingURL=remove-transloco-external-dependency.d.ts.map

package/schematics/ng-add/helpers/remove-transloco-external-dependency.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-transloco-external-dependency.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/remove-transloco-external-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAcpC;;;;;;;;;GASG;AACH,eAAO,MAAM,iCAAiC,EAAE,IA0C/C,CAAC"}

package/schematics/ng-add/helpers/remove-transloco-external-dependency.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeTranslocoExternalDependency = void 0;
+const schematics_1 = require("@o3r/schematics");
+const TRANSLOCO_PACKAGE = '@o3r/transloco';
+/** Builders from `@angular-builders/custom-webpack` whose bundling is driven by a user-provided webpack config file. */
+const CUSTOM_WEBPACK_BUILDERS = new Set([
+    '@angular-builders/custom-webpack:browser',
+    '@angular-builders/custom-webpack:server',
+    '@angular-builders/custom-webpack:karma'
+]);
+/**
+ * Remove `@o3r/transloco` from the `externalDependencies` of all application bundling targets in angular.json.
+ *
+ * The `@o3r/components` `ng update` migration adds `@o3r/transloco` to `externalDependencies` when the package is not
+ * installed, so that the bundler skips its dynamic `import()`. Once `@o3r/transloco` is added to the project (via this
+ * `ng add`), it must be bundled again, so the previously added entry has to be cleaned up.
+ * Custom-webpack builders cannot be updated automatically, so a warning is logged to revert the manual `IgnorePlugin`.
+ * @param tree
+ * @param context
+ */
+const removeTranslocoExternalDependency = (tree, context) => {
+    const workspace = (0, schematics_1.getWorkspaceConfig)(tree);
+    if (!workspace) {
+        return tree;
+    }
+    let modified = false;
+    for (const [projectName, project] of Object.entries(workspace.projects || {})) {
+        if (project.projectType !== 'application') {
+            continue;
+        }
+        for (const [targetName, target] of Object.entries(project.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}".\n`
+                    + `If you previously added an IgnorePlugin for ${TRANSLOCO_PACKAGE} in ${webpackConfigLabel} (following the @o3r/components migration), `
+                    + 'please remove it now so the package is bundled again:\n'
+                    + `  config.plugins.push(new IgnorePlugin({ resourceRegExp: /^${TRANSLOCO_PACKAGE.replace('/', '\\/')}$/ }));`);
+                continue;
+            }
+            const existingExternals = target.options?.externalDependencies;
+            if (!existingExternals?.includes(TRANSLOCO_PACKAGE)) {
+                continue;
+            }
+            const updatedExternals = existingExternals.filter((dependency) => dependency !== TRANSLOCO_PACKAGE);
+            if (updatedExternals.length > 0) {
+                target.options.externalDependencies = updatedExternals;
+            }
+            else {
+                delete target.options.externalDependencies;
+            }
+            context.logger.info(`Removed ${TRANSLOCO_PACKAGE} from externalDependencies in ${projectName}/${targetName} as it is now a project dependency.`);
+            modified = true;
+        }
+    }
+    if (modified) {
+        tree.overwrite('/angular.json', JSON.stringify(workspace, null, 2));
+    }
+    return tree;
+};
+exports.removeTranslocoExternalDependency = removeTranslocoExternalDependency;
+//# sourceMappingURL=remove-transloco-external-dependency.js.map

package/schematics/ng-add/helpers/remove-transloco-external-dependency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-transloco-external-dependency.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/remove-transloco-external-dependency.ts"],"names":[],"mappings":";;;AAGA,gDAEyB;AAEzB,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;AAE3C,wHAAwH;AACxH,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC;IACtC,0CAA0C;IAC1C,yCAAyC;IACzC,wCAAwC;CACzC,CAAC,CAAC;AAEH;;;;;;;;;GASG;AACI,MAAM,iCAAiC,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC;QAC9E,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE,CAAC;YAC1C,SAAS;QACX,CAAC;QACD,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3E,IAAI,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,MAAM,iBAAiB,GAAI,MAAM,CAAC,OAAmE,EAAE,mBAAmB,EAAE,IAAI,CAAC;gBACjI,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,CAAC,CAAC,uBAAuB,iBAAiB,GAAG,CAAC,CAAC,CAAC,qBAAqB,CAAC;gBACnH,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,GAAG,WAAW,IAAI,UAAU,qCAAqC,MAAM,CAAC,OAAO,MAAM;sBACnF,+CAA+C,iBAAiB,OAAO,kBAAkB,8CAA8C;sBACvI,yDAAyD;sBACzD,8DAA8D,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAC/G,CAAC;gBACF,SAAS;YACX,CAAC;YACD,MAAM,iBAAiB,GAA0B,MAAM,CAAC,OAA2D,EAAE,oBAAoB,CAAC;YAC1I,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACpD,SAAS;YACX,CAAC;YACD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,KAAK,iBAAiB,CAAC,CAAC;YACpG,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAA+C,CAAC,oBAAoB,GAAG,gBAAgB,CAAC;YAClG,CAAC;iBAAM,CAAC;gBACN,OAAQ,MAAM,CAAC,OAA+C,CAAC,oBAAoB,CAAC;YACtF,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,iBAAiB,iCAAiC,WAAW,IAAI,UAAU,qCAAqC,CAAC,CAAC;YACjJ,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA1CW,QAAA,iCAAiC,qCA0C5C"}

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAqBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAmDlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAwBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAoDlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -8,6 +8,7 @@ const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 const localization_base_1 = require("../localization-base");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+const remove_transloco_external_dependency_1 = require("./helpers/remove-transloco-external-dependency");
 /**
  * List of external dependencies to be added to the project as peer dependencies
  */
@@ -47,6 +48,7 @@ function ngAddFn(options) {
         (0, localization_base_1.updateI18n)(options),
         options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
         (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall }),
+        remove_transloco_external_dependency_1.removeTranslocoExternalDependency,
         (0, cms_adapter_1.updateCmsAdapter)(options),
         (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
         (0, schematics_2.setupSchematicsParamsForProject)({ '@o3r/core:component*': { useLocalization: true } }, options.projectName),

package/schematics/ng-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAIoC;AACpC,gDAMyB;AAIzB,gDAEwB;AACxB,4DAG8B;AAC9B,2EAEyC;AAKzC;;GAEG;AACH,MAAM,qBAAqB,GAAG;IAC5B,cAAc;IACd,iBAAiB;IACjB,eAAe;IACf,oBAAoB;IACpB,kCAAkC;IAClC,gBAAgB;IAChB,aAAa;IACb,MAAM;CACP,CAAC;AAEF;;GAEG;AACH,MAAM,wBAAwB,GAAG;IAC/B,sBAAsB;IACtB,UAAU;IACV,QAAQ;CACT,CAAC;AAEF,oCAAoC;AACpC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAC5E,2BAA2B;AAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;AAEtG;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,IAAA,kBAAK,EAAC;QACX,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kHAAkH,CAAC,CAAC;QAC1I,CAAC;QACD,IAAA,sCAAkB,EAAC,OAAO,EAAE,SAAS,CAAC;QACtC,IAAA,8BAAU,EAAC,OAAO,CAAC;QACnB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE;QAC9C,IAAA,kCAAqB,EAAC,OAAO,EAAE,eAAe,EAAE,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,CAAC;QACpG,IAAA,8BAAgB,EAAC,OAAO,CAAC;QACzB,IAAA,gDAAmC,EAAC,WAAW,CAAC;QAChD,IAAA,4CAA+B,EAAC,EAAE,sBAAsB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC;QAC3G,IAAA,wCAAgB,EAAC,OAAO,CAAC;KAC1B,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,kCAAkC;AAClC,2DAIoC;AACpC,gDAMyB;AAIzB,gDAEwB;AACxB,4DAG8B;AAC9B,2EAEyC;AACzC,yGAEwD;AAKxD;;GAEG;AACH,MAAM,qBAAqB,GAAG;IAC5B,cAAc;IACd,iBAAiB;IACjB,eAAe;IACf,oBAAoB;IACpB,kCAAkC;IAClC,gBAAgB;IAChB,aAAa;IACb,MAAM;CACP,CAAC;AAEF;;GAEG;AACH,MAAM,wBAAwB,GAAG;IAC/B,sBAAsB;IACtB,UAAU;IACV,QAAQ;CACT,CAAC;AAEF,oCAAoC;AACpC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAC5E,2BAA2B;AAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAgB,CAAC;AAEtG;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,IAAA,kBAAK,EAAC;QACX,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kHAAkH,CAAC,CAAC;QAC1I,CAAC;QACD,IAAA,sCAAkB,EAAC,OAAO,EAAE,SAAS,CAAC;QACtC,IAAA,8BAAU,EAAC,OAAO,CAAC;QACnB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE;QAC9C,IAAA,kCAAqB,EAAC,OAAO,EAAE,eAAe,EAAE,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,CAAC;QACpG,wEAAiC;QACjC,IAAA,8BAAgB,EAAC,OAAO,CAAC;QACzB,IAAA,gDAAmC,EAAC,WAAW,CAAC;QAChD,IAAA,4CAA+B,EAAC,EAAE,sBAAsB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC;QAC3G,IAAA,wCAAgB,EAAC,OAAO,CAAC;KAC1B,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}