@o3r/localization 11.1.0-prerelease.30 → 11.1.0-prerelease.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/localization",
-  "version": "11.1.0-prerelease.30",
+  "version": "11.1.0-prerelease.31",
   "publishConfig": {
     "access": "public"
   },
@@ -44,11 +44,11 @@
     "@formatjs/intl-numberformat": "^8.0.2",
     "@ngrx/store": "~18.0.0",
     "@ngx-translate/core": "~15.0.0",
-    "@o3r/core": "^11.1.0-prerelease.30",
-    "@o3r/dynamic-content": "^11.1.0-prerelease.30",
-    "@o3r/extractors": "^11.1.0-prerelease.30",
-    "@o3r/logger": "^11.1.0-prerelease.30",
-    "@o3r/schematics": "^11.1.0-prerelease.30",
+    "@o3r/core": "^11.1.0-prerelease.31",
+    "@o3r/dynamic-content": "^11.1.0-prerelease.31",
+    "@o3r/extractors": "^11.1.0-prerelease.31",
+    "@o3r/logger": "^11.1.0-prerelease.31",
+    "@o3r/schematics": "^11.1.0-prerelease.31",
     "@schematics/angular": "~18.0.0",
     "@yarnpkg/cli": "^4.3.1",
     "@yarnpkg/core": "^4.1.1",

package/schematics/localization-base/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAgC7I;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAga/G;AAiDD,eAAO,MAAM,UAAU;kBA1CuB,MAAM,GAAG,SAAS;UA0Ca,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsE,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAgC7J;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAwZ/G;AAiDD,eAAO,MAAM,UAAU;kBA1CuB,MAAM,GAAG,SAAS;UA0Ca,CAAC"}

package/schematics/localization-base/index.js

@@ -18,9 +18,6 @@ const ownPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: '
  * @param rootPath @see RuleFactory.rootPath
  */
 function updateLocalization(options, rootPath) {
-    if (!options.projectName) {
-        return schematics_1.noop;
-    }
     const mainAssetsFolder = 'src/assets';
     const devResourcesFolder = 'dev-resources';
     /**
@@ -28,28 +25,17 @@ function updateLocalization(options, rootPath) {
      * @param tree
      * @param context
      */
-    const generateLocalesFolder = (tree, context) => {
-        const workingDirectory = (options.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
-        let gitIgnoreContent = '';
-        const gitIgnorePath = path.posix.join(workingDirectory, '.gitignore');
-        if (tree.exists(gitIgnorePath)) {
-            gitIgnoreContent = tree.read(gitIgnorePath).toString();
-            if (gitIgnoreContent.indexOf('/*.metadata.json')) {
-                return tree;
-            }
-            tree.delete(gitIgnorePath);
+    const generateLocalesFolder = (tree) => {
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+        const projectType = workspaceProject?.projectType || 'application';
+        if (projectType === 'library') {
+            return tree;
         }
-        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
-            (0, schematics_1.template)({
-                empty: '',
-                devResourcesFolder,
-                gitIgnoreContent,
-                mainAssetsFolder
-            }),
+        const workingDirectory = (options.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
+        return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
+            (0, schematics_1.template)({ empty: '' }),
             (0, schematics_1.move)(workingDirectory)
-        ]);
-        const rule = (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite);
-        return rule(tree, context);
+        ]), schematics_1.MergeStrategy.Overwrite);
     };
     /**
      * Add translation generation builders into angular.json
@@ -68,7 +54,7 @@ function updateLocalization(options, rootPath) {
             (workspaceProject.architect.build.configurations && workspaceProject.architect.build.configurations.production && workspaceProject.architect.build.configurations.production.outputPath ||
                 workspaceProject.architect.build.options.outputPath)) || './dist';
         // exit if not an application
-        if (!workspace || !projectName || !workspaceProject) {
+        if (!workspace || !projectName || !workspaceProject || workspaceProject.projectType === 'library') {
             context.logger.debug('No application project found to add translation extraction');
             return tree;
         }
@@ -105,11 +91,12 @@ function updateLocalization(options, rootPath) {
             input: `${devResourcesFolder}/localizations`,
             output: '/localizations'
         };
-        if (workspaceProject.architect.build) {
+        const projectType = workspaceProject?.projectType || 'application';
+        if (projectType === 'application' && workspaceProject.architect.build) {
             const alreadyExistingBuildOption = workspaceProject.architect.build.options?.assets?.map((a) => a.output).find((output) => output === '/localizations');
             if (!alreadyExistingBuildOption) {
                 workspaceProject.architect.build.options ||= {};
-                workspaceProject.architect.build ||= [];
+                workspaceProject.architect.build.options.assets ||= [];
                 workspaceProject.architect.build.options.assets.push(localizationAssetsConfig);
             }
         }
@@ -151,7 +138,7 @@ function updateLocalization(options, rootPath) {
         const projectName = options.projectName;
         const workspaceProject = options.projectName ? workspace?.projects[options.projectName] : undefined;
         const packageManagerRunner = (0, schematics_2.getPackageManagerRunner)((0, schematics_2.getWorkspaceConfig)(tree));
-        if (!projectName || !workspace || !workspaceProject) {
+        if (!projectName || !workspace || !workspaceProject || workspaceProject.projectType === 'library') {
             context.logger.debug('No application project found to add translation extraction');
             return tree;
         }
@@ -332,7 +319,13 @@ function updateLocalization(options, rootPath) {
     };
     // Ignore generated CMS metadata
     const ignoreDevResourcesFiles = (tree, _context) => {
-        return (0, schematics_2.ignorePatterns)(tree, [{ description: 'Local Development resources files', patterns: ['/dev-resources'] }]);
+        const workingDirectory = (options.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root) || '.';
+        return (0, schematics_1.applyToSubtree)(workingDirectory, [
+            (subTree) => (0, schematics_2.ignorePatterns)(subTree, [
+                { description: 'Local Development resources files', patterns: [`/${devResourcesFolder}`] },
+                { description: 'CMS metadata files', patterns: ['/*.metadata.json'] }
+            ])
+        ]);
     };
     return (0, schematics_1.chain)([
         registerModules,

package/schematics/localization-base/templates/__empty__.gitignore

@@ -1,7 +0,0 @@
-<%= gitIgnoreContent %>
-
-# Otter dev files
-/<%= devResourcesFolder %>
-
-# CMS adapters generated files
-/*.metadata.json