@ronas-it/nx-generators 0.12.2 → 0.13.0

package/src/generators/next-app/files/i18n/request.ts.template

@@ -0,0 +1,18 @@
+import { getRequestConfig } from 'next-intl/server';
+import { constants } from '../constants';
+import type { Locale } from '<%= libPath %>/shared/utils/i18n';
+
+export default getRequestConfig(async ({ requestLocale }) => {
+  let locale = await requestLocale;
+
+  if (!locale || !constants.locales.includes(locale as Locale)) {
+    locale = constants.defaultLocale;
+  }
+
+  return {
+    locale,
+    messages: {
+      'web-shared': (await import(`../../../i18n/web/shared/${locale}.json`)).default
+    }
+  };
+});

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

@@ -16,11 +16,13 @@ function nextAppGenerator(tree, options) {
         const shouldGenerateApiClientLib = shouldGenerateStoreLib && (yield (0, utils_1.askQuestion)('Do you want to create api client lib? (y/n): ')) === 'y';
         const shouldGenerateFormUtilsLib = (yield (0, utils_1.askQuestion)('Do you want to create a lib with the form utils? (y/n): ')) === 'y';
         const appRoot = `apps/${options.directory}`;
+        const i18nRoot = `i18n/${options.directory}`;
+        const libPath = `${(0, utils_1.getImportPathPrefix)(tree)}/${options.directory}`;
         const tags = [`app:${options.directory}`, 'type:app'];
         // Install @nx/next plugin
         (0, child_process_1.execSync)('npx nx add @nx/next', { stdio: 'inherit' });
         if (!(0, fs_1.existsSync)(appRoot)) {
-            (0, child_process_1.execSync)(`npx nx g @nx/next:app ${options.name} --directory=apps/${options.directory} --tags="${tags.join(', ')}" --linter=eslint --appDir=true --style=scss --src=false --unitTestRunner=none --e2eTestRunner=none`, { stdio: 'inherit' });
+            (0, child_process_1.execSync)(`npx nx g @nx/next:app ${options.name} --directory=apps/${options.directory} --tags="${tags.join(', ')}" --linter=none --appDir=true --style=scss --src=false --unitTestRunner=none --e2eTestRunner=none`, { stdio: 'inherit' });
         }
         // Install @nx/expo to generate libs
         const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
@@ -29,6 +31,7 @@ function nextAppGenerator(tree, options) {
             (0, child_process_1.execSync)('npx nx add @nx/expo', { stdio: 'inherit' });
         }
         yield (0, generators_1.runAppEnvGenerator)(tree, Object.assign(Object.assign({}, options), { baseGeneratorType: enums_1.BaseGeneratorType.NEXT_APP }));
+        yield (0, generators_1.runI18nNextGenerator)(tree, options);
         if (shouldGenerateStoreLib) {
             yield (0, generators_1.runStoreGenerator)(tree, Object.assign(Object.assign({}, options), { baseGeneratorType: enums_1.BaseGeneratorType.NEXT_APP }));
         }
@@ -38,6 +41,7 @@ function nextAppGenerator(tree, options) {
         if (shouldGenerateFormUtilsLib) {
             yield (0, generators_1.runFormUtilsGenerator)(tree, options);
         }
+        const hasProviders = shouldGenerateStoreLib;
         // Remove unnecessary files and files that will be replaced
         tree.delete(`${appRoot}/public/.gitkeep`);
         tree.delete(`${appRoot}/app/api`);
@@ -46,7 +50,8 @@ function nextAppGenerator(tree, options) {
         tree.delete(`${appRoot}/app/global.css`);
         tree.delete(`${appRoot}/app/layout.tsx`);
         tree.delete(`${appRoot}/specs`);
-        tree.delete(`${appRoot}/.eslintrc.json`);
+        tree.delete(`${appRoot}/eslint.config.cjs`);
+        tree.delete(`${appRoot}/eslint.config.mjs`);
         // Update app tsconfig.json to skip automatic reconfiguration during the first application run
         const appTsconfigPath = `${appRoot}/tsconfig.json`;
         const appTsconfigJson = (0, devkit_1.readJson)(tree, appTsconfigPath);
@@ -56,8 +61,14 @@ function nextAppGenerator(tree, options) {
             (0, devkit_1.writeJson)(tree, appTsconfigPath, appTsconfigJson);
         }
         // Add app files
-        (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), appRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName }));
+        (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), appRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
+            libPath,
+            hasProviders, isStoreEnabled: shouldGenerateStoreLib }));
+        if (!hasProviders) {
+            tree.delete(`${appRoot}/app/[locale]/providers.tsx`);
+        }
         (0, utils_1.addNxAppTag)(tree, options.directory);
+        (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'i18n'), i18nRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName }));
         // Add dependencies
         (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies_1.dependencies['next-app'], dependencies_1.devDependencies['next-app']);
         yield (0, devkit_1.formatFiles)(tree);
@@ -68,6 +79,7 @@ function nextAppGenerator(tree, options) {
                     stdio: 'inherit',
                 });
             }
+            (0, child_process_1.execSync)('npx nx g lib-tags --skipRepoCheck', { stdio: 'inherit' });
         };
     });
 }

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

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

package/src/generators/next-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: web)",
       "$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/react-lib/schema.json

@@ -17,6 +17,7 @@
     "type": {
       "type": "string",
       "description": "Type of the library",
+      "enum": ["features", "ui", "data-access", "utils", ""],
       "default": ""
     },
     "name": {

package/src/generators/sentry/schema.json

@@ -6,12 +6,12 @@
   "properties": {
     "directory": {
       "type": "string",
-      "description": "",
+      "description": "The directory name of the app in the 'apps/' folder",
       "default": ""
     },
     "dsn": {
       "type": "string",
-      "description": "",
+      "description": "Sentry DSN",
       "x-prompt": "What is your Sentry DSN?"
     }
   },

package/src/generators/sentry/utils/generate-sentry-expo.js

@@ -39,7 +39,7 @@ const addSentryPluginToAppConfig = (content) => (0, typescript_1.createPrinter)(
     ]);
 }));
 const updateMetroConfig = (content) => {
-    const metroConfigContentWithImport = tsquery_1.tsquery.replace(content, 'VariableStatement:has(Identifier[name="getDefaultConfig"]):has(CallExpression:has(Identifier[name="require"]))', () => 'const { getSentryExpoConfig } = require(\'@sentry/react-native/metro\');');
+    const metroConfigContentWithImport = tsquery_1.tsquery.replace(content, 'VariableStatement:has(Identifier[name="getDefaultConfig"]):has(CallExpression:has(Identifier[name="require"]))', () => `const { getSentryExpoConfig } = require('@sentry/react-native/metro');`);
     return tsquery_1.tsquery.replace(metroConfigContentWithImport, 'VariableDeclaration CallExpression > Identifier[name="getDefaultConfig"]', () => 'getSentryExpoConfig');
 };
 function generateSentryExpo(tree, options, projectRoot) {

package/src/generators/sentry/utils/generate-sentry-expo.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-sentry-expo.js","sourceRoot":"","sources":["../../../../../../plugin/src/generators/sentry/utils/generate-sentry-expo.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAChE,uDAAoD;AACpD,2CAOoB;AACpB,+DAA4D;AAC5D,iDAA0D;AAE1D,yFAAmF;AAEnF,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAU,EAAE,CACzD,iBAAO,CAAC,OAAO,CACb,OAAO,EACP,2DAA2D,EAC3D,CAAC,IAAI,EAAE,EAAE,CACP,GAAG,IAAI,CAAC,OAAO,EAAE;;;kDAG2B,CAC/C,CAAC;AAEJ,MAAM,iCAAiC,GAAG,CAAC,OAAe,EAAU,EAAE,CACpE,iBAAO,CAAC,OAAO,CACb,OAAO,EACP,kGAAkG,EAClG,GAAG,EAAE,CAAC,EAAE,EACR;IACE,gBAAgB,EAAE,IAAI;CACvB,CACF,CAAC;AAEJ,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,GAAW,EAAU,EAAE,CACjE,IAAA,0BAAa,GAAE,CAAC,SAAS,CACvB,iBAAO,CAAC,GAAG,CACT,iBAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EACpB,0EAA0E,EAC1E,CAAC,IAAI,EAAE,EAAE,CACP,IAAA,gEAA6B,EAC3B;IACE;QACE,GAAG,EAAE,QAAQ;QACb,WAAW,EAAE,oBAAO,CAAC,6BAA6B,CAAC;YACjD,oBAAO,CAAC,wBAAwB,CAAC,KAAK,EAAE,oBAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;SAC1E,CAAC;KACH;CACF,EACA,IAAgC,CAAC,UAAU,CAC7C,EACH;IACE,gBAAgB,EAAE,IAAI;CACvB,CACF,CACF,CAAC;AAEJ,MAAM,0BAA0B,GAAG,CAAC,OAAe,EAAU,EAAE,CAC7D,IAAA,0BAAa,GAAE,CAAC,SAAS,CACvB,iBAAO,CAAC,GAAG,CACT,iBAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EACpB,sJAAsJ,EACtJ,CAAC,IAAI,EAAE,EAAE;IACP,MAAM,uBAAuB,GAAG,oBAAO,CAAC,6BAA6B,CAAC;QACpE,oBAAO,CAAC,wBAAwB,CAAC,cAAc,EAAE,oBAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACjF,oBAAO,CAAC,wBAAwB,CAAC,SAAS,EAAE,oBAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;KAC7E,CAAC,CAAC;IAEH,IAAA,uCAA0B,EACxB,uBAAuB,EACvB,uBAAU,CAAC,uBAAuB,EAClC,4CAA4C,CAC7C,CAAC;IAEF,OAAO,oBAAO,CAAC,4BAA4B,CAAC;QAC1C,GAAI,IAA+B,CAAC,QAAQ;QAC5C,oBAAO,CAAC,4BAA4B,CAAC;YACnC,oBAAO,CAAC,mBAAmB,CAAC,2BAA2B,CAAC;YACxD,uBAAuB;SACxB,CAAC;KACH,CAAC,CAAC;AACL,CAAC,CACF,CACF,CAAC;AAEJ,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAU,EAAE;IACpD,MAAM,4BAA4B,GAAG,iBAAO,CAAC,OAAO,CAClD,OAAO,EACP,gHAAgH,EAChH,GAAG,EAAE,CAAC,0EAA0E,CACjF,CAAC;IAEF,OAAO,iBAAO,CAAC,OAAO,CACpB,4BAA4B,EAC5B,0EAA0E,EAC1E,GAAG,EAAE,CAAC,qBAAqB,CAC5B,CAAC;AACJ,CAAC,CAAC;AAEF,SAAgB,kBAAkB,CAAC,IAAU,EAAE,OAA8B,EAAE,WAAmB;IAChG,MAAM,kBAAkB,GAAG,GAAG,WAAW,eAAe,CAAC;IAEzD,IAAA,qCAA4B,EAAC,IAAI,EAAE,2BAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACjE,IAAA,qCAA4B,EAAC,IAAI,EAAE,2BAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,kBAAkB,CAAC,CAAC;IAErF,IAAA,yBAAiB,EACf,GAAG,WAAW,kBAAkB,EAChC,CAAC,WAAW,EAAE,EAAE;QACd,MAAM,oBAAoB,GAAG,iCAAiC,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC;QAEpG,OAAO,GAAG,oBAAoB;;;;;;;;;;;;;;8CAcU,CAAC;IAC3C,CAAC,EACD,IAAI,CACL,CAAC;IAEF,IAAA,yBAAiB,EACf,GAAG,WAAW,gBAAgB,EAC9B,CAAC,WAAW,EAAE,EAAE,CAAC,iBAAiB,CAAC,0BAA0B,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,EACxF,IAAI,CACL,CAAC;IAEF,IAAA,yBAAiB,EAAC,GAAG,WAAW,kBAAkB,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;AAC7G,CAAC;AArCD,gDAqCC"}
+{"version":3,"file":"generate-sentry-expo.js","sourceRoot":"","sources":["../../../../../../plugin/src/generators/sentry/utils/generate-sentry-expo.ts"],"names":[],"mappings":"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"}

package/src/shared/dependencies.d.ts

@@ -1,7 +1,7 @@
 export declare const dependencies: {
     'expo-app': {
-        '@react-native-async-storage/async-storage': string;
         '@ronas-it/react-native-common-modules': string;
+        'react-native-mmkv': string;
         'expo-constants': string;
         'expo-dev-client': string;
         'expo-router': string;

package/src/shared/dependencies.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.devDependencies = exports.dependencies = void 0;
 exports.dependencies = {
     'expo-app': {
-        '@react-native-async-storage/async-storage': '~1.23.1',
         '@ronas-it/react-native-common-modules': '^0.6.2',
+        'react-native-mmkv': '^3.2.0',
         'expo-constants': '~17.0.3',
         'expo-dev-client': '^5.0.6',
         'expo-router': '~4.0.14',
@@ -22,7 +22,7 @@ exports.dependencies = {
         'react-native-svg-transformer': '^1.4.0',
     },
     'next-app': {
-        'next-intl': '^3.17.2',
+        'next-intl': '^3.26.3',
     },
     'api-client': {
         '@ronas-it/axios-api-client': '^0.1.0',

package/src/shared/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../plugin/src/shared/dependencies.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,UAAU,EAAE;QACV,2CAA2C,EAAE,SAAS;QACtD,uCAAuC,EAAE,QAAQ;QACjD,gBAAgB,EAAE,SAAS;QAC3B,iBAAiB,EAAE,QAAQ;QAC3B,aAAa,EAAE,SAAS;QACxB,gCAAgC,EAAE,SAAS;QAC3C,sBAAsB,EAAE,QAAQ;QAChC,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,QAAQ;QAC3B,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,QAAQ;QACzB,WAAW,EAAE,UAAU;KACxB;IACD,eAAe,EAAE;QACf,sCAAsC;QACtC,yEAAyE;QACzE,8BAA8B,EAAE,QAAQ;KACzC;IACD,UAAU,EAAE;QACV,WAAW,EAAE,SAAS;KACvB;IACD,YAAY,EAAE;QACZ,4BAA4B,EAAE,QAAQ;KACvC;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;KAChB;IACD,WAAW,EAAE;QACX,kCAAkC,EAAE,SAAS;KAC9C;IACD,KAAK,EAAE;QACL,2BAA2B,EAAE,QAAQ;QACrC,aAAa,EAAE,QAAQ;KACxB;IACD,WAAW,EAAE;QACX,iBAAiB,EAAE,QAAQ;QAC3B,uBAAuB,EAAE,QAAQ;KAClC;IACD,IAAI,EAAE;QACJ,qBAAqB,EAAE,QAAQ;QAC/B,iBAAiB,EAAE,SAAS;QAC5B,GAAG,EAAE,QAAQ;KACd;IACD,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,sBAAsB,EAAE,QAAQ;SACjC;QACD,IAAI,EAAE;YACJ,gBAAgB,EAAE,SAAS;SAC5B;KACF;CACF,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,aAAa,EAAE;QACb,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,QAAQ;QAC5B,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,QAAQ;QAClB,wBAAwB,EAAE,QAAQ;QAClC,mCAAmC,EAAE,QAAQ;QAC7C,sBAAsB,EAAE,SAAS;QACjC,wBAAwB,EAAE,QAAQ;QAClC,qBAAqB,EAAE,SAAS;QAChC,2BAA2B,EAAE,QAAQ;QACrC,8BAA8B,EAAE,QAAQ;QACxC,KAAK,EAAE,QAAQ;QACf,0BAA0B,EAAE,SAAS;QACrC,kCAAkC,EAAE,SAAS;QAC7C,2BAA2B,EAAE,SAAS;QACtC,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,eAAe,EAAE,WAAW;KAC7B;IACD,eAAe,EAAE;QACf,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,wDAAwD;QACxD,oBAAoB,EAAE,SAAS;KAChC;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,SAAS;KACpB;IACD,IAAI,EAAE;QACJ,cAAc,EAAE,OAAO;KACxB;CACF,CAAC"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../plugin/src/shared/dependencies.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG;IAC1B,UAAU,EAAE;QACV,uCAAuC,EAAE,QAAQ;QACjD,mBAAmB,EAAE,QAAQ;QAC7B,gBAAgB,EAAE,SAAS;QAC3B,iBAAiB,EAAE,QAAQ;QAC3B,aAAa,EAAE,SAAS;QACxB,gCAAgC,EAAE,SAAS;QAC3C,sBAAsB,EAAE,QAAQ;QAChC,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,QAAQ;QAC3B,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,QAAQ;QACzB,WAAW,EAAE,UAAU;KACxB;IACD,eAAe,EAAE;QACf,sCAAsC;QACtC,yEAAyE;QACzE,8BAA8B,EAAE,QAAQ;KACzC;IACD,UAAU,EAAE;QACV,WAAW,EAAE,SAAS;KACvB;IACD,YAAY,EAAE;QACZ,4BAA4B,EAAE,QAAQ;KACvC;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;KAChB;IACD,WAAW,EAAE;QACX,kCAAkC,EAAE,SAAS;KAC9C;IACD,KAAK,EAAE;QACL,2BAA2B,EAAE,QAAQ;QACrC,aAAa,EAAE,QAAQ;KACxB;IACD,WAAW,EAAE;QACX,iBAAiB,EAAE,QAAQ;QAC3B,uBAAuB,EAAE,QAAQ;KAClC;IACD,IAAI,EAAE;QACJ,qBAAqB,EAAE,QAAQ;QAC/B,iBAAiB,EAAE,SAAS;QAC5B,GAAG,EAAE,QAAQ;KACd;IACD,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,sBAAsB,EAAE,QAAQ;SACjC;QACD,IAAI,EAAE;YACJ,gBAAgB,EAAE,SAAS;SAC5B;KACF;CACF,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,aAAa,EAAE;QACb,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,QAAQ;QAC5B,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,QAAQ;QAClB,wBAAwB,EAAE,QAAQ;QAClC,mCAAmC,EAAE,QAAQ;QAC7C,sBAAsB,EAAE,SAAS;QACjC,wBAAwB,EAAE,QAAQ;QAClC,qBAAqB,EAAE,SAAS;QAChC,2BAA2B,EAAE,QAAQ;QACrC,8BAA8B,EAAE,QAAQ;QACxC,KAAK,EAAE,QAAQ;QACf,0BAA0B,EAAE,SAAS;QACrC,kCAAkC,EAAE,SAAS;QAC7C,2BAA2B,EAAE,SAAS;QACtC,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,eAAe,EAAE,WAAW;KAC7B;IACD,eAAe,EAAE;QACf,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,wDAAwD;QACxD,oBAAoB,EAAE,SAAS;KAChC;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,SAAS;KACpB;IACD,IAAI,EAAE;QACJ,cAAc,EAAE,OAAO;KACxB;CACF,CAAC"}

package/src/shared/generators/api-client/generator.js

@@ -22,7 +22,8 @@ function runApiClientGenerator(tree, options) {
         tree.delete(`${libRoot}/shared/data-access/api-client/src/index.ts`);
         // Add lib files
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, '/lib-files'), libRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
-            formatAppIdentifier: utils_1.formatAppIdentifier, formatDirectory: () => libPath }));
+            formatAppIdentifier: utils_1.formatAppIdentifier,
+            libPath }));
         // Add dependencies
         (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies_1.dependencies['api-client'], {});
         if ((0, fs_1.existsSync)(appPackagePath)) {

package/src/shared/generators/api-client/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/api-client/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,2BAAgC;AAChC,6BAA6B;AAC7B,uCAA4F;AAC5F,qDAAkD;AAClD,uCAAmF;AAEnF,SAAsB,qBAAqB,CAAC,IAAU,EAAE,OAA4C;;QAClG,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpE,uBAAuB;QACvB,IAAA,wBAAQ,EAAC,4BAA4B,OAAO,CAAC,SAAS,sDAAsD,EAAE;YAC5G,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,GAAG,OAAO,eAAe,CAAC;QAEjD,2DAA2D;QAC3D,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,6CAA6C,CAAC,CAAC;QAErE,gBAAgB;QAChB,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,OAAO,kCAC1D,OAAO,KACV,UAAU,EAAV,kBAAU;YACV,mBAAmB,EAAnB,2BAAmB,EACnB,eAAe,EAAE,GAAG,EAAE,CAAC,OAAO,IAC9B,CAAC;QAEH,mBAAmB;QACnB,IAAA,qCAA4B,EAAC,IAAI,EAAE,2BAAY,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QAEnE,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE,CAAC;YAC/B,IAAA,qCAA4B,EAAC,IAAI,EAAE,2BAAY,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,CAAC,IAAI,CAAC,gCAAgC,OAAO,qDAAqD,CAAC,CAAC;IAC7G,CAAC;CAAA;AAjCD,sDAiCC;AAED,kBAAe,qBAAqB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/api-client/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,2BAAgC;AAChC,6BAA6B;AAC7B,uCAA4F;AAC5F,qDAAkD;AAClD,uCAAmF;AAEnF,SAAsB,qBAAqB,CAAC,IAAU,EAAE,OAA4C;;QAClG,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpE,uBAAuB;QACvB,IAAA,wBAAQ,EAAC,4BAA4B,OAAO,CAAC,SAAS,sDAAsD,EAAE;YAC5G,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,GAAG,OAAO,eAAe,CAAC;QAEjD,2DAA2D;QAC3D,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,6CAA6C,CAAC,CAAC;QAErE,gBAAgB;QAChB,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,OAAO,kCAC1D,OAAO,KACV,UAAU,EAAV,kBAAU;YACV,mBAAmB,EAAnB,2BAAmB;YACnB,OAAO,IACP,CAAC;QAEH,mBAAmB;QACnB,IAAA,qCAA4B,EAAC,IAAI,EAAE,2BAAY,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QAEnE,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE,CAAC;YAC/B,IAAA,qCAA4B,EAAC,IAAI,EAAE,2BAAY,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;QACrF,CAAC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,CAAC,IAAI,CAAC,gCAAgC,OAAO,qDAAqD,CAAC,CAAC;IAC7G,CAAC;CAAA;AAjCD,sDAiCC;AAED,kBAAe,qBAAqB,CAAC"}

package/src/shared/generators/api-client/lib-files/shared/data-access/api-client/src/configuration.ts.template

@@ -1,4 +1,4 @@
-import { appEnv } from '<%= formatDirectory() %>/shared/utils/app-env';
+import { appEnv } from '<%= libPath %>/shared/utils/app-env';
 
 export const configuration = {
   // TODO: Add development, production url, when API will be ready

package/src/shared/generators/app-env/generator.js

@@ -19,7 +19,9 @@ function runAppEnvGenerator(tree, options) {
         tree.delete(`${libRoot}/shared/utils/app-env/src/index.ts`);
         // Add lib files
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'lib-files'), libRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
-            formatAppIdentifier: utils_1.formatAppIdentifier, formatDirectory: () => libPath, appType }));
+            formatAppIdentifier: utils_1.formatAppIdentifier,
+            libPath,
+            appType }));
         yield (0, devkit_1.formatFiles)(tree);
     });
 }

package/src/shared/generators/app-env/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/app-env/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAA8D;AAE9D,uCAAmF;AAEnF,SAAsB,kBAAkB,CACtC,IAAU,EACV,OAAkF;;QAElF,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,OAAO,GAAG,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpE,uBAAuB;QACvB,IAAA,wBAAQ,EAAC,4BAA4B,OAAO,CAAC,SAAS,6CAA6C,EAAE;YACnG,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,2DAA2D;QAC3D,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,oCAAoC,CAAC,CAAC;QAE5D,gBAAgB;QAChB,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,kCACzD,OAAO,KACV,UAAU,EAAV,kBAAU;YACV,mBAAmB,EAAnB,2BAAmB,EACnB,eAAe,EAAE,GAAG,EAAE,CAAC,OAAO,EAC9B,OAAO,IACP,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,gDA0BC;AAED,kBAAe,kBAAkB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/app-env/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAA8D;AAE9D,uCAAmF;AAEnF,SAAsB,kBAAkB,CACtC,IAAU,EACV,OAAkF;;QAElF,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACtE,MAAM,OAAO,GAAG,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpE,uBAAuB;QACvB,IAAA,wBAAQ,EAAC,4BAA4B,OAAO,CAAC,SAAS,6CAA6C,EAAE;YACnG,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;QAEH,2DAA2D;QAC3D,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,oCAAoC,CAAC,CAAC;QAE5D,gBAAgB;QAChB,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,kCACzD,OAAO,KACV,UAAU,EAAV,kBAAU;YACV,mBAAmB,EAAnB,2BAAmB;YACnB,OAAO;YACP,OAAO,IACP,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,gDA0BC;AAED,kBAAe,kBAAkB,CAAC"}

package/src/shared/generators/auth/generator.js

@@ -64,7 +64,8 @@ function runAuthGenerator(tree, options) {
         tree.delete(`${libRoot}/shared/data-access/auth/src/index.ts`);
         // Add lib files
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, '/lib-files'), libRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
-            formatAppIdentifier: utils_1.formatAppIdentifier, formatDirectory: () => libPath }));
+            formatAppIdentifier: utils_1.formatAppIdentifier,
+            libPath }));
         updateStore(libRoot);
         // Add dependencies
         (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies_1.dependencies['auth'], dependencies_1.devDependencies['auth']);

package/src/shared/generators/auth/generator.js.map

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

package/src/shared/generators/auth/lib-files/shared/data-access/api/src/lib/auth/api.ts.template

@@ -1,6 +1,6 @@
 import { prepareRequestParams } from '@ronas-it/rtkq-entity-api';
 import { plainToInstance } from 'class-transformer';
-import { createAppApi } from '<%= formatDirectory() %>/shared/data-access/api-client';
+import { createAppApi } from '<%= libPath %>/shared/data-access/api-client';
 import {
   ForgotPasswordRequest,
   LoginRequest,

package/src/shared/generators/auth/lib-files/shared/data-access/api/src/lib/profile/api.ts.template

@@ -1,6 +1,6 @@
 import { prepareRequestParams } from '@ronas-it/rtkq-entity-api';
 import { plainToInstance } from 'class-transformer';
-import { axiosBaseQuery, createAppApi } from '<%= formatDirectory() %>/shared/data-access/api-client';
+import { axiosBaseQuery, createAppApi } from '<%= libPath %>/shared/data-access/api-client';
 import { User } from '../user';
 import { profileApiConfig } from './config';
 import { GetProfileRequest } from './models';

package/src/shared/generators/auth/lib-files/shared/data-access/auth/src/lib/store/listener.ts.template

@@ -6,43 +6,36 @@ import {
   tokenInterceptor,
 } from '@ronas-it/axios-api-client';
 import { storeActions } from '@ronas-it/rtkq-entity-api';
-import { DateTime } from 'luxon';
-import { authApi, profileApi, LogInResponse } from '<%= formatDirectory() %>/shared/data-access/api';
-import { apiService, configuration } from '<%= formatDirectory() %>/shared/data-access/api-client';
-import { appStorageService } from '<%= formatDirectory() %>/shared/data-access/storage';
+import { authApi, profileApi, LogInResponse } from '<%= libPath %>/shared/data-access/api';
+import { apiService, configuration } from '<%= libPath %>/shared/data-access/api-client';
+import { AppStorageValue, storage } from '<%= libPath %>/shared/data-access/storage';
 import { authActions, authReducerPath, authSelectors, AuthState } from './slice';
 
 export const authListenerMiddleware = createListenerMiddleware<{ [authReducerPath]: AuthState }>();
 
 authListenerMiddleware.startListening({
   actionCreator: storeActions.init,
-  effect: async (_, { dispatch, getState }) => {
-    const isAuthenticated = await appStorageService.isAuthenticated.get();
-    const tokenExpiresAt = await appStorageService.tokenExpiresAt.get();
-    const token = await appStorageService.token.get();
-
-    dispatch(authActions.setIsAuthenticated(isAuthenticated === 'true'));
-    dispatch(authActions.setTokenExpiresAt(tokenExpiresAt ? DateTime.fromISO(tokenExpiresAt) : null));
-    dispatch(authActions.setToken(token ?? null));
+  effect: (_, { dispatch }) => {
+    const token = storage.getString(AppStorageValue.TOKEN);
+    dispatch(authActions.setIsAuthenticated(Boolean(token)));
 
     apiService.useInterceptors({
-      request: [[tokenInterceptor({ getToken: () => authSelectors.token(getState()) ?? '' })]],
+      request: [[tokenInterceptor({ getToken: () => storage.getString(AppStorageValue.TOKEN) ?? '' })]],
     });
 
     dispatch(authActions.setIsAppReady(true));
-    isAuthenticated && dispatch(profileApi.endpoints.getProfile.initiate());
   },
 });
 
 authListenerMiddleware.startListening({
   matcher: authApi.internalActions.middlewareRegistered.match,
-  effect: async (_, { dispatch, getState }) => {
+  effect: (_, { dispatch, getState }) => {
     const options: RefreshTokenInterceptorOptions = {
       configuration: configuration.auth,
       getIsAuthenticated: () => authSelectors.isAuthenticated(getState()),
       runTokenRefreshRequest: async () => {
-        const { token, ttl } = await dispatch(authApi.endpoints.refreshToken.initiate()).unwrap();
-        dispatch(authActions.saveToken({ token, ttl }));
+        const { token } = await dispatch(authApi.endpoints.refreshToken.initiate()).unwrap();
+        storage.set(AppStorageValue.TOKEN, token);
 
         return token;
       },
@@ -60,37 +53,22 @@ authListenerMiddleware.startListening({
 
 authListenerMiddleware.startListening({
   matcher: isAnyOf(authApi.endpoints.login.matchFulfilled, authApi.endpoints.register.matchFulfilled),
-  effect: async ({ payload: { token, ttl } }: { payload: LogInResponse }, { dispatch }) => {
-    dispatch(authActions.saveToken({ token, ttl }));
-    appStorageService.isAuthenticated.set('true');
+  effect: ({ payload: { token } }: { payload: LogInResponse }, { dispatch }) => {
+    storage.set(AppStorageValue.TOKEN, token);
     dispatch(authActions.setIsAuthenticated(true));
   },
 });
 
 authListenerMiddleware.startListening({
-  matcher: isAnyOf(authApi.endpoints.logout.matchFulfilled, authApi.endpoints.logout.matchRejected),
-  effect: async (_, { dispatch }) => {
-    appStorageService.isAuthenticated.remove();
-    appStorageService.tokenExpiresAt.remove();
-    appStorageService.token.remove();
-
+  matcher: isAnyOf(
+    authApi.endpoints.logout.matchFulfilled,
+    authApi.endpoints.logout.matchRejected,
+    profileApi.endpoints.deleteProfile.matchFulfilled,
+  ),
+  effect: (_, { dispatch }) => {
+    storage.delete(AppStorageValue.TOKEN);
     dispatch(authActions.setIsAuthenticated(false));
-    dispatch(authActions.setTokenExpiresAt(null));
-    dispatch(authActions.setToken(null));
 
     dispatch(profileApi.util.resetApiState());
   },
 });
-
-authListenerMiddleware.startListening({
-  actionCreator: authActions.saveToken,
-  effect: async ({ payload: { token, ttl } }, { dispatch }) => {
-    const tokenExpires = DateTime.local().plus({ minutes: ttl });
-
-    appStorageService.tokenExpiresAt.set(tokenExpires.toISO());
-    appStorageService.token.set(token);
-
-    dispatch(authActions.setToken(token));
-    dispatch(authActions.setTokenExpiresAt(tokenExpires));
-  },
-});

package/src/shared/generators/auth/lib-files/shared/data-access/auth/src/lib/store/slice.ts.template

@@ -1,18 +1,13 @@
-import { PayloadAction, createSlice, createAction } from '@reduxjs/toolkit';
-import { DateTime } from 'luxon';
+import { PayloadAction, createSlice } from '@reduxjs/toolkit';
 
 export interface AuthState {
   isAuthenticated: boolean | null;
   isAppReady: boolean;
-  token: string | null;
-  tokenExpiresAt: DateTime | null;
 }
 
 const initialState: AuthState = {
   isAuthenticated: null,
   isAppReady: false,
-  token: null,
-  tokenExpiresAt: null,
 };
 
 const authSlice = createSlice({
@@ -22,29 +17,17 @@ const authSlice = createSlice({
     setIsAuthenticated(state, { payload }: PayloadAction<boolean>) {
       state.isAuthenticated = payload;
     },
-    setToken(state, { payload }: PayloadAction<string | null>) {
-      state.token = payload;
-    },
     setIsAppReady(state, { payload }: PayloadAction<boolean>) {
       state.isAppReady = payload;
     },
-    setTokenExpiresAt(state, { payload }: PayloadAction<DateTime | null>) {
-      state.tokenExpiresAt = payload;
-    },
   },
   selectors: {
     isAuthenticated: (state) => state.isAuthenticated,
     isAppReady: (state) => state.isAppReady,
-    token: (state) => state.token,
-    tokenExpiresAt: (state) => state.tokenExpiresAt,
   },
 });
 
-export const authActions = {
-  ...authSlice.actions,
-  saveToken: createAction<{ token: string | null; ttl: number }>('authState/saveToken'),
-};
-
 export const authReducer = authSlice.reducer;
 export const authReducerPath = authSlice.name;
 export const authSelectors = authSlice.selectors;
+export const authActions = authSlice.actions;

package/src/shared/generators/auth/schema.d.ts

@@ -1,4 +1,3 @@
 export interface AuthGeneratorSchema {
-  name: string;
   directory: string;
 }

package/src/shared/generators/auth/schema.json

@@ -4,24 +4,15 @@
   "title": "",
   "type": "object",
   "properties": {
-    "name": {
-      "type": "string",
-      "description": "",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "Enter the name of the app"
-    },
     "directory": {
       "type": "string",
-      "description": "",
+      "description": "The directory name of the app in the 'apps/' folder",
       "$default": {
         "$source": "argv",
-        "index": 1
+        "index": 0
       },
       "x-prompt": "Enter the name of the directory in the 'apps/' folder"
     }
   },
-  "required": ["name", "directory"]
+  "required": ["directory"]
 }

package/src/shared/generators/i18n-next/generator.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+export declare function runI18nNextGenerator(tree: Tree, options: {
+    name: string;
+    directory: string;
+}): Promise<void>;
+export default runI18nNextGenerator;

package/src/shared/generators/i18n-next/generator.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runI18nNextGenerator = void 0;
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const path = require("path");
+const devkit_1 = require("@nx/devkit");
+const utils_1 = require("../../utils");
+function runI18nNextGenerator(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const libRoot = `libs/${options.directory}`;
+        const libPath = `${(0, utils_1.getImportPathPrefix)(tree)}/${options.directory}`;
+        // Generate shared libs
+        (0, child_process_1.execSync)(`npx nx g react-lib --app=${options.directory} --scope=shared --type=utils --name=i18n --withComponent=false`, {
+            stdio: 'inherit',
+        });
+        // Remove unnecessary files and files that will be replaced
+        tree.delete(`${libRoot}/shared/utils/i18n/src/index.ts`);
+        // Add lib files
+        (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'lib-files'), libRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
+            formatAppIdentifier: utils_1.formatAppIdentifier,
+            libPath }));
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.runI18nNextGenerator = runI18nNextGenerator;
+exports.default = runI18nNextGenerator;
+//# sourceMappingURL=generator.js.map

package/src/shared/generators/i18n-next/generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/i18n-next/generator.ts"],"names":[],"mappings":";;;;AAAA,iDAAyC;AACzC,6BAA6B;AAC7B,uCAA8D;AAC9D,uCAAmF;AAEnF,SAAsB,oBAAoB,CAAC,IAAU,EAAE,OAA4C;;QACjG,MAAM,OAAO,GAAG,QAAQ,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QAEpE,uBAAuB;QACvB,IAAA,wBAAQ,EACN,4BAA4B,OAAO,CAAC,SAAS,gEAAgE,EAC7G;YACE,KAAK,EAAE,SAAS;SACjB,CACF,CAAC;QAEF,2DAA2D;QAC3D,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,iCAAiC,CAAC,CAAC;QAEzD,gBAAgB;QAChB,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,OAAO,kCACzD,OAAO,KACV,UAAU,EAAV,kBAAU;YACV,mBAAmB,EAAnB,2BAAmB;YACnB,OAAO,IACP,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAxBD,oDAwBC;AAED,kBAAe,oBAAoB,CAAC"}

package/src/shared/generators/i18n-next/index.d.ts

@@ -0,0 +1 @@
+export * from './generator';

package/src/shared/generators/i18n-next/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./generator"), exports);
+//# sourceMappingURL=index.js.map

package/src/shared/generators/i18n-next/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/i18n-next/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B"}

package/src/shared/generators/i18n-next/lib-files/shared/utils/i18n/src/index.ts.template

@@ -0,0 +1 @@
+export * from './lib';

package/src/shared/generators/i18n-next/lib-files/shared/utils/i18n/src/lib/index.ts.template

@@ -0,0 +1,2 @@
+export * from './interfaces';
+export * from './types';

package/src/shared/generators/i18n-next/lib-files/shared/utils/i18n/src/lib/interfaces/index.ts.template

@@ -0,0 +1 @@
+export * from './next-intl-params';

package/src/shared/generators/i18n-next/lib-files/shared/utils/i18n/src/lib/interfaces/next-intl-params.ts.template

@@ -0,0 +1,5 @@
+import type { Locale } from '../types/locale';
+
+export interface NextIntlParams {
+  params: { locale: Locale };
+}

package/src/shared/generators/i18n-next/lib-files/shared/utils/i18n/src/lib/types/index.ts.template

@@ -0,0 +1 @@
+export * from './locale';

package/src/shared/generators/i18n-next/lib-files/shared/utils/i18n/src/lib/types/locale.ts.template

@@ -0,0 +1 @@
+export type Locale = 'en';

package/src/shared/generators/index.d.ts

@@ -6,3 +6,4 @@ export * from './storage';
 export * from './rn-styles';
 export * from './ui-kitten';
 export * from './form-utils';
+export * from './i18n-next';

package/src/shared/generators/index.js

@@ -9,4 +9,5 @@ tslib_1.__exportStar(require("./storage"), exports);
 tslib_1.__exportStar(require("./rn-styles"), exports);
 tslib_1.__exportStar(require("./ui-kitten"), exports);
 tslib_1.__exportStar(require("./form-utils"), exports);
+tslib_1.__exportStar(require("./i18n-next"), exports);
 //# sourceMappingURL=index.js.map

package/src/shared/generators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugin/src/shared/generators/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,oDAA0B;AAC1B,uDAA6B;AAC7B,iDAAuB;AACvB,oDAA0B;AAC1B,sDAA4B;AAC5B,sDAA4B;AAC5B,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../plugin/src/shared/generators/index.ts"],"names":[],"mappings":";;;AAAA,kDAAwB;AACxB,oDAA0B;AAC1B,uDAA6B;AAC7B,iDAAuB;AACvB,oDAA0B;AAC1B,sDAA4B;AAC5B,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B"}

package/src/shared/generators/rn-styles/generator.js

@@ -22,7 +22,8 @@ function runRNStylesGenerator(tree, options) {
         tree.delete(`${libRoot}/shared/ui/styles/src/index.ts`);
         // Add lib files
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'lib-files'), libRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
-            formatAppIdentifier: utils_1.formatAppIdentifier, formatDirectory: () => libPath }));
+            formatAppIdentifier: utils_1.formatAppIdentifier,
+            libPath }));
         // Add dependencies
         (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies_1.dependencies['rn-styles'], {});
         if ((0, fs_1.existsSync)(appPackagePath)) {