@common-stack/generate-plugin 6.0.6-alpha.8 → 6.0.6-alpha.81

package/lib/generators/add-frontend/generator.mjs

@@ -1,15 +1,17 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI}from'../../constants/index.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
+import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI}from'../../common/constants.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
+const DEFAULT_SERVER_NAME = 'frontend-server';
 function addFrontendGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const projectName = isValid(options.ns) ? `frontend-${getValid(options.ns)}-server` : 'frontend-server';
+        const projectName = isValid(options.name) ? `frontend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
         const configs = Object.assign(Object.assign({}, options), { name: projectName });
         return yield generateFrontend(tree, configs);
     });
 }
 const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
-    const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'frontend-server';
+    let projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
     const projectSrc = `${projectRoot}/src`;
     const framework = (_b = getValid(options.framework)) !== null && _b !== void 0 ? _b : DEFAULT_FRAMEWORK;
     console.log('UI framework specified: ', framework);
@@ -26,16 +28,18 @@ const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, fu
         packageJson['name'] = projectName;
         if (framework === FRAMEWORK_ANTUI) {
             packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
-            packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
-            packageJson['dependencies']["@ant-design/pro-layout"] = "^7.6.1";
             packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
             packageJson['dependencies']["antd"] = "^5.14.0";
         }
         else if (framework === FRAMEWORK_CHAKRAUI) {
-            packageJson['dependencies']["@admin-layout/chakra-design-pro"] = "latest";
-            packageJson['dependencies']["@admin-layout/chakra-ui"] = "latest";
-            packageJson['dependencies']["@adminide-stack/user-auth0-browser-chakra"] = "latest";
             packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
+            packageJson['dependencies']["framer-motion"] = "^11.5.4";
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
             packageJson['dependencies']["@emotion/css"] = "^11.10.0";
             packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
         }

package/lib/generators/add-frontend/generator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/generators/add-frontend/schema.json

@@ -7,18 +7,23 @@
         "ns": {
             "type": "string",
             "description": "The project namespace",
-            "x-prompt": "What name would you like to use?"
+            "x-prompt": "What namespace would you like to use?"
         },
         "directory": {
             "type": "string",
             "description": "",
             "x-prompt": "What directory would you like to create in?"
         },
+        "name": {
+            "type": "string",
+            "description": "The module name(optional)",
+            "x-prompt": "What name would you like to use for this frontend server module?(optional)"
+        },
         "framework": {
             "type": "string",
             "description": "",
-            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?"
+            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?(default: antui)"
         }
     },
-    "required": ["ns", "directory", "framework"]
+    "required": ["ns", "directory"]
 }

package/lib/generators/add-frontend/templates/config.json

@@ -1,50 +1,5 @@
 {
-  "commonPaths": {
-    "appPath": "app",
-    "frontendStackPath": "frontend-stack-react"
-  },
-  "copyOperations": [
-    {
-      "packageName": "@common-stack/frontend-stack-react",
-      "destPath": "$.commonPaths.frontendStackPath",
-      "generateModule": true
-    }
-  ],
-  "i18n": {
-    "enabled": true,
-    "fallbackLng": "en",
-    "supportedLngs": [
-      "en",
-      "de",
-      "es"
-    ],
-    "defaultNS": "common",
-    "react": {
-      "useSuspense": false
-    },
-    "backend": {
-      "loadPath": "/cdm-locales/{{lng}}/{{ns}}.json",
-      "loadServerPath": "./public/cdm-locales/{{lng}}/{{ns}}.json"
-    },
-    "packages": [
-    ]
-  },
+
   "modules": [
-  ],
-  "buildConfig": {
-    "__CLIENT__": false,
-    "__SERVER__": true,
-    "__DEV__": false,
-    "__TEST__": false,
-    "__CDN_URL__": "",
-    "__GRAPHQL_URL__": "http://localhost:8080/graphql",
-    "__DEBUGGING__": false,
-    "__SSR__": true,
-    "__API_URL__": "/graphql",
-    "__FRONTEND_BUILD_DIR__": "./dist/client",
-    "__WEB_DEV_SERVER_PORT__": 3000,
-    "__GRAPHQL_ENDPOINT__": "/graphql",
-    "__LOCAL_SERVER_HOST__": "localhost",
-    "__BACKEND_URL__": "http://localhost:3000"
-  }
+  ]
 }

package/lib/generators/add-frontend/templates/package.json

@@ -52,9 +52,7 @@
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
     "dependencies": {
-        "@emotion/react": "^11.10.4",
-        "@emotion/server": "^11.10.0",
-        "@common-stack/frontend-stack-react": "6.0.6-alpha.6",
+        "@common-stack/frontend-stack-react": "6.0.6-alpha.73",
         "@react-icons/all-files": "^4.1.0",
         "classnames": "^2.2.6",
         "compression": "^1.7.4",
@@ -82,10 +80,9 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/frontend-stack-react": "6.0.6-alpha.6",
-        "@common-stack/rollup-vite-utils": "6.0.6-alpha.5",
-        "@remix-run/dev": "^2.8.1",
-        "@remix-run/serve": "^2.8.1",
+        "@common-stack/rollup-vite-utils": "6.0.6-alpha.80",
+        "@remix-run/dev": "~2.10.1",
+        "@remix-run/serve": "~2.10.1",
         "cross-env": "^7.0.3",
         "dotenv-esm": "^16.0.3-4",
         "pm2": "^5.2.2",
@@ -93,7 +90,7 @@
         "rimraf": "^3.0.2",
         "tsx": "^4.7.0",
         "typescript": "^5.4.5",
-        "uuid": "^9.0.1",
+        "uuid": "^10.0.0",
         "vite": "^5.1.0",
         "vite-plugin-cjs-interop": "^2.1.1",
         "vite-tsconfig-paths": "^4.2.1"

package/lib/generators/add-frontend/templates/tools/checkQueryUsage.mjs

@@ -0,0 +1,192 @@
+import fs from 'fs';
+import path from 'path';
+import glob from'glob';
+
+// Regex to find `use<QueryName>Query` calls, capturing query name and arguments
+const queryPattern = /use([A-Za-z0-9]+Query)\(([^)]*)\)/g;
+const fileExtensions = ['.js', '.ts', '.jsx', '.tsx'];
+const excludeFiles = ['react-hooks', 'generated'];
+const basePath = process.cwd();
+
+const findPackageJsonFiles = () => {
+  const monorepoRoot = path.join(basePath, '..', '..');
+  return new Promise((resolve, reject) => {
+    glob(
+      `${monorepoRoot}/+(servers|portable-devices|packages|packages-modules)/**/package.json`,
+      { nodir: true, ignore: '**/node_modules/**' },
+      (err, files) => {
+        if (err) reject(`Unable to scan directory: ${err}`);
+        resolve(files);
+      },
+    );
+  });
+};
+
+// Function to transform componentPath from `lib` to `src` path and handle package names
+const transformComponentPath = (componentPath, packageName) => {
+  return componentPath
+    .replace('/lib/', '/src/')
+    .replace(packageName + '/', '')
+    .replace('.js', '');
+};
+
+// Normalize file paths for consistent comparison (remove extensions and resolve absolute paths)
+const normalizePath = (filePath) => {
+  const resolvedPath = path.resolve(filePath).replace(/\.[jt]sx?$/, ''); // Remove .js, .ts, .jsx, .tsx extensions
+  return resolvedPath;
+};
+
+// Function to extract component paths and queries from routes.json
+async function extractComponentPathsAndQueries(routesFile, packageName) {
+  let componentQueries = {};
+
+  try {
+    const content = await fs.promises.readFile(routesFile, 'utf-8');
+    const routes = JSON.parse(content);
+
+    // Traverse routes to extract componentPath and queries
+    routes.forEach(routeObj => {
+      Object.keys(routeObj).forEach(routeKey => {
+        const route = routeObj[routeKey];
+        if (route.hasComponent && route.componentPath) {
+          const transformedPath = normalizePath(transformComponentPath(route.componentPath, packageName));
+          const queries = Object.keys(route.queries || {});
+          if (queries.length > 0) {
+            componentQueries[transformedPath] = queries;
+          }
+        }
+      });
+    });
+
+    console.log('Extracted components and queries from routes.json:', componentQueries);
+  } catch (err) {
+    console.error(`Error reading routes.json file: ${routesFile}`, err);
+  }
+
+  return componentQueries;
+}
+
+// Function to recursively search for useQuery in files and validate if the file is a data component
+async function checkFiles(dir, componentQueries) {
+  const files = await fs.promises.readdir(dir, { withFileTypes: true });
+
+  for (const file of files) {
+    const fullPath = path.join(dir, file.name);
+
+    if (file.isDirectory()) {
+      // Recurse into subdirectories
+      await checkFiles(fullPath, componentQueries);
+    } else if (fileExtensions.includes(path.extname(file.name)) && !excludeFiles.includes(path.parse(file.name).name)) {
+      await checkForInvalidQueryUsage(fullPath, componentQueries);
+    }
+  }
+}
+
+// Function to extract query details from a match
+const extractQueryDetails = (queryMatch) => {
+  const [fullMatch, queryName, queryArgs] = queryMatch;
+  return {
+    queryName,
+    fullMatch,
+    queryArgs: queryArgs.trim(),
+    isLazyQuery: queryName.endsWith('LazyQuery'),
+    hasCacheOnlyFetchPolicy: queryArgs.includes("fetchPolicy: 'cache-only'"),
+  };
+};
+
+// Function to check for query usage in a file and validate if it is allowed
+async function checkForInvalidQueryUsage(filePath, componentQueries) {
+  try {
+    const content = await fs.promises.readFile(filePath, 'utf-8');
+    let match;
+    const usedQueries = [];
+    const queriesMissingCacheOnly = [];
+    const queriesWithNoArguments = [];
+    const queryNames = [];
+
+    while ((match = queryPattern.exec(content)) !== null) {
+      const queryDetails = extractQueryDetails(match);
+      usedQueries.push(queryDetails);
+      queryNames.push(queryDetails.queryName);
+
+      // Ignore LazyQuery for fetchPolicy check
+      if (!queryDetails.isLazyQuery && !queryDetails.hasCacheOnlyFetchPolicy) {
+        queriesMissingCacheOnly.push(queryDetails.queryName);
+      }
+
+      // Check for queries without arguments
+      if (queryDetails.queryArgs === '') {
+        queriesWithNoArguments.push(queryDetails.queryName);
+      }
+    }
+
+    if (usedQueries.length > 0) {
+      const normalizedFilePath = normalizePath(filePath);
+      const isDataComponent = componentQueries[normalizedFilePath];
+
+      const warnings = [];
+
+      // Warning if a data component has more than 3 queries
+      if (isDataComponent && usedQueries.length > 3) {
+        warnings.push(`Warning: Data component "${filePath}" has more than 3 queries. Consider splitting into multiple data components with a layout component as the parent.`);
+      }
+
+      // Consolidate missing cache-only fetchPolicy warnings
+      if (queriesMissingCacheOnly.length > 0) {
+        warnings.push(`Warning: The following queries are missing fetchPolicy: "cache-only":\n    - ${queriesMissingCacheOnly.join('\n    - ')}`);
+      }
+
+      // Warn for queries without arguments (which could fetch all data)
+      if (queriesWithNoArguments.length > 0) {
+        warnings.push(`Warning: The following queries have no arguments and could fetch all data. Consider narrowing the search and using pagination:\n    - ${queriesWithNoArguments.join('\n    - ')}`);
+      }
+
+      // Warning for non-data components with queries
+      if (!isDataComponent) {
+        warnings.push(`Warning: File "${filePath}" is a non-data component (not listed in routes.json) but is using queries.`);
+      }
+
+      // Display queries first, then display all warnings together
+      if (warnings.length > 0) {
+        console.log('----------------------------------------------------');
+        console.log(`File: ${filePath}`);
+        console.log('Queries:');
+        usedQueries.forEach(query => console.log(`  - ${query.fullMatch}`)); // Display full query details
+        console.log('\nWarnings:');
+        warnings.forEach(warning => console.log(`  - ${warning}`));
+        console.log('----------------------------------------------------\n');
+      }
+    }
+  } catch (err) {
+    console.error(`Error reading file: ${filePath}`, err);
+  }
+}
+
+// Check in a single package
+async function checkPackage(packageDir, packageName) {
+  const routesFile = path.resolve(path.join(packageDir, './lib/routes.json'));
+  const sourceDir = path.resolve(path.join(packageDir, './src'));
+  let componentQueries = {};
+
+  if (fs.existsSync(routesFile)) {
+    console.log(`Extracting component paths and queries from ${routesFile}...`);
+    componentQueries = await extractComponentPathsAndQueries(routesFile, packageName);
+  }
+
+  console.log(`Searching for query usage in files under ${sourceDir}...`);
+  await checkFiles(sourceDir, componentQueries);
+}
+
+// Run the script
+(async () => {
+  console.log('Checking useQuery usage ...');
+
+  const packageJsonFiles = await findPackageJsonFiles();
+  for (const file of packageJsonFiles) {
+    const packageJson = JSON.parse(fs.readFileSync(file, 'utf8'));
+    const packageDir = path.dirname(file);
+    await checkPackage(packageDir, packageJson.name);
+  }
+
+  console.log('Completed checking useQuery usage.');
+})();

package/lib/generators/add-frontend/templates/tools/mergeConfig.js

@@ -1,10 +1,11 @@
 import fs from 'fs';
 import path from 'path';
 import { setupConfig } from '@common-stack/rollup-vite-utils/lib/utils/setupConfig.js';
-import projectConfig from '../config.json' assert { type: 'json' };
+import { updateFromConfig } from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginUpdateFromConfig.js';
+const projectConfigPath = path.resolve('./config.json');
 
 // Function to merge configurations
-const mergeConfigs = setupConfig(projectConfig);
+const mergeConfigs = setupConfig(projectConfigPath);
 
 // Ensure the 'app' directory exists
 const appDir = path.resolve('app');
@@ -32,3 +33,5 @@ if (!gitignoreContent.includes('app')) {
   fs.appendFileSync(gitignorePath, '\napp\n');
   console.log('Added "app" to .gitignore');
 }
+
+updateFromConfig(finalConfigPath);

package/lib/generators/add-frontend/templates/vite.config.ts.template

@@ -14,24 +14,62 @@ import config from './app/cde-webconfig.json' assert { type: 'json' };
 
 // This installs globals such as "fetch", "Response", "Request" and "Headers".
 installGlobals();
+
 const directoryName = dirname(fileURLToPath(import.meta.url));
 
-export default defineConfig(({ isSsrBuild }) => {
-    console.log('---IS SSR BUILD', isSsrBuild);
+export default defineConfig(async ({ isSsrBuild }) => {
+    console.log('--- IS SSR BUILD:', isSsrBuild);
 
+    // Load environment variables from dotenv or other config
     const dotEnvResult = loadEnvConfig(directoryName);
 
+    // Define environment variables for Vite
+    const envVariables = {
+        __ENV__: JSON.stringify(dotEnvResult?.parsed),
+        __SERVER__: true,
+        __CLIENT__: false,
+        ...Object.fromEntries(
+            Object.entries(config.buildConfig).map(([key, value]) => [
+                key,
+                typeof value === 'string' ? `"${value.replace(/\\/g, '\\\\')}"` : value,
+            ])
+        ),
+    };
+
+    // Define routes configuration
+    const routesConfig = async (defineRoutes) => {
+        // In production, perform required file copy operations
+        if (process.env.NODE_ENV === 'production') {
+            await performCopyOperations(config);
+        }
+
+        // Load metadata for routes
+        let metaJson = null;
+        try {
+            metaJson = await import('./app/sync-meta.json');
+        } catch {
+            console.warn('No sync-meta.json found, continuing without metadata.');
+        }
+
+        // Return routes definition
+        return defineRoutes((routeFn) =>
+            defineRoutesConfig(
+                routeFn,
+                {
+                    routesFileName: 'routes.json',
+                    packages: config.modules,
+                    paths: config.paths,
+                    iconsRepository: config?.iconsRepository,
+                    rootPath: resolve(directoryName, '../..'),
+                },
+                metaJson
+            )
+        );
+    };
+
+    // Vite configuration
     const viteConfig = {
-        define: {
-            __ENV__: JSON.stringify(dotEnvResult?.parsed),
-            ...Object.assign(
-                ...Object.entries(config.buildConfig).map(([k, v]) => ({
-                    [k]: typeof v !== 'string' ? v : `"${v.replace(/\\/g, '\\\\')}"`,
-                    __SERVER__: true,
-                    __CLIENT__: false,
-                }))
-            ),
-        },
+        define: envVariables,
         plugins: [
             i18nInternationalizationPlugin({
                 folderName: 'cdm-locales',
@@ -43,31 +81,14 @@ export default defineConfig(({ isSsrBuild }) => {
             }),
             remix({
                 appDirectory: 'src',
-                routes: async (defineRoutes) => {
-                    if (process.env.NODE_ENV === 'production') {
-                        await performCopyOperations(config);
-                    }
-                    const metaJson = await import('./app/sync-meta.json').catch(() => null);
-                    return defineRoutes((routeFn) => {
-                        defineRoutesConfig(
-                            routeFn,
-                            {
-                                routesFileName: 'routes.json',
-                                packages: config.modules,
-                                paths: config.paths,
-                                rootPath: resolve(directoryName, '../..'),
-                            },
-                            metaJson,
-                        );
-                    });
-                },
+                routes: routesConfig,
             }),
             tsconfigPaths({ ignoreConfigErrors: true }),
         ],
         resolve: {
             alias: {
-                '@app': resolve(__dirname, 'app'),
-                '@src': resolve(__dirname, 'src'),
+                '@app': resolve(directoryName, 'app'),
+                '@src': resolve(directoryName, 'src'),
             },
         },
     };

package/lib/generators/add-fullstack/files/Jenkinsfile

@@ -13,23 +13,23 @@ pipeline {
     string(name: 'CONNECTION_ID', defaultValue: 'test', description: 'connection id', trim: true)
     string(name: 'WORKSPACE_ID', defaultValue: 'fullstack-pro', description: 'workspace id', trim: true)
     string(name: 'UNIQUE_NAME', defaultValue: 'default', description: 'chart name', trim: true)
-    string(name: 'VERSION', defaultValue: 'v3', description: 'version of the deployment', trim: true)
+    string(name: 'VERSION', defaultValue: 'v1', description: 'version of the deployment', trim: true)
     string(name: 'HEMERA_LOG_LEVEL', defaultValue: 'info', description: 'log level for hemera')
     string(name: 'LOG_LEVEL', defaultValue: 'info', description: 'log level')
     string(name: 'DEPLOYMENT_PATH', defaultValue: '/servers', description: 'folder path to load helm charts')
-    string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish3', description: 'the publish branch for packages release')
+    string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish', description: 'the publish branch for packages release')
     string(name: 'EXCLUDE_SETTING_NAMESPACE_FILTER', defaultValue: 'brigade', description: 'exclude setting namespace that matches search string')
     string(name: 'GIT_CREDENTIAL_ID', defaultValue: 'fullstack-pro-github-deploy-key', description: 'jenkins credential id of git deploy secret')
     string(name: 'BUILD_MODULE_TO_INCLUDE', defaultValue: '@sample-stack*', description: 'build env')
     string(name: 'REPOSITORY_SSH_URL', defaultValue: 'git@github.com:CDEBase/fullstack-pro.git', description: 'ssh url of the git repository')
-    string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop3', description: 'the branch with changes')
-    string(name: 'DEVELOP_BRANCH', defaultValue: 'develop3', description: 'the branch for the development')
+    string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop', description: 'the branch with changes')
+    string(name: 'DEVELOP_BRANCH', defaultValue: 'develop', description: 'the branch for the development')
     string(name: 'MASTER_BRANCH', defaultValue: 'master', description: 'Master branch as default branch for production.')
 
     // by default first value of the choice will be choosen
     choice choices: ['auto', 'force'], description: 'Choose merge strategy', name: 'NPM_PUBLISH_STRATEGY'
     choice choices: ['yarn', 'npm'], description: 'Choose build strategy', name: 'BUILD_STRATEGY'
-    choice choices: ['0.7.9','0.7.7', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
+    choice choices: ['0.7.11','0.7.9', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
     choice choices: ['nodejs20', 'nodejs18', 'nodejs22'], description: 'Choose NodeJS version', name: 'NODEJS_TOOL_VERSION'    
     choice choices: ['buildOnly', 'buildAndTest', 'buildAndPublish',  'mobileBuild', 'mobilePreview', 'mobilePreviewLocal', 'mobilePreviewSubmit', 'mobileProd', 'mobileProdSubmit', 'devDeployOnly', 'stageDeploy', 'stageDeployOnly', 'prodDeploy', 'prodDeployOnly', 'allenv'], description: 'Where to deploy micro services?', name: 'ENV_CHOICE'
     choice choices: ['all', 'ios', 'android' ], description: 'Mobile type if it is mobile build?', name: 'MOBILE_CHOICE'
@@ -100,9 +100,9 @@ pipeline {
             rm .npmrc
             npx lerna exec --scope=*mobile-device ${params.BUILD_STRATEGY} ${env.BUILD_COMMAND}
             git checkout -- .npmrc
+            yarn git:pull
             yarn gitcommit
-            git pull origin ${params.REPOSITORY_BRANCH}
-            git push origin ${params.REPOSITORY_BRANCH}
+            yarn git:push
           """
         }
       }