@akinon/next 1.22.0-rc.1 → 1.22.0
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/CHANGELOG.md +3 -13
- package/api/auth.ts +0 -11
- package/data/client/wishlist.ts +0 -2
- package/data/server/category.ts +3 -3
- package/data/server/list.ts +1 -1
- package/hooks/use-pagination.ts +4 -0
- package/package.json +2 -2
- package/plugins.d.ts +0 -4
- package/redux/reducers/index.ts +1 -3
- package/sentry/index.ts +14 -20
- package/types/index.ts +0 -6
- package/utils/app-fetch.ts +6 -17
package/CHANGELOG.md
CHANGED
|
@@ -1,22 +1,12 @@
|
|
|
1
1
|
# @akinon/next
|
|
2
2
|
|
|
3
|
-
## 1.22.0
|
|
4
|
-
|
|
5
|
-
## 1.22.0-rc.0
|
|
3
|
+
## 1.22.0
|
|
6
4
|
|
|
7
5
|
### Minor Changes
|
|
8
6
|
|
|
7
|
+
- 8075006: ZERO-2435: install plugins check the akinon version
|
|
9
8
|
- 32668ed: ZERO-2296: Implement Checkout Provider Middleware and Enhancements
|
|
10
|
-
-
|
|
11
|
-
- 07cc81a: Add infinite and more types to pagination
|
|
12
|
-
- 8d6caba: ZERO-2434: enhance error handling and logging in appFetch function
|
|
13
|
-
- 1b4b0fa: Redis connection change to connection pool
|
|
14
|
-
- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
|
|
15
|
-
- b2da5e4: Revert ZERO-2435
|
|
16
|
-
|
|
17
|
-
### Patch Changes
|
|
18
|
-
|
|
19
|
-
- da1e501: ZERO-2296: Fix ROUTES import
|
|
9
|
+
- 1b4b0fa: ZERO-2424: Redis connection change to connection pool
|
|
20
10
|
|
|
21
11
|
## 1.21.0
|
|
22
12
|
|
package/api/auth.ts
CHANGED
|
@@ -220,17 +220,6 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
|
|
|
220
220
|
pages: {
|
|
221
221
|
signIn: ROUTES.AUTH,
|
|
222
222
|
error: ROUTES.AUTH
|
|
223
|
-
},
|
|
224
|
-
cookies: {
|
|
225
|
-
sessionToken: {
|
|
226
|
-
name: `__Secure-next-auth.session-token`,
|
|
227
|
-
options: {
|
|
228
|
-
httpOnly: true,
|
|
229
|
-
sameSite: 'none',
|
|
230
|
-
path: '/',
|
|
231
|
-
secure: true
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
223
|
}
|
|
235
224
|
};
|
|
236
225
|
};
|
package/data/client/wishlist.ts
CHANGED
package/data/server/category.ts
CHANGED
|
@@ -15,7 +15,7 @@ function getCategoryDataHandler(
|
|
|
15
15
|
const params = generateCommerceSearchParams(searchParams);
|
|
16
16
|
|
|
17
17
|
const rawData = await appFetch<string>(
|
|
18
|
-
`${category.getCategoryByPk(pk)}
|
|
18
|
+
`${category.getCategoryByPk(pk)}${params ? params : ''}`,
|
|
19
19
|
{
|
|
20
20
|
headers: {
|
|
21
21
|
Accept: 'application/json',
|
|
@@ -39,7 +39,7 @@ function getCategoryDataHandler(
|
|
|
39
39
|
numberValueParser
|
|
40
40
|
) as GetCategoryResponse;
|
|
41
41
|
} catch (error) {
|
|
42
|
-
logger.
|
|
42
|
+
logger.error('Error while parsing category data', {
|
|
43
43
|
handler: 'getCategoryDataHandler',
|
|
44
44
|
error,
|
|
45
45
|
rawData: rawData.startsWith('<!DOCTYPE html>')
|
|
@@ -108,7 +108,7 @@ function getCategoryBySlugDataHandler(slug: string) {
|
|
|
108
108
|
numberValueParser
|
|
109
109
|
) as GetCategoryResponse;
|
|
110
110
|
} catch (error) {
|
|
111
|
-
logger.
|
|
111
|
+
logger.error('Error while parsing category data', {
|
|
112
112
|
handler: 'getCategoryBySlugDataHandler',
|
|
113
113
|
error,
|
|
114
114
|
rawData: rawData.startsWith('<!DOCTYPE html>')
|
package/data/server/list.ts
CHANGED
|
@@ -38,7 +38,7 @@ const getListDataHandler = (
|
|
|
38
38
|
numberValueParser
|
|
39
39
|
) as GetCategoryResponse;
|
|
40
40
|
} catch (error) {
|
|
41
|
-
logger.
|
|
41
|
+
logger.error('Error while parsing list data', {
|
|
42
42
|
error,
|
|
43
43
|
rawData: rawData.startsWith('<!DOCTYPE html>')
|
|
44
44
|
? `${rawData.substring(0, 50)}...`
|
package/hooks/use-pagination.ts
CHANGED
|
@@ -70,6 +70,10 @@ export default function usePagination(
|
|
|
70
70
|
dispatch({ type: 'setLimit', payload: limit });
|
|
71
71
|
}, [limit]);
|
|
72
72
|
|
|
73
|
+
useEffect(() => {
|
|
74
|
+
window.scrollTo(0, 0);
|
|
75
|
+
}, [state.page, state.limit]);
|
|
76
|
+
|
|
73
77
|
const setTotal = useCallback(
|
|
74
78
|
(total: number) => {
|
|
75
79
|
dispatch({ type: 'setTotal', payload: total });
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@akinon/next",
|
|
3
3
|
"description": "Core package for Project Zero Next",
|
|
4
|
-
"version": "1.22.0
|
|
4
|
+
"version": "1.22.0",
|
|
5
5
|
"private": false,
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"bin": {
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@typescript-eslint/eslint-plugin": "6.7.4",
|
|
33
33
|
"@typescript-eslint/parser": "6.7.4",
|
|
34
34
|
"eslint": "^8.14.0",
|
|
35
|
-
"@akinon/eslint-plugin-projectzero": "1.22.0
|
|
35
|
+
"@akinon/eslint-plugin-projectzero": "1.22.0",
|
|
36
36
|
"eslint-config-prettier": "8.5.0"
|
|
37
37
|
}
|
|
38
38
|
}
|
package/plugins.d.ts
CHANGED
package/redux/reducers/index.ts
CHANGED
|
@@ -6,7 +6,6 @@ import { api } from '../../data/client/api';
|
|
|
6
6
|
|
|
7
7
|
// Plugin reducers
|
|
8
8
|
import { masterpassReducer } from '@akinon/pz-masterpass';
|
|
9
|
-
import { otpReducer } from '@akinon/pz-otp';
|
|
10
9
|
|
|
11
10
|
const reducers = {
|
|
12
11
|
[api.reducerPath]: api.reducer,
|
|
@@ -14,8 +13,7 @@ const reducers = {
|
|
|
14
13
|
checkout: checkoutReducer,
|
|
15
14
|
config: configReducer,
|
|
16
15
|
header: headerReducer,
|
|
17
|
-
masterpass: masterpassReducer
|
|
18
|
-
otp: otpReducer
|
|
16
|
+
masterpass: masterpassReducer
|
|
19
17
|
};
|
|
20
18
|
|
|
21
19
|
export default reducers;
|
package/sentry/index.ts
CHANGED
|
@@ -1,33 +1,27 @@
|
|
|
1
1
|
import * as Sentry from '@sentry/nextjs';
|
|
2
|
-
import settings from 'settings';
|
|
3
2
|
|
|
4
3
|
const SENTRY_DSN: string =
|
|
5
|
-
|
|
6
|
-
process.env.SENTRY_DSN ||
|
|
7
|
-
process.env.NEXT_PUBLIC_SENTRY_DSN;
|
|
4
|
+
process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
|
|
8
5
|
|
|
9
6
|
export const initSentry = (
|
|
10
7
|
type: 'Server' | 'Client' | 'Edge',
|
|
11
|
-
options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {
|
|
12
|
-
dsn: SENTRY_DSN,
|
|
13
|
-
integrations: [],
|
|
14
|
-
tracesSampleRate: 1.0
|
|
15
|
-
}
|
|
8
|
+
options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
|
|
16
9
|
) => {
|
|
17
|
-
|
|
18
|
-
|
|
10
|
+
// TODO: Handle options with ESLint rules
|
|
11
|
+
|
|
12
|
+
// TODO: Remove Zero Project DSN
|
|
13
|
+
|
|
14
|
+
Sentry.init({
|
|
15
|
+
dsn:
|
|
16
|
+
SENTRY_DSN ||
|
|
17
|
+
'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
|
|
19
18
|
initialScope: {
|
|
20
19
|
tags: {
|
|
21
|
-
...((
|
|
22
|
-
options.initialScope as {
|
|
23
|
-
tags?: Record<string, string>;
|
|
24
|
-
}
|
|
25
|
-
)?.tags ?? {}),
|
|
26
20
|
APP_TYPE: 'ProjectZeroNext',
|
|
27
21
|
TYPE: type
|
|
28
22
|
}
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
23
|
+
},
|
|
24
|
+
tracesSampleRate: 1.0,
|
|
25
|
+
integrations: []
|
|
26
|
+
});
|
|
33
27
|
};
|
package/types/index.ts
CHANGED
|
@@ -71,12 +71,6 @@ export interface Currency {
|
|
|
71
71
|
|
|
72
72
|
export interface Settings {
|
|
73
73
|
commerceUrl: string;
|
|
74
|
-
/**
|
|
75
|
-
* This option allows you to track Sentry events on the client side, in addition to server and edge environments.
|
|
76
|
-
*
|
|
77
|
-
* It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
|
|
78
|
-
*/
|
|
79
|
-
sentryDsn?: string;
|
|
80
74
|
redis: {
|
|
81
75
|
defaultExpirationTime: number;
|
|
82
76
|
};
|
package/utils/app-fetch.ts
CHANGED
|
@@ -12,7 +12,7 @@ const appFetch = async <T>(
|
|
|
12
12
|
url: RequestInfo,
|
|
13
13
|
init: RequestInit = {},
|
|
14
14
|
responseType = FetchResponseType.JSON
|
|
15
|
-
)
|
|
15
|
+
) => {
|
|
16
16
|
let response: T;
|
|
17
17
|
let status: number;
|
|
18
18
|
let ip = '';
|
|
@@ -28,7 +28,7 @@ const appFetch = async <T>(
|
|
|
28
28
|
|
|
29
29
|
if (commerceUrl === 'default') {
|
|
30
30
|
logger.error('Commerce URL is not set. Current value is "default"');
|
|
31
|
-
|
|
31
|
+
return undefined;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
|
|
@@ -48,30 +48,19 @@ const appFetch = async <T>(
|
|
|
48
48
|
status = req.status;
|
|
49
49
|
logger.debug(`FETCH END ${url}`, { status: req.status, ip });
|
|
50
50
|
|
|
51
|
-
|
|
52
|
-
throw new Error(`Request failed with status ${status}`);
|
|
53
|
-
}
|
|
51
|
+
const rawData = await req.text();
|
|
54
52
|
|
|
55
53
|
if (responseType === FetchResponseType.JSON) {
|
|
56
|
-
response =
|
|
54
|
+
response = JSON.parse(rawData);
|
|
57
55
|
} else {
|
|
58
|
-
response =
|
|
56
|
+
response = rawData as unknown as T;
|
|
59
57
|
}
|
|
60
58
|
|
|
61
59
|
logger.trace(`FETCH RESPONSE`, { url, response, ip });
|
|
62
60
|
} catch (error) {
|
|
63
|
-
const logType = status === 500 ? 'fatal' : 'error';
|
|
64
|
-
|
|
65
61
|
if (!url.toString().includes('/cms/seo/')) {
|
|
66
|
-
logger
|
|
62
|
+
logger.error(`FETCH FAILED`, { url, status, error, ip });
|
|
67
63
|
}
|
|
68
|
-
|
|
69
|
-
// throw the error if it's fatal, so it can be caught and handled at higher levels
|
|
70
|
-
if (logType === 'fatal') {
|
|
71
|
-
throw error;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
return Promise.reject(error);
|
|
75
64
|
}
|
|
76
65
|
|
|
77
66
|
return response;
|