@ronas-it/nx-generators 0.12.1 → 0.13.0

package/README.md

@@ -1,10 +1,10 @@
-# NX Generators
+# Nx Generators
 
-NX generators for Ronas IT projects.
+Nx generators for Ronas IT projects.
 
 ## Usage
 
-1. Create monorepo with Expo app using [NX Expo preset](https://nx.dev/nx-api/expo) or with Next.js app using [NX Next preset](https://nx.dev/nx-api/next):
+1. Create monorepo with Expo app using [Nx Expo preset](https://nx.dev/nx-api/expo) or with Next.js app using [Nx Next preset](https://nx.dev/nx-api/next):
 
 ```sh
 # For Expo app:
@@ -64,7 +64,7 @@ Note: each generator accepts the `--help` argument to see generator instructions
 
 ### 1. `repo-config`
 
-Setups the monorepo structure for development.
+Sets up the monorepo structure for development.
 
 ### 2. `code-checks`
 
@@ -120,7 +120,7 @@ npx nx g next-app my-app web
 
 ### 5. `react-lib`
 
-Generates a library according to [NX notation](https://nx.dev/concepts/more-concepts/applications-and-libraries).
+Generates a library according to [Nx notation](https://nx.dev/concepts/more-concepts/applications-and-libraries).
 
 #### Options
 
@@ -210,7 +210,7 @@ npx nx g lib-remove --libName="mobile-account-features-profile-settings"
 
 ### 9. `lib-tags`
 
-Checks and configures [NX library tags](https://nx.dev/features/enforce-module-boundaries). If your project does not already use library tags, you can add them using this generator.
+Checks and configures [Nx library tags](https://nx.dev/features/enforce-module-boundaries). If your project does not already use library tags, you can add them using this generator.
 
 #### Options
 

package/generators.json

@@ -3,82 +3,82 @@
     "code-checks": {
       "factory": "./src/generators/code-checks/generator",
       "schema": "./src/generators/code-checks/schema.json",
-      "description": "code-checks generator"
+      "description": "Configures code checks and formatting with pre-commit hook"
     },
     "expo-app": {
       "factory": "./src/generators/expo-app/generator",
       "schema": "./src/generators/expo-app/schema.json",
-      "description": "expo-app generator"
+      "description": "Generates and configures an Expo React Native app"
     },
     "next-app": {
       "factory": "./src/generators/next-app/generator",
       "schema": "./src/generators/next-app/schema.json",
-      "description": "next-app generator"
+      "description": "Generates and configures a Next.js app"
     },
     "repo-config": {
       "factory": "./src/generators/repo-config/generator",
       "schema": "./src/generators/repo-config/schema.json",
-      "description": "repo-config generator"
+      "description": "Sets up the monorepo structure for development"
     },
     "react-lib": {
       "factory": "./src/generators/react-lib/generator",
       "schema": "./src/generators/react-lib/schema.json",
-      "description": "react-lib generator"
+      "description": "Generates a library according to Nx notation"
     },
     "react-component": {
       "factory": "./src/generators/react-component/generator",
       "schema": "./src/generators/react-component/schema.json",
-      "description": "react-component generator"
+      "description": "Creates a React component in particular library"
     },
     "sentry": {
       "factory": "./src/generators/sentry/generator",
       "schema": "./src/generators/sentry/schema.json",
-      "description": "sentry generator"
+      "description": "Creates Sentry integration for Expo/Next application"
     },
     "ui-kitten": {
       "factory": "./src/shared/generators/ui-kitten/generator",
       "schema": "./src/shared/generators/ui-kitten/schema.json",
-      "description": "UI-Kitten generator for Expo projects"
+      "description": "Installs and configures UI-Kitten for Expo application"
     },
     "entity-api": {
       "factory": "./src/generators/entity-api/generator",
       "schema": "./src/generators/entity-api/schema.json",
-      "description": "entity-api generator"
+      "description": "Creates an API with related entities in API library. It also updates redux store middlewares, reducers"
     },
     "store": {
       "factory": "./src/shared/generators/store/generator",
       "schema": "./src/shared/generators/store/schema.json",
-      "description": "redux store generator"
+      "description": "Installs and configures redux store for Expo/Next application"
     },
     "form": {
       "factory": "./src/generators/form/generator",
       "schema": "./src/generators/form/schema.json",
-      "description": "form generator"
+      "description": "Generates a form schema class and adds its usage to a component or a hook"
     },
     "lib-tags": {
       "factory": "./src/generators/lib-tags/generator",
       "schema": "./src/generators/lib-tags/schema.json",
-      "description": "lib-tags generator"
+      "description": "Checks and configures Nx library tags"
     },
     "lib-rename": {
       "factory": "./src/generators/lib-rename/generator",
       "schema": "./src/generators/lib-rename/schema.json",
-      "description": "library rename utility"
+      "description": "Renames an existing library and updates imports"
     },
     "lib-move": {
       "factory": "./src/generators/lib-move/generator",
       "schema": "./src/generators/lib-move/schema.json",
-      "description": "library move utility"
+      "description": "Moves the library to a new destination."
     },
     "lib-remove": {
       "factory": "./src/generators/lib-remove/generator",
       "schema": "./src/generators/lib-remove/schema.json",
-      "description": "library remove utility"
+      "description": "Removes the library. Before deleting a library you must remove all references to it"
     },
     "auth": {
       "factory": "./src/shared/generators/auth/generator",
       "schema": "./src/shared/generators/auth/schema.json",
-      "description": "authentication library for Expo projects"
+      "description": "Creates auth related api libs and configures redux store "
     }
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ronas-it/nx-generators",
-  "version": "0.12.1",
-  "description": "NX generators for Ronas IT projects",
+  "version": "0.13.0",
+  "description": "Nx generators for Ronas IT projects",
   "license": "MIT",
   "author": "Ronas IT",
   "bugs": {

package/src/generators/code-checks/files/.eslint.ronasit.cjs.template

@@ -86,7 +86,24 @@ module.exports = [
 
       'react/react-in-jsx-scope': 'off',
       '@stylistic/arrow-parens': ['warn', 'always'],
-      '@stylistic/comma-dangle': ['warn', 'never'],
+      '@stylistic/arrow-spacing': ['warn', { before: true, after: true }],
+      '@stylistic/block-spacing': ['warn', 'always'],
+      '@stylistic/brace-style': ['warn', '1tbs'],
+      '@stylistic/comma-spacing': ['warn', { before: false, after: true }],
+      '@stylistic/eol-last': ['warn', 'always'],
+      '@stylistic/func-call-spacing': ['warn', 'never'],
+      '@stylistic/key-spacing': ['warn', { beforeColon: false, afterColon: true }],
+      '@stylistic/keyword-spacing': ['warn', { before: true, after: true }],
+      '@stylistic/no-whitespace-before-property': 'warn',
+      '@stylistic/space-before-blocks': ['warn', 'always'],
+      '@stylistic/space-infix-ops': 'warn',
+      '@stylistic/switch-colon-spacing': ['warn', { after: true, before: false }],
+      '@stylistic/member-delimiter-style': 'warn',
+      '@stylistic/type-annotation-spacing': 'warn',
+      '@stylistic/jsx-equals-spacing': ['warn', 'never'],
+      '@stylistic/jsx-indent-props': ['warn', 2],
+      '@stylistic/jsx-props-no-multi-spaces': 'warn',
+      '@stylistic/type-named-tuple-spacing': 'warn',
       'no-var': 'warn',
       'no-dupe-class-members': 'off',
       'import/prefer-default-export': 'off',

package/src/generators/code-checks/files/eslint.config.cjs.template

@@ -33,171 +33,13 @@ module.exports = [
 
     rules: {
       '@stylistic/array-bracket-newline': 'off',
-      '@stylistic/array-bracket-spacing': 'off',
-      '@stylistic/array-element-newline': 'off',
-      '@stylistic/arrow-parens': 'off',
-      '@stylistic/arrow-spacing': 'off',
-      '@stylistic/block-spacing': 'off',
-      '@stylistic/brace-style': 'off',
-      '@stylistic/comma-dangle': 'off',
-      '@stylistic/comma-spacing': 'off',
-      '@stylistic/comma-style': 'off',
-      '@stylistic/computed-property-spacing': 'off',
-      '@stylistic/dot-location': 'off',
-      '@stylistic/eol-last': 'off',
-      '@stylistic/func-call-spacing': 'off',
-      '@stylistic/function-call-argument-newline': 'off',
-      '@stylistic/function-call-spacing': 'off',
-      '@stylistic/function-paren-newline': 'off',
-      '@stylistic/generator-star-spacing': 'off',
       '@stylistic/implicit-arrow-linebreak': 'off',
       '@stylistic/indent': 'off',
-      '@stylistic/jsx-quotes': 'off',
-      '@stylistic/key-spacing': 'off',
-      '@stylistic/keyword-spacing': 'off',
-      '@stylistic/linebreak-style': 'off',
-      '@stylistic/max-statements-per-line': 'off',
-      '@stylistic/multiline-ternary': 'off',
-      '@stylistic/new-parens': 'off',
-      '@stylistic/newline-per-chained-call': 'off',
-      '@stylistic/no-extra-parens': 'off',
-      '@stylistic/no-extra-semi': 'off',
-      '@stylistic/no-floating-decimal': 'off',
-      '@stylistic/no-mixed-spaces-and-tabs': 'off',
-      '@stylistic/no-multi-spaces': 'off',
-      '@stylistic/no-multiple-empty-lines': 'off',
-      '@stylistic/no-trailing-spaces': 'off',
-      '@stylistic/no-whitespace-before-property': 'off',
-      '@stylistic/nonblock-statement-body-position': 'off',
-      '@stylistic/object-curly-newline': 'off',
-      '@stylistic/object-curly-spacing': 'off',
-      '@stylistic/object-property-newline': 'off',
-      '@stylistic/one-var-declaration-per-line': 'off',
-      '@stylistic/operator-linebreak': 'off',
-      '@stylistic/padded-blocks': 'off',
-      '@stylistic/quote-props': 'off',
-      '@stylistic/rest-spread-spacing': 'off',
-      '@stylistic/semi': 'off',
-      '@stylistic/semi-spacing': 'off',
-      '@stylistic/semi-style': 'off',
-      '@stylistic/space-before-blocks': 'off',
-      '@stylistic/space-before-function-paren': 'off',
-      '@stylistic/space-in-parens': 'off',
-      '@stylistic/space-infix-ops': 'off',
-      '@stylistic/space-unary-ops': 'off',
-      '@stylistic/switch-colon-spacing': 'off',
-      '@stylistic/template-curly-spacing': 'off',
-      '@stylistic/template-tag-spacing': 'off',
-      '@stylistic/wrap-iife': 'off',
-      '@stylistic/wrap-regex': 'off',
-      '@stylistic/yield-star-spacing': 'off',
-      '@stylistic/member-delimiter-style': 'off',
-      '@stylistic/type-annotation-spacing': 'off',
-      '@stylistic/jsx-child-element-spacing': 'off',
-      '@stylistic/jsx-closing-bracket-location': 'off',
-      '@stylistic/jsx-closing-tag-location': 'off',
-      '@stylistic/jsx-curly-newline': 'off',
-      '@stylistic/jsx-curly-spacing': 'off',
-      '@stylistic/jsx-equals-spacing': 'off',
-      '@stylistic/jsx-first-prop-new-line': 'off',
       '@stylistic/jsx-indent': 'off',
-      '@stylistic/jsx-indent-props': 'off',
-      '@stylistic/jsx-max-props-per-line': 'off',
-      '@stylistic/jsx-newline': 'off',
-      '@stylistic/jsx-one-expression-per-line': 'off',
-      '@stylistic/jsx-props-no-multi-spaces': 'off',
-      '@stylistic/jsx-tag-spacing': 'off',
-      '@stylistic/jsx-wrap-multilines': 'off',
       '@stylistic/indent-binary-ops': 'off',
-      '@stylistic/type-generic-spacing': 'off',
-      '@stylistic/type-named-tuple-spacing': 'off',
-      '@stylistic/js/array-bracket-newline': 'off',
-      '@stylistic/js/array-bracket-spacing': 'off',
-      '@stylistic/js/array-element-newline': 'off',
-      '@stylistic/js/arrow-parens': 'off',
-      '@stylistic/js/arrow-spacing': 'off',
-      '@stylistic/js/block-spacing': 'off',
-      '@stylistic/js/brace-style': 'off',
-      '@stylistic/js/comma-dangle': 'off',
-      '@stylistic/js/comma-spacing': 'off',
-      '@stylistic/js/comma-style': 'off',
-      '@stylistic/js/computed-property-spacing': 'off',
-      '@stylistic/js/dot-location': 'off',
-      '@stylistic/js/eol-last': 'off',
-      '@stylistic/js/func-call-spacing': 'off',
-      '@stylistic/js/function-call-argument-newline': 'off',
-      '@stylistic/js/function-call-spacing': 'off',
-      '@stylistic/js/function-paren-newline': 'off',
-      '@stylistic/js/generator-star-spacing': 'off',
-      '@stylistic/js/implicit-arrow-linebreak': 'off',
-      '@stylistic/js/indent': 'off',
-      '@stylistic/js/jsx-quotes': 'off',
-      '@stylistic/js/key-spacing': 'off',
-      '@stylistic/js/keyword-spacing': 'off',
-      '@stylistic/js/linebreak-style': 'off',
-      '@stylistic/js/max-statements-per-line': 'off',
-      '@stylistic/js/multiline-ternary': 'off',
-      '@stylistic/js/new-parens': 'off',
-      '@stylistic/js/newline-per-chained-call': 'off',
-      '@stylistic/js/no-extra-parens': 'off',
-      '@stylistic/js/no-extra-semi': 'off',
-      '@stylistic/js/no-floating-decimal': 'off',
-      '@stylistic/js/no-mixed-spaces-and-tabs': 'off',
-      '@stylistic/js/no-multi-spaces': 'off',
-      '@stylistic/js/no-multiple-empty-lines': 'off',
-      '@stylistic/js/no-trailing-spaces': 'off',
-      '@stylistic/js/no-whitespace-before-property': 'off',
-      '@stylistic/js/nonblock-statement-body-position': 'off',
-      '@stylistic/js/object-curly-newline': 'off',
-      '@stylistic/js/object-curly-spacing': 'off',
-      '@stylistic/js/object-property-newline': 'off',
-      '@stylistic/js/one-var-declaration-per-line': 'off',
-      '@stylistic/js/operator-linebreak': 'off',
-      '@stylistic/js/padded-blocks': 'off',
-      '@stylistic/js/quote-props': 'off',
-      '@stylistic/js/rest-spread-spacing': 'off',
-      '@stylistic/js/semi': 'off',
-      '@stylistic/js/semi-spacing': 'off',
-      '@stylistic/js/semi-style': 'off',
-      '@stylistic/js/space-before-blocks': 'off',
-      '@stylistic/js/space-before-function-paren': 'off',
-      '@stylistic/js/space-in-parens': 'off',
-      '@stylistic/js/space-infix-ops': 'off',
-      '@stylistic/js/space-unary-ops': 'off',
-      '@stylistic/js/switch-colon-spacing': 'off',
-      '@stylistic/js/template-curly-spacing': 'off',
-      '@stylistic/js/template-tag-spacing': 'off',
-      '@stylistic/js/wrap-iife': 'off',
-      '@stylistic/js/wrap-regex': 'off',
-      '@stylistic/js/yield-star-spacing': 'off',
-      '@stylistic/ts/block-spacing': 'off',
-      '@stylistic/ts/brace-style': 'off',
-      '@stylistic/ts/comma-dangle': 'off',
-      '@stylistic/ts/comma-spacing': 'off',
-      '@stylistic/ts/func-call-spacing': 'off',
-      '@stylistic/ts/function-call-spacing': 'off',
-      '@stylistic/ts/indent': 'off',
-      '@stylistic/ts/key-spacing': 'off',
-      '@stylistic/ts/keyword-spacing': 'off',
-      '@stylistic/ts/member-delimiter-style': 'off',
-      '@stylistic/ts/no-extra-parens': 'off',
-      '@stylistic/ts/no-extra-semi': 'off',
-      '@stylistic/ts/object-curly-spacing': 'off',
-      '@stylistic/ts/semi': 'off',
-      '@stylistic/ts/space-before-blocks': 'off',
-      '@stylistic/ts/space-before-function-paren': 'off',
-      '@stylistic/ts/space-infix-ops': 'off',
-      '@stylistic/ts/type-annotation-spacing': 'off',
-      '@stylistic/jsx/jsx-child-element-spacing': 'off',
-      '@stylistic/jsx/jsx-closing-bracket-location': 'off',
-      '@stylistic/jsx/jsx-closing-tag-location': 'off',
-      '@stylistic/jsx/jsx-curly-newline': 'off',
-      '@stylistic/jsx/jsx-curly-spacing': 'off',
-      '@stylistic/jsx/jsx-equals-spacing': 'off',
-      '@stylistic/jsx/jsx-first-prop-new-line': 'off',
-      '@stylistic/jsx/jsx-indent': 'off',
-      '@stylistic/jsx/jsx-indent-props': 'off',
-      '@stylistic/jsx/jsx-max-props-per-line': 'off',
+      '@stylistic/newline-per-chained-call': 'off',
+      '@stylistic/function-paren-newline': 'off',
+      '@stylistic/function-call-argument-newline': 'off',
     },
   },
   eslintConfigPrettier,

package/src/generators/code-checks/generator.js

@@ -9,12 +9,13 @@ const dependencies_1 = require("../../shared/dependencies");
 const config_1 = require("./config");
 const scripts_1 = require("./scripts");
 function codeChecksGenerator(tree, options) {
-    var _a;
+    var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const projectRoot = '.';
         // Delete files
         tree.delete('.eslintrc.json');
         tree.delete('eslint.config.cjs');
+        tree.delete('eslint.config.mjs');
         tree.delete('.prettierrc');
         // Configure pre-commit hook
         (0, child_process_1.execSync)('npx mrm@2 lint-staged', { stdio: 'inherit' });
@@ -29,6 +30,9 @@ function codeChecksGenerator(tree, options) {
         // Update .gitignore
         const gitignoreContent = ((_a = tree.read('.gitignore')) === null || _a === void 0 ? void 0 : _a.toString()) + '\n.eslintcache\n';
         tree.write('.gitignore', gitignoreContent);
+        // Update .prettierignore
+        const prettierignoreContent = ((_b = tree.read('.prettierignore')) === null || _b === void 0 ? void 0 : _b.toString()) + '# Files with custom rules\n**/actions.ts\n**/epics.ts\n**/selectors.ts\n';
+        tree.write('.prettierignore', prettierignoreContent);
         // Add files
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), projectRoot, options);
         // Install necessary dependencies

package/src/generators/code-checks/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAQoB;AACpB,4DAA4D;AAC5D,qCAA8B;AAE9B,uCAAgC;AAEhC,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAkC;;;QACtF,MAAM,WAAW,GAAG,GAAG,CAAC;QAExB,eAAe;QACf,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE3B,4BAA4B;QAC5B,IAAA,wBAAQ,EAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAExD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,WAAW,CAAC,aAAa,CAAC,GAAG,gBAAM,CAAC,aAAa,CAAC,CAAC;QACnD,WAAW,CAAC,OAAO,mCAAQ,iBAAO,GAAK,WAAW,CAAC,OAAO,CAAE,CAAC;QAC7D,IAAA,kBAAS,EAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAE7C,4BAA4B;QAC5B,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAC1D,YAAY,CAAC,eAAe,mCAAQ,gBAAM,CAAC,QAAQ,GAAK,YAAY,CAAC,eAAe,CAAE,CAAC;QACvF,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAEpD,oBAAoB;QACpB,MAAM,gBAAgB,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,0CAAE,QAAQ,EAAE,IAAG,kBAAkB,CAAC;QAClF,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAE3C,YAAY;QACZ,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAEzE,iCAAiC;QACjC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,8BAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEvE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;;CACH;AApCD,kDAoCC;AAED,kBAAe,mBAAmB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAQoB;AACpB,4DAA4D;AAC5D,qCAA8B;AAE9B,uCAAgC;AAEhC,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAkC;;;QACtF,MAAM,WAAW,GAAG,GAAG,CAAC;QAExB,eAAe;QACf,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE3B,4BAA4B;QAC5B,IAAA,wBAAQ,EAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAExD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,WAAW,CAAC,aAAa,CAAC,GAAG,gBAAM,CAAC,aAAa,CAAC,CAAC;QACnD,WAAW,CAAC,OAAO,mCAAQ,iBAAO,GAAK,WAAW,CAAC,OAAO,CAAE,CAAC;QAC7D,IAAA,kBAAS,EAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;QAE7C,4BAA4B;QAC5B,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAC1D,YAAY,CAAC,eAAe,mCAAQ,gBAAM,CAAC,QAAQ,GAAK,YAAY,CAAC,eAAe,CAAE,CAAC;QACvF,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAEpD,oBAAoB;QACpB,MAAM,gBAAgB,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,0CAAE,QAAQ,EAAE,IAAG,kBAAkB,CAAC;QAClF,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAE3C,yBAAyB;QACzB,MAAM,qBAAqB,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,0CAAE,QAAQ,EAAE,IAAG,0EAA0E,CAAC;QACpJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;QAErD,YAAY;QACZ,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAEzE,iCAAiC;QACjC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,8BAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEvE,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;;CACH;AAzCD,kDAyCC;AAED,kBAAe,mBAAmB,CAAC"}

package/src/generators/entity-api/schema.json

@@ -6,12 +6,21 @@
   "properties": {
     "name": {
       "type": "string",
-      "description": "Name of the entity",
+      "description": "Name of the entity (e.g. User)",
       "default": "",
       "$default": {
         "$source": "argv",
         "index": 0
       }
+    },
+    "baseEndpoint": {
+      "type": "string",
+      "description": "Base API endpoint (e.g. /users)",
+      "default": "",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      }
     }
   },
   "required": []

package/src/generators/expo-app/app-files/app/_layout.tsx.template

@@ -1,7 +1,7 @@
-<% if(isStoreEnabled) { %> import { store } from '<%= formatDirectory() %>/shared/data-access/store';<% } %>
+<% if(isStoreEnabled) { %> import { store } from '<%= libPath %>/shared/data-access/store';<% } %>
 import { setLanguage } from '@ronas-it/react-native-common-modules';
 <% if(isUIKittenEnabled) { %>
-import { UserThemeProvider } from '<%= formatDirectory() %>/shared/features/user-theme-provider';
+import { UserThemeProvider } from '<%= libPath %>/shared/features/user-theme-provider';
 <% } %>
 <% if(isStoreEnabled) { %>import { storeActions } from '@ronas-it/rtkq-entity-api';<% } %>
 import { Stack } from 'expo-router';

package/src/generators/expo-app/app-files/app/index.tsx.template

@@ -1,6 +1,6 @@
 import { ReactElement } from 'react';
 import { View, Text } from 'react-native';
-import { createStyles } from '<%= formatDirectory() %>/shared/ui/styles';
+import { createStyles } from '<%= libPath %>/shared/ui/styles';
 
 export default function RootScreen(): ReactElement {
   return (

package/src/generators/expo-app/generator.js

@@ -72,7 +72,8 @@ function expoAppGenerator(tree, options) {
         (0, devkit_1.writeJson)(tree, appPackagePath, appPackageJson);
         // Add app files
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'app-files'), appRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
-            formatAppIdentifier: utils_1.formatAppIdentifier, formatDirectory: () => libPath, isUIKittenEnabled: shouldGenerateUIKittenLib, isStoreEnabled: shouldGenerateStoreLib, appDirectory: options.directory }));
+            formatAppIdentifier: utils_1.formatAppIdentifier,
+            libPath, isUIKittenEnabled: shouldGenerateUIKittenLib, isStoreEnabled: shouldGenerateStoreLib, appDirectory: options.directory }));
         (0, utils_1.addNxAppTag)(tree, options.directory);
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'i18n'), i18nRoot, {});
         // Add dependencies
@@ -83,7 +84,7 @@ function expoAppGenerator(tree, options) {
             (0, devkit_1.installPackagesTask)(tree);
             (0, child_process_1.execSync)('npx expo install --fix', { stdio: 'inherit' });
             if (shouldGenerateAuthLibs) {
-                (0, child_process_1.execSync)(`npx nx g auth ${options.name} ${options.directory}`, {
+                (0, child_process_1.execSync)(`npx nx g auth ${options.directory}`, {
                     stdio: 'inherit',
                 });
             }
@@ -92,6 +93,7 @@ function expoAppGenerator(tree, options) {
                     stdio: 'inherit',
                 });
             }
+            (0, child_process_1.execSync)('npx nx g lib-tags --skipRepoCheck', { stdio: 'inherit' });
         };
     });
 }

package/src/generators/expo-app/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/expo-app/schema.json

@@ -6,7 +6,7 @@
   "properties": {
     "name": {
       "type": "string",
-      "description": "",
+      "description": "Name of the app (e.g: my-app)",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -15,7 +15,7 @@
     },
     "directory": {
       "type": "string",
-      "description": "",
+      "description": "A directory name for the app in the 'apps/' folder (e.g: mobile)",
       "$default": {
         "$source": "argv",
         "index": 1
@@ -24,6 +24,7 @@
     },
     "withSentry": {
       "type": "boolean",
+      "description": "Add Sentry to the app",
       "default": false,
       "x-prompt": "Do you want to use Sentry in your app?"
     }

package/src/generators/lib-tags/schema.json

@@ -6,12 +6,12 @@
   "properties": {
     "silent": {
       "type": "boolean",
-      "description": "",
+      "description": "Disable log",
       "$default": false
     },
     "skipRepoCheck": {
       "type": "boolean",
-      "description": "",
+      "description": "Disable unstaged changes check",
       "$default": false
     }
   },

package/src/generators/next-app/files/app/[locale]/layout.tsx.template

@@ -1,8 +1,11 @@
+import { pick } from 'lodash';
 import { notFound } from 'next/navigation';
-import { unstable_setRequestLocale } from 'next-intl/server';
+import { NextIntlClientProvider } from 'next-intl';
+import { getMessages, setRequestLocale } from 'next-intl/server';
 import { ReactElement, ReactNode } from 'react';
-import { constants, Locale } from '../../constants';
-import { Providers } from './providers';
+import { constants } from '../../constants';
+<% if(hasProviders) { %> import { Providers } from './providers';<% } %>
+import type { Locale } from '<%= libPath %>/shared/utils/i18n';
 
 export const metadata = {
   title: '<%= formatName(name) %>',
@@ -10,7 +13,7 @@ export const metadata = {
 
 export interface RootLayoutProps {
   children: ReactNode;
-  params: { locale: Locale };
+  params: Promise<{ locale: Locale }>;
 }
 
 const locales = constants.locales;
@@ -18,15 +21,16 @@ const locales = constants.locales;
 export const generateStaticParams = (): Array<{ locale: Locale }> =>
   locales.map((locale) => ({ locale }));
 
-export default function RootLayout({
-  children,
-  params: { locale },
-}: RootLayoutProps): ReactElement {
+export default async function RootLayout({ children, params }: RootLayoutProps): Promise<ReactElement> {
+  const { locale } = await params;
+
   if (!locales.includes(locale)) {
     notFound();
   }
 
-  unstable_setRequestLocale(locale);
+  setRequestLocale(locale);
+
+  const messages = await getMessages();
 
   return (
     <html lang={locale}>
@@ -41,7 +45,11 @@ export default function RootLayout({
         />
       </head>
       <body>
-        <Providers>{children}</Providers>
+        <% if(hasProviders) { %><Providers><% } %>
+        <NextIntlClientProvider messages={pick(messages, 'web-shared')} locale={locale}>
+          {children}
+        </NextIntlClientProvider>
+        <% if(hasProviders) { %></Providers><% } %>
       </body>
     </html>
   );

package/src/generators/next-app/files/app/[locale]/page.tsx.template

@@ -1,18 +1,8 @@
 import { useTranslations } from 'next-intl';
-import { unstable_setRequestLocale } from 'next-intl/server';
 import { ReactElement } from 'react';
-import { Locale } from '../../constants';
 
-export interface IndexPageProps {
-  params: { locale: Locale };
-}
-
-export default function Index({
-  params: { locale },
-}: IndexPageProps): ReactElement {
-  unstable_setRequestLocale(locale);
-
-  const t = useTranslations('HOME_PAGE');
+export default function Index(): ReactElement {
+  const t = useTranslations('web-shared.HOME_PAGE');
 
   return <div>{t('HOME_PAGE_TEXT')}</div>;
 }

package/src/generators/next-app/files/app/[locale]/providers.tsx.template

@@ -1,16 +1,13 @@
-import { NextIntlClientProvider, useMessages } from 'next-intl';
-import { ReactElement } from 'react';
+'use client';
 
-export function Providers({
-  children,
-}: {
-  children: React.ReactNode;
-}): ReactElement {
-  const messages = useMessages();
+import { ReactElement } from 'react';
+import { Provider } from 'react-redux';
+<% if(isStoreEnabled) { %> import { store } from '<%= libPath %>/shared/data-access/store';<% } %>
 
+export function Providers({ children }: { children: React.ReactNode }): ReactElement {
   return (
-    <NextIntlClientProvider messages={messages}>
+    <% if(isStoreEnabled) { %><Provider store={store}><% } %>
       {children}
-    </NextIntlClientProvider>
+    <% if(isStoreEnabled) { %></Provider><% } %>
   );
 }