@ronas-it/nx-generators 0.18.1-alpha.1 → 0.19.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -3
- package/package.json +2 -2
- package/src/generators/code-checks/config.d.ts +1 -0
- package/src/generators/code-checks/config.js +1 -0
- package/src/generators/code-checks/config.js.map +1 -1
- package/src/generators/expo-app/app-files/app/_layout.tsx.template +2 -9
- package/src/generators/expo-app/app-files/app/index.tsx.template +1 -4
- package/src/generators/expo-app/app-files/app.config.ts.template +3 -0
- package/src/generators/expo-app/app-files/metro.config.js.template +3 -11
- package/src/generators/expo-app/generator.js +3 -0
- package/src/generators/expo-app/generator.js.map +1 -1
- package/src/generators/lib-move/generator.js +1 -5
- package/src/generators/lib-move/generator.js.map +1 -1
- package/src/generators/lib-rename/generator.js +1 -5
- package/src/generators/lib-rename/generator.js.map +1 -1
- package/src/generators/next-app/files/app/[locale]/layout.tsx.template +5 -9
- package/src/generators/next-app/files/next.config.js.template +1 -0
- package/src/generators/react-lib/generator.js +1 -4
- package/src/generators/react-lib/generator.js.map +1 -1
- package/src/shared/dependencies.d.ts +3 -1
- package/src/shared/dependencies.js +11 -9
- package/src/shared/dependencies.js.map +1 -1
- package/src/shared/generators/auth/common-files/shared/data-access/auth/src/lib/store/listener.ts.template +8 -19
- package/src/shared/generators/auth/common-files/shared/data-access/auth/src/lib/store/slice.ts.template +0 -6
- package/src/shared/generators/auth/generator.js +2 -2
- package/src/shared/generators/auth/generator.js.map +1 -1
- package/src/shared/generators/auth/next-app-files/app/[locale]/providers.tsx.template +3 -16
- package/src/shared/generators/auth/next-app-files/{middleware.ts.template → proxy.ts.template} +1 -1
- package/src/shared/utils/format-utils.d.ts +1 -0
- package/src/shared/utils/format-utils.js +4 -1
- package/src/shared/utils/format-utils.js.map +1 -1
- /package/src/generators/next-app/files/{middleware.ts.template → proxy.ts.template} +0 -0
package/README.md
CHANGED
|
@@ -31,13 +31,13 @@ The generators enforce several best practices according to [Nx concepts](https:/
|
|
|
31
31
|
**Expo app:**
|
|
32
32
|
|
|
33
33
|
```sh
|
|
34
|
-
npx create-nx-workspace@latest my-project --preset=expo --appName=
|
|
34
|
+
npx create-nx-workspace@latest my-project --preset=expo --appName=mobile --e2eTestRunner=none --unitTestRunner=none --formatter=prettier --linter=eslint --ci=skip
|
|
35
35
|
```
|
|
36
36
|
|
|
37
37
|
**Next.js app:**
|
|
38
38
|
|
|
39
39
|
```sh
|
|
40
|
-
npx create-nx-workspace@latest my-project --preset=next --appName=
|
|
40
|
+
npx create-nx-workspace@latest my-project --preset=next --appName=web --nextAppDir=true --unitTestRunner=none --formatter=prettier --linter=eslint --nextSrcDir=false --style=scss --e2eTestRunner=none --ci=skip
|
|
41
41
|
```
|
|
42
42
|
|
|
43
43
|
2. Install this package:
|
|
@@ -70,8 +70,16 @@ npx nx g next-app
|
|
|
70
70
|
|
|
71
71
|
4. Start the app:
|
|
72
72
|
|
|
73
|
+
**Expo app:**
|
|
74
|
+
|
|
75
|
+
```sh
|
|
76
|
+
npx nx start mobile
|
|
77
|
+
```
|
|
78
|
+
|
|
79
|
+
**Next.js app:**
|
|
80
|
+
|
|
73
81
|
```sh
|
|
74
|
-
npx nx
|
|
82
|
+
npx nx dev web
|
|
75
83
|
```
|
|
76
84
|
|
|
77
85
|
5. Continue developing your app by generating libraries and components:
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ronas-it/nx-generators",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.19.0-alpha.1",
|
|
4
4
|
"description": "Nx generators for Ronas IT projects",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Ronas IT",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"access": "public"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@nx/devkit": "
|
|
27
|
+
"@nx/devkit": "22.0.3",
|
|
28
28
|
"@phenomnomnominal/tsquery": "~6.1.3",
|
|
29
29
|
"lodash": "^4.17.21",
|
|
30
30
|
"tslib": "^2.8.1",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,aAAa,EAAE;QACb,YAAY,EAAE,+BAA+B;QAC7C,4BAA4B,EAAE,kBAAkB;QAChD,eAAe,EAAE,sBAAsB;KACxC;IACD,QAAQ,EAAE;QACR,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,IAAI;QACZ,qBAAqB,EAAE,IAAI;QAC3B,sBAAsB,EAAE,IAAI;QAC5B,SAAS,EAAE,KAAK;QAChB,cAAc,EAAE,KAAK;QACrB,mBAAmB,EAAE,KAAK;QAC1B,WAAW,EAAE,KAAK;QAClB,gBAAgB,EAAE,SAAS;QAC3B,GAAG,EAAE,cAAc;QACnB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,4BAA4B,EAAE,IAAI;QAClC,aAAa,EAAE,IAAI;QACnB,4BAA4B,EAAE,KAAK;QACnC,gBAAgB,EAAE,IAAI;QACtB,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;KACvB;IACD,eAAe,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC;IACjE,SAAS,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;CAC7C,CAAC"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/code-checks/config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,aAAa,EAAE;QACb,YAAY,EAAE,+BAA+B;QAC7C,4BAA4B,EAAE,kBAAkB;QAChD,eAAe,EAAE,sBAAsB;KACxC;IACD,QAAQ,EAAE;QACR,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,IAAI;QACf,MAAM,EAAE,IAAI;QACZ,qBAAqB,EAAE,IAAI;QAC3B,sBAAsB,EAAE,IAAI;QAC5B,SAAS,EAAE,KAAK;QAChB,cAAc,EAAE,KAAK;QACrB,mBAAmB,EAAE,KAAK;QAC1B,WAAW,EAAE,KAAK;QAClB,MAAM,EAAE,QAAQ;QAChB,gBAAgB,EAAE,SAAS;QAC3B,GAAG,EAAE,cAAc;QACnB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,4BAA4B,EAAE,IAAI;QAClC,aAAa,EAAE,IAAI;QACnB,4BAA4B,EAAE,KAAK;QACnC,gBAAgB,EAAE,IAAI;QACtB,GAAG,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;KACvB;IACD,eAAe,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC;IACjE,SAAS,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;CAC7C,CAAC"}
|
|
@@ -3,10 +3,9 @@ import { setLanguage } from '@ronas-it/react-native-common-modules/i18n';
|
|
|
3
3
|
<% if(isUIKittenEnabled) { %>
|
|
4
4
|
import { UserThemeProvider } from '<%= libPath %>/shared/features/user-theme-provider';
|
|
5
5
|
<% } %>
|
|
6
|
-
<% if(isStoreEnabled) { %>import { storeActions } from '@ronas-it/rtkq-entity-api';<% } %>
|
|
7
6
|
import { Stack } from 'expo-router';
|
|
8
|
-
import { ReactElement
|
|
9
|
-
<% if(isStoreEnabled) { %>import { Provider
|
|
7
|
+
import { ReactElement } from 'react';
|
|
8
|
+
<% if(isStoreEnabled) { %>import { Provider } from 'react-redux';<% } %>
|
|
10
9
|
|
|
11
10
|
export { ErrorBoundary } from 'expo-router';
|
|
12
11
|
|
|
@@ -25,14 +24,8 @@ export const unstable_settings = {
|
|
|
25
24
|
};
|
|
26
25
|
|
|
27
26
|
function App(): ReactElement {
|
|
28
|
-
<% if(isStoreEnabled) { %>
|
|
29
|
-
const dispatch = useDispatch();
|
|
30
27
|
useLanguage('en');
|
|
31
28
|
|
|
32
|
-
useEffect(() => {
|
|
33
|
-
dispatch(storeActions.init());
|
|
34
|
-
}, []);
|
|
35
|
-
<% } %>
|
|
36
29
|
return (
|
|
37
30
|
<Stack>
|
|
38
31
|
<Stack.Screen name='index' />
|
|
@@ -5,7 +5,7 @@ import { createStyles } from '<%= libPath %>/shared/ui/styles';
|
|
|
5
5
|
export default function RootScreen(): ReactElement {
|
|
6
6
|
return (
|
|
7
7
|
<View style={styles.container}>
|
|
8
|
-
<Text
|
|
8
|
+
<Text>Hello World</Text>
|
|
9
9
|
</View>
|
|
10
10
|
);
|
|
11
11
|
}
|
|
@@ -16,7 +16,4 @@ const styles = createStyles({
|
|
|
16
16
|
justifyContent: 'center',
|
|
17
17
|
alignItems: 'center',
|
|
18
18
|
},
|
|
19
|
-
text: {
|
|
20
|
-
color: 'white'
|
|
21
|
-
}
|
|
22
19
|
});
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
const { getDefaultConfig } = require('
|
|
2
|
-
const { withNxMetro } = require('@nx/expo');
|
|
1
|
+
const { getDefaultConfig } = require('expo/metro-config');
|
|
3
2
|
const { mergeConfig } = require('metro-config');
|
|
4
3
|
const path = require('path');
|
|
5
4
|
|
|
@@ -21,14 +20,7 @@ const customConfig = {
|
|
|
21
20
|
assetExts: assetExts.filter((ext) => ext !== 'svg'),
|
|
22
21
|
sourceExts: [...sourceExts, 'cjs', 'mjs', 'svg'],
|
|
23
22
|
},
|
|
23
|
+
watchFolders: [monorepoRoot]
|
|
24
24
|
};
|
|
25
25
|
|
|
26
|
-
module.exports =
|
|
27
|
-
// Change this to true to see debugging info.
|
|
28
|
-
// Useful if you have issues resolving modules
|
|
29
|
-
debug: false,
|
|
30
|
-
// all the file extensions used for imports other than 'ts', 'tsx', 'js', 'jsx', 'json'
|
|
31
|
-
extensions: [],
|
|
32
|
-
// Specify folders to watch, in addition to Nx defaults (workspace libraries and node_modules)
|
|
33
|
-
watchFolders: [monorepoRoot],
|
|
34
|
-
});
|
|
26
|
+
module.exports = mergeConfig(defaultConfig, customConfig);
|
|
@@ -66,6 +66,9 @@ function expoAppGenerator(tree, options) {
|
|
|
66
66
|
appPackageJson.main = 'expo-router/entry';
|
|
67
67
|
appPackageJson.scripts = Object.assign(Object.assign({}, scripts_1.default), appPackageJson.scripts);
|
|
68
68
|
(0, devkit_1.writeJson)(tree, appPackagePath, appPackageJson);
|
|
69
|
+
// Remove dependencies with version "*" from @nx/expo template
|
|
70
|
+
const dependenciesToRemove = Object.keys(appPackageJson.dependencies).filter((dependency) => appPackageJson.dependencies[dependency].includes('*'));
|
|
71
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(tree, dependenciesToRemove, [], appPackagePath);
|
|
69
72
|
// Add app files
|
|
70
73
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'app-files'), appRoot, Object.assign(Object.assign({}, options), { formatName: utils_1.formatName,
|
|
71
74
|
formatAppIdentifier: utils_1.formatAppIdentifier,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/expo-app/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.libMoveGenerator = libMoveGenerator;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
|
-
const path = require("path");
|
|
7
6
|
const utils_1 = require("../../shared/utils");
|
|
8
7
|
function libMoveGenerator(tree, options) {
|
|
9
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -27,10 +26,7 @@ function libMoveGenerator(tree, options) {
|
|
|
27
26
|
const libraryName = options.name ||
|
|
28
27
|
(yield (0, utils_1.askQuestion)('If you want to rename the library, enter its new name. Otherwise just press Enter: ', defaultLibraryName));
|
|
29
28
|
const libDirectoryName = (0, utils_1.getLibDirectoryName)(libraryName, options.scope);
|
|
30
|
-
const newLibImportPath =
|
|
31
|
-
.normalize(`${options.app}/${options.scope}/${options.type}/${libDirectoryName}`)
|
|
32
|
-
.split(path.sep)
|
|
33
|
-
.join('/');
|
|
29
|
+
const newLibImportPath = (0, utils_1.normalizeLibPath)(`${options.app}/${options.scope}/${options.type}/${libDirectoryName}`);
|
|
34
30
|
const newLibPath = `libs/${newLibImportPath}`;
|
|
35
31
|
const fullLibraryPath = `${(0, utils_1.getImportPathPrefix)(tree)}/${newLibImportPath}`;
|
|
36
32
|
const fullLibraryName = newLibImportPath.split('/').join('-');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/lib-move/generator.ts"],"names":[],"mappings":";;AAeA,4CA4CC;;AA3DD,iDAAyC;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/lib-move/generator.ts"],"names":[],"mappings":";;AAeA,4CA4CC;;AA3DD,iDAAyC;AAEzC,8CAU4B;AAG5B,SAAsB,gBAAgB,CAAC,IAAU,EAAE,OAA+B;;QAChF,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAE7C,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,IAAA,+BAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAE/G,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,kBAAkB,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC;QAEjD,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,IAAA,qBAAa,EAAC,IAAI,EAAE,aAAa,EAAE,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC;QAEzG,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,KAAK,iBAAS,CAAC,WAAW,CAAC;QAE1D,OAAO,CAAC,KAAK;YACX,OAAO,CAAC,KAAK;gBACb,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAA,mBAAW,EAAC,sCAAsC,iBAAS,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC;QAC3G,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI;YACzB,CAAC,CAAC,IAAA,2BAAmB,EAAC,OAAO,CAAC,IAAI,CAAC;YACnC,CAAC,CAAC,MAAM,IAAI,YAAY,CAAC;gBACrB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,0BAA0B;gBACnC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAW,CAAC,CAAC,MAAM;gBACxC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAW,CAAC;aACpC,CAAC,CAAC,GAAG,EAAE,CAAC;QAEb,MAAM,WAAW,GACf,OAAO,CAAC,IAAI;YACZ,CAAC,MAAM,IAAA,mBAAW,EAChB,qFAAqF,EACrF,kBAAkB,CACnB,CAAC,CAAC;QACL,MAAM,gBAAgB,GAAG,IAAA,2BAAmB,EAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACzE,MAAM,gBAAgB,GAAG,IAAA,wBAAgB,EAAC,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,IAAI,gBAAgB,EAAE,CAAC,CAAC;QACjH,MAAM,UAAU,GAAG,QAAQ,gBAAgB,EAAE,CAAC;QAC9C,MAAM,eAAe,GAAG,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,gBAAgB,EAAE,CAAC;QAC3E,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9D,IAAA,wBAAQ,EACN,6BAA6B,cAAc,qBAAqB,eAAe,kBAAkB,UAAU,iBAAiB,eAAe,EAAE,EAC7I,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAC;QAEF,OAAO,GAAS,EAAE;YAChB,IAAA,wBAAQ,EAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,gBAAgB,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.libRenameGenerator = libRenameGenerator;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const child_process_1 = require("child_process");
|
|
6
|
-
const path = require("path");
|
|
7
6
|
const utils_1 = require("../../shared/utils");
|
|
8
7
|
function libRenameGenerator(tree, options) {
|
|
9
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -15,10 +14,7 @@ function libRenameGenerator(tree, options) {
|
|
|
15
14
|
libPathSegments.shift();
|
|
16
15
|
libPathSegments.push(destLibraryName);
|
|
17
16
|
const destLibraryPath = `libs/${libPathSegments.join('/')}`;
|
|
18
|
-
const newLibImportPath =
|
|
19
|
-
.normalize(libPathSegments.join('/'))
|
|
20
|
-
.split(path.sep)
|
|
21
|
-
.join('/');
|
|
17
|
+
const newLibImportPath = (0, utils_1.normalizeLibPath)(libPathSegments.join('/'));
|
|
22
18
|
const fullLibraryPath = `${(0, utils_1.getImportPathPrefix)(tree)}/${newLibImportPath}`;
|
|
23
19
|
const fullLibraryName = newLibImportPath.split('/').join('-');
|
|
24
20
|
(0, child_process_1.execSync)(`npx nx g mv --projectName=${currentLibraryName} --newProjectName=${fullLibraryName} --destination=${destLibraryPath} --importPath=${fullLibraryPath}`, { stdio: 'inherit' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/lib-rename/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/lib-rename/generator.ts"],"names":[],"mappings":";;AAKA,gDAwBC;;AA7BD,iDAAyC;AAEzC,8CAAiH;AAGjH,SAAsB,kBAAkB,CAAC,IAAU,EAAE,OAAiC;;QACpF,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,+BAAuB,EAC1F,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,CAAC;QAEF,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,sBAAsB,GAAG,eAAe,CAAC,GAAG,EAAE,CAAC;QACrD,MAAM,eAAe,GACnB,OAAO,CAAC,UAAU,IAAI,CAAC,MAAM,IAAA,mBAAW,EAAC,4BAA4B,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAElG,8BAA8B;QAC9B,eAAe,CAAC,KAAK,EAAE,CAAC;QACxB,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEtC,MAAM,eAAe,GAAG,QAAQ,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5D,MAAM,gBAAgB,GAAG,IAAA,wBAAgB,EAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,GAAG,IAAA,2BAAmB,EAAC,IAAI,CAAC,IAAI,gBAAgB,EAAE,CAAC;QAC3E,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE9D,IAAA,wBAAQ,EACN,6BAA6B,kBAAkB,qBAAqB,eAAe,kBAAkB,eAAe,iBAAiB,eAAe,EAAE,EACtJ,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -6,25 +6,21 @@ import { ReactElement, ReactNode } from 'react';
|
|
|
6
6
|
import { constants } from '../../constants';
|
|
7
7
|
<% if(hasProviders) { %> import { Providers } from './providers';<% } %>
|
|
8
8
|
import type { Locale } from '<%= libPath %>/shared/utils/i18n';
|
|
9
|
+
import type { Metadata } from 'next';
|
|
9
10
|
|
|
10
|
-
export const metadata = {
|
|
11
|
+
export const metadata: Metadata = {
|
|
11
12
|
title: '<%= formatName(name) %>',
|
|
12
13
|
};
|
|
13
14
|
|
|
14
|
-
export interface RootLayoutProps {
|
|
15
|
-
children: ReactNode;
|
|
16
|
-
params: Promise<{ locale: Locale }>;
|
|
17
|
-
}
|
|
18
|
-
|
|
19
15
|
const locales = constants.locales;
|
|
20
16
|
|
|
21
|
-
export const generateStaticParams = (): Array<{ locale:
|
|
17
|
+
export const generateStaticParams = (): Array<{ locale: string }> =>
|
|
22
18
|
locales.map((locale) => ({ locale }));
|
|
23
19
|
|
|
24
|
-
export default async function RootLayout({ children, params }:
|
|
20
|
+
export default async function RootLayout({ children, params }: LayoutProps<'/[locale]'>): Promise<ReactElement> {
|
|
25
21
|
const { locale } = await params;
|
|
26
22
|
|
|
27
|
-
if (!locales.includes(locale)) {
|
|
23
|
+
if (!locales.includes(locale as Locale)) {
|
|
28
24
|
notFound();
|
|
29
25
|
}
|
|
30
26
|
|
|
@@ -31,10 +31,7 @@ function reactLibGenerator(tree, options) {
|
|
|
31
31
|
const scopeTag = options.scope || utils_1.constants.sharedValue;
|
|
32
32
|
const tags = [`app:${options.app}`, `scope:${scopeTag}`, `type:${options.type}`];
|
|
33
33
|
const libDirectoryName = (0, utils_1.getLibDirectoryName)(options.name, options.scope);
|
|
34
|
-
const libName =
|
|
35
|
-
.normalize(`${options.app}/${options.scope}/${options.type}/${libDirectoryName}`)
|
|
36
|
-
.split(path.sep)
|
|
37
|
-
.join('/');
|
|
34
|
+
const libName = (0, utils_1.normalizeLibPath)(`${options.app}/${options.scope}/${options.type}/${libDirectoryName}`);
|
|
38
35
|
const libPath = `libs/${libName}`;
|
|
39
36
|
const command = `npx nx g @nx/react:library --skipPackageJson --unitTestRunner=none --tags="${tags.join(', ')}" --name=${libName} ${libPath} --linter=eslint --component=false --bundler=none --style=scss`;
|
|
40
37
|
const commandWithOptions = options.dryRun ? command + ' --dry-run' : command;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/react-lib/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../plugin/src/generators/react-lib/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,6 +75,7 @@ export declare const devDependencies: {
|
|
|
75
75
|
'eslint-plugin-react-hooks': string;
|
|
76
76
|
'eslint-plugin-unused-imports': string;
|
|
77
77
|
husky: string;
|
|
78
|
+
'typescript-eslint': string;
|
|
78
79
|
'@stylistic/eslint-plugin': string;
|
|
79
80
|
'@typescript-eslint/eslint-plugin': string;
|
|
80
81
|
'@typescript-eslint/parser': string;
|
|
@@ -82,8 +83,9 @@ export declare const devDependencies: {
|
|
|
82
83
|
};
|
|
83
84
|
'expo-app': {
|
|
84
85
|
'@types/lodash-es': string;
|
|
86
|
+
'@types/react': string;
|
|
87
|
+
'@types/react-dom': string;
|
|
85
88
|
'@expo/cli': string;
|
|
86
|
-
"@types/react": string;
|
|
87
89
|
'reactotron-react-native': string;
|
|
88
90
|
'reactotron-redux': string;
|
|
89
91
|
metro: string;
|
|
@@ -7,10 +7,10 @@ exports.dependencies = {
|
|
|
7
7
|
'react-native-mmkv': '~3.3.3',
|
|
8
8
|
'expo-constants': '~18.0.10',
|
|
9
9
|
'expo-dev-client': '~6.0.16',
|
|
10
|
-
'expo-router': '~6.0.
|
|
10
|
+
'expo-router': '~6.0.15',
|
|
11
11
|
'react-native-safe-area-context': '~5.6.2',
|
|
12
12
|
'react-native-screens': '~4.16.0',
|
|
13
|
-
expo: '~54.0.
|
|
13
|
+
expo: '~54.0.25',
|
|
14
14
|
'expo-linking': '~8.0.8',
|
|
15
15
|
'expo-status-bar': '~3.0.8',
|
|
16
16
|
'expo-updates': '~29.0.12',
|
|
@@ -25,10 +25,10 @@ exports.dependencies = {
|
|
|
25
25
|
'react-native-svg-transformer': '~1.5.1',
|
|
26
26
|
},
|
|
27
27
|
'next-app': {
|
|
28
|
-
'next-intl': '^4.3
|
|
28
|
+
'next-intl': '^4.5.3',
|
|
29
29
|
'lodash-es': '^4.17.21',
|
|
30
30
|
'class-transformer': '^0.5.1',
|
|
31
|
-
next: '~
|
|
31
|
+
next: '~16.0.3',
|
|
32
32
|
},
|
|
33
33
|
'api-client': {
|
|
34
34
|
'@ronas-it/axios-api-client': '^0.1.2',
|
|
@@ -78,6 +78,7 @@ exports.devDependencies = {
|
|
|
78
78
|
'eslint-plugin-react-hooks': '^7.0.0',
|
|
79
79
|
'eslint-plugin-unused-imports': '^4.2.0',
|
|
80
80
|
husky: '^9.1.7',
|
|
81
|
+
'typescript-eslint': '^8.46.0',
|
|
81
82
|
'@stylistic/eslint-plugin': '^4.4.1',
|
|
82
83
|
'@typescript-eslint/eslint-plugin': '^8.46.0',
|
|
83
84
|
'@typescript-eslint/parser': '^8.46.0',
|
|
@@ -85,15 +86,16 @@ exports.devDependencies = {
|
|
|
85
86
|
},
|
|
86
87
|
'expo-app': {
|
|
87
88
|
'@types/lodash-es': '^4.17.12',
|
|
89
|
+
'@types/react': '^19.1.0',
|
|
90
|
+
'@types/react-dom': '^19.1.0',
|
|
88
91
|
'@expo/cli': '~54.0.11',
|
|
89
|
-
"@types/react": "~19.1.0",
|
|
90
92
|
'reactotron-react-native': '~5.1.17',
|
|
91
93
|
'reactotron-redux': '~3.2.1',
|
|
92
|
-
metro: '
|
|
93
|
-
'metro-config': '
|
|
94
|
+
metro: '~0.83.1',
|
|
95
|
+
'metro-config': '~0.83.1',
|
|
94
96
|
},
|
|
95
97
|
'next-app': {
|
|
96
|
-
'eslint-config-next': '^
|
|
98
|
+
'eslint-config-next': '^16.0.3',
|
|
97
99
|
'@types/lodash-es': '^4.17.12',
|
|
98
100
|
},
|
|
99
101
|
'repo-config': {
|
|
@@ -101,7 +103,7 @@ exports.devDependencies = {
|
|
|
101
103
|
'cross-env': '^10.1.0',
|
|
102
104
|
},
|
|
103
105
|
auth: {
|
|
104
|
-
'@types/luxon': '3.7.1',
|
|
106
|
+
'@types/luxon': '^3.7.1',
|
|
105
107
|
},
|
|
106
108
|
'next-auth': {
|
|
107
109
|
'@types/js-cookie': '^3.0.6',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,UAAU;QAC5B,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,SAAS;QACxB,gCAAgC,EAAE,QAAQ;QAC1C,sBAAsB,EAAE,SAAS;QACjC,IAAI,EAAE,UAAU;QAChB,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,QAAQ;QAC3B,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,SAAS;QAC1B,mBAAmB,EAAE,SAAS;QAC9B,SAAS,EAAE,QAAQ;QACnB,WAAW,EAAE,UAAU;QACvB,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,SAAS;QACtB,cAAc,EAAE,SAAS;QACzB,kBAAkB,EAAE,UAAU;QAC9B,8BAA8B,EAAE,QAAQ;KACzC;IACD,UAAU,EAAE;QACV,WAAW,EAAE,
|
|
1
|
+
{"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,UAAU;QAC5B,iBAAiB,EAAE,SAAS;QAC5B,aAAa,EAAE,SAAS;QACxB,gCAAgC,EAAE,QAAQ;QAC1C,sBAAsB,EAAE,SAAS;QACjC,IAAI,EAAE,UAAU;QAChB,cAAc,EAAE,QAAQ;QACxB,iBAAiB,EAAE,QAAQ;QAC3B,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,SAAS;QAC1B,mBAAmB,EAAE,SAAS;QAC9B,SAAS,EAAE,QAAQ;QACnB,WAAW,EAAE,UAAU;QACvB,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,SAAS;QACtB,cAAc,EAAE,SAAS;QACzB,kBAAkB,EAAE,UAAU;QAC9B,8BAA8B,EAAE,QAAQ;KACzC;IACD,UAAU,EAAE;QACV,WAAW,EAAE,QAAQ;QACrB,WAAW,EAAE,UAAU;QACvB,mBAAmB,EAAE,QAAQ;QAC7B,IAAI,EAAE,SAAS;KAChB;IACD,YAAY,EAAE;QACZ,4BAA4B,EAAE,QAAQ;KACvC;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;KAChB;IACD,WAAW,EAAE;QACX,WAAW,EAAE,QAAQ;KACtB;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,UAAU;SAC7B;KACF;CACF,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,aAAa,EAAE;QACb,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,QAAQ;QAC5B,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,QAAQ;QAClB,wBAAwB,EAAE,SAAS;QACnC,mCAAmC,EAAE,QAAQ;QAC7C,sBAAsB,EAAE,SAAS;QACjC,wBAAwB,EAAE,SAAS;QACnC,qBAAqB,EAAE,SAAS;QAChC,2BAA2B,EAAE,QAAQ;QACrC,8BAA8B,EAAE,QAAQ;QACxC,KAAK,EAAE,QAAQ;QACf,mBAAmB,EAAE,SAAS;QAC9B,0BAA0B,EAAE,QAAQ;QACpC,kCAAkC,EAAE,SAAS;QAC7C,2BAA2B,EAAE,SAAS;QACtC,WAAW,EAAE,QAAQ;KACtB;IACD,UAAU,EAAE;QACV,kBAAkB,EAAE,UAAU;QAC9B,cAAc,EAAE,SAAS;QACzB,kBAAkB,EAAE,SAAS;QAC7B,WAAW,EAAE,UAAU;QACvB,yBAAyB,EAAE,SAAS;QACpC,kBAAkB,EAAE,QAAQ;QAC5B,KAAK,EAAE,SAAS;QAChB,cAAc,EAAE,SAAS;KAC1B;IACD,UAAU,EAAE;QACV,oBAAoB,EAAE,SAAS;QAC/B,kBAAkB,EAAE,UAAU;KAC/B;IACD,aAAa,EAAE;QACb,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,SAAS;KACvB;IACD,IAAI,EAAE;QACJ,cAAc,EAAE,QAAQ;KACzB;IACD,WAAW,EAAE;QACX,kBAAkB,EAAE,QAAQ;KAC7B;CACF,CAAC"}
|
|
@@ -6,7 +6,6 @@ import {
|
|
|
6
6
|
<% if (type === 'expo-app') { %>tokenInterceptor,<% } %>
|
|
7
7
|
unauthorizedInterceptor
|
|
8
8
|
} from '@ronas-it/axios-api-client';
|
|
9
|
-
import { storeActions } from '@ronas-it/rtkq-entity-api';
|
|
10
9
|
<% if (type === 'next-app') { %>import { DateTime } from 'luxon';<% } %>
|
|
11
10
|
import { authApi, profileApi, LogInResponse } from '<%= libPath %>/shared/data-access/api';
|
|
12
11
|
import { apiService, configuration } from '<%= libPath %>/shared/data-access/api-client';
|
|
@@ -17,20 +16,6 @@ import { authActions, authReducerPath, authSelectors, AuthState } from './slice'
|
|
|
17
16
|
export const authListenerMiddleware = createListenerMiddleware<{ [authReducerPath]: AuthState }>();
|
|
18
17
|
|
|
19
18
|
<% if (type === 'expo-app') { %>authListenerMiddleware.startListening({
|
|
20
|
-
actionCreator: storeActions.init,
|
|
21
|
-
effect: (_, { dispatch }) => {
|
|
22
|
-
const token = storage.getString(AppStorageValue.TOKEN);
|
|
23
|
-
dispatch(authActions.setIsAuthenticated(Boolean(token)));
|
|
24
|
-
|
|
25
|
-
apiService.useInterceptors({
|
|
26
|
-
request: [[tokenInterceptor({ getToken: () => storage.getString(AppStorageValue.TOKEN) ?? '' })]],
|
|
27
|
-
});
|
|
28
|
-
|
|
29
|
-
dispatch(authActions.setIsAppReady(true));
|
|
30
|
-
},
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
authListenerMiddleware.startListening({
|
|
34
19
|
matcher: authApi.internalActions.middlewareRegistered.match,
|
|
35
20
|
effect: (_, { dispatch, getState }) => {
|
|
36
21
|
const options: RefreshTokenInterceptorOptions = {
|
|
@@ -46,9 +31,15 @@ authListenerMiddleware.startListening({
|
|
|
46
31
|
return dispatch(authApi.endpoints.logout.initiate()).unwrap();
|
|
47
32
|
},
|
|
48
33
|
};
|
|
34
|
+
const token = storage.getString(AppStorageValue.TOKEN);
|
|
35
|
+
|
|
36
|
+
dispatch(authActions.setIsAuthenticated(Boolean(token)));
|
|
49
37
|
|
|
50
38
|
apiService.useInterceptors({
|
|
51
|
-
request: [
|
|
39
|
+
request: [
|
|
40
|
+
[onRequestRefreshTokenInterceptor(options)],
|
|
41
|
+
[tokenInterceptor({ getToken: () => storage.getString(AppStorageValue.TOKEN) ?? '' })],
|
|
42
|
+
],
|
|
52
43
|
response: [
|
|
53
44
|
[null, onResponseRefreshTokenInterceptor(options)],
|
|
54
45
|
[
|
|
@@ -72,7 +63,7 @@ authListenerMiddleware.startListening({
|
|
|
72
63
|
});<% } %>
|
|
73
64
|
|
|
74
65
|
<% if (type === 'next-app') { %>authListenerMiddleware.startListening({
|
|
75
|
-
|
|
66
|
+
matcher: authApi.internalActions.middlewareRegistered.match,
|
|
76
67
|
effect: async (_, { dispatch, getState }) => {
|
|
77
68
|
const getIsAuthenticated = (): boolean | null => authSelectors.isAuthenticated(getState());
|
|
78
69
|
|
|
@@ -118,8 +109,6 @@ authListenerMiddleware.startListening({
|
|
|
118
109
|
],
|
|
119
110
|
],
|
|
120
111
|
});
|
|
121
|
-
|
|
122
|
-
dispatch(authActions.setIsAppReady(true));
|
|
123
112
|
},
|
|
124
113
|
});
|
|
125
114
|
|
|
@@ -3,13 +3,11 @@ import { PayloadAction, createSlice } from '@reduxjs/toolkit';
|
|
|
3
3
|
|
|
4
4
|
export interface AuthState {
|
|
5
5
|
isAuthenticated: boolean | null;
|
|
6
|
-
isAppReady: boolean;
|
|
7
6
|
<% if (type === 'next-app') { %>expiryDate: Date | null;<% } %>
|
|
8
7
|
}
|
|
9
8
|
|
|
10
9
|
const initialState: AuthState = {
|
|
11
10
|
isAuthenticated: <% if (type === 'next-app') { %>CookieService.get('isAuthenticated') === 'true',<% } else { %>null,<% } %>
|
|
12
|
-
isAppReady: false,
|
|
13
11
|
<% if (type === 'next-app') { %>expiryDate: new Date(CookieService.get('tokenExpiryDate')),<% } %>
|
|
14
12
|
};
|
|
15
13
|
|
|
@@ -20,9 +18,6 @@ const authSlice = createSlice({
|
|
|
20
18
|
setIsAuthenticated(state, { payload }: PayloadAction<boolean>) {
|
|
21
19
|
state.isAuthenticated = payload;
|
|
22
20
|
},
|
|
23
|
-
setIsAppReady(state, { payload }: PayloadAction<boolean>) {
|
|
24
|
-
state.isAppReady = payload;
|
|
25
|
-
},
|
|
26
21
|
<% if (type === 'next-app') { %>setExpiryDate(state, { payload }: PayloadAction<AuthState['expiryDate']>) {
|
|
27
22
|
state.expiryDate = payload;
|
|
28
23
|
},<% } %>
|
|
@@ -33,7 +28,6 @@ const authSlice = createSlice({
|
|
|
33
28
|
},
|
|
34
29
|
selectors: {
|
|
35
30
|
isAuthenticated: (state) => state.isAuthenticated,
|
|
36
|
-
isAppReady: (state) => state.isAppReady,
|
|
37
31
|
<% if (type === 'next-app') { %>expiryDate: (state) => state.expiryDate,<% } %>
|
|
38
32
|
},
|
|
39
33
|
});
|
|
@@ -19,8 +19,8 @@ const updateStore = (libRoot, workspaceRoot = process.cwd()) => {
|
|
|
19
19
|
});
|
|
20
20
|
const storePath = path.join(workspaceRoot, libRoot, 'shared/data-access/store/src/store.ts');
|
|
21
21
|
const store = project.addSourceFileAtPath(storePath);
|
|
22
|
-
const apiAlias = (0, utils_1.searchAliasPath)(path.relative(workspaceRoot, path.join(workspaceRoot, libRoot, 'shared/data-access/api/src')), workspaceRoot);
|
|
23
|
-
const authAlias = (0, utils_1.searchAliasPath)(path.relative(workspaceRoot, path.join(workspaceRoot, libRoot, 'shared/data-access/auth/src')), workspaceRoot);
|
|
22
|
+
const apiAlias = (0, utils_1.searchAliasPath)((0, utils_1.normalizeLibPath)(path.relative(workspaceRoot, path.join(workspaceRoot, libRoot, 'shared/data-access/api/src'))), workspaceRoot);
|
|
23
|
+
const authAlias = (0, utils_1.searchAliasPath)((0, utils_1.normalizeLibPath)(path.relative(workspaceRoot, path.join(workspaceRoot, libRoot, 'shared/data-access/auth/src'))), workspaceRoot);
|
|
24
24
|
if (!apiAlias) {
|
|
25
25
|
throw new Error('Could not find API library.');
|
|
26
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/auth/generator.ts"],"names":[],"mappings":";;AA6DA,4CA6DC;;AA1HD,iDAAyC;AACzC,2BAAgC;AAChC,6BAA6B;AAC7B,uCAAiH;AACjH,uCAA0F;AAC1F,qDAAmE;AACnE,uCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../plugin/src/shared/generators/auth/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,13 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import { Provider, useDispatch, useSelector } from 'react-redux';
|
|
6
|
-
import { authSelectors } from '<%= libPath %>/shared/data-access/auth';
|
|
3
|
+
import { PropsWithChildren, ReactElement } from 'react';
|
|
4
|
+
import { Provider } from 'react-redux';
|
|
7
5
|
import { store } from '<%= libPath %>/shared/data-access/store';
|
|
8
6
|
|
|
9
|
-
function App({ children }: PropsWithChildren): ReactNode {
|
|
10
|
-
const dispatch = useDispatch();
|
|
11
|
-
const isAppReady = useSelector(authSelectors.isAppReady);
|
|
12
|
-
|
|
13
|
-
useEffect(() => {
|
|
14
|
-
dispatch(storeActions.init());
|
|
15
|
-
}, []);
|
|
16
|
-
|
|
17
|
-
return isAppReady ? children : null;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
7
|
export function Providers({ children }: PropsWithChildren): ReactElement {
|
|
21
8
|
return (
|
|
22
9
|
<Provider store={store}>
|
|
23
|
-
|
|
10
|
+
{children}
|
|
24
11
|
</Provider>
|
|
25
12
|
);
|
|
26
13
|
}
|
package/src/shared/generators/auth/next-app-files/{middleware.ts.template → proxy.ts.template}
RENAMED
|
@@ -19,7 +19,7 @@ const intlMiddleware = createMiddleware({
|
|
|
19
19
|
localePrefix: 'never',
|
|
20
20
|
});
|
|
21
21
|
|
|
22
|
-
export default async function
|
|
22
|
+
export default async function proxy(request: NextRequest): Promise<NextResponse> {
|
|
23
23
|
const pathname = request.nextUrl.pathname;
|
|
24
24
|
const isAuthenticated = request.cookies.get(cookieConfig.keys.isAuthenticated)?.value === 'true';
|
|
25
25
|
|
|
@@ -2,3 +2,4 @@ export declare const formatName: (value: string, withoutSpaces?: boolean) => str
|
|
|
2
2
|
export declare const formatAppIdentifier: (value: string) => string;
|
|
3
3
|
export declare const getProjectName: (str: string) => string;
|
|
4
4
|
export declare const getLibName: (path: string) => string | undefined;
|
|
5
|
+
export declare const normalizeLibPath: (libPath: string) => string;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getLibName = exports.getProjectName = exports.formatAppIdentifier = exports.formatName = void 0;
|
|
3
|
+
exports.normalizeLibPath = exports.getLibName = exports.getProjectName = exports.formatAppIdentifier = exports.formatName = void 0;
|
|
4
|
+
const path = require("path");
|
|
4
5
|
const formatName = (value, withoutSpaces = false) => value
|
|
5
6
|
.split('-')
|
|
6
7
|
.map((word) => `${word.charAt(0).toUpperCase()}${word.substring(1)}`)
|
|
@@ -15,4 +16,6 @@ const getProjectName = (str) => {
|
|
|
15
16
|
exports.getProjectName = getProjectName;
|
|
16
17
|
const getLibName = (path) => path.split('/').pop();
|
|
17
18
|
exports.getLibName = getLibName;
|
|
19
|
+
const normalizeLibPath = (libPath) => path.normalize(libPath).split(path.sep).join('/');
|
|
20
|
+
exports.normalizeLibPath = normalizeLibPath;
|
|
18
21
|
//# sourceMappingURL=format-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-utils.js","sourceRoot":"","sources":["../../../../../plugin/src/shared/utils/format-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"format-utils.js","sourceRoot":"","sources":["../../../../../plugin/src/shared/utils/format-utils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAEtB,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,aAAa,GAAG,KAAK,EAAU,EAAE,CACzE,KAAK;KACF,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;KACpE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAJvB,QAAA,UAAU,cAIa;AAE7B,MAAM,mBAAmB,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAAxF,QAAA,mBAAmB,uBAAqE;AAE9F,MAAM,cAAc,GAAG,CAAC,GAAW,EAAU,EAAE;IACpD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,UAAU,GAAG,CAAC,IAAY,EAAsB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;AAAzE,QAAA,UAAU,cAA+D;AAE/E,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAAlG,QAAA,gBAAgB,oBAAkF"}
|
|
File without changes
|