@akinon/next 1.14.0 → 1.14.1

package/api/client.ts

@@ -1,174 +1,174 @@
-import { ClientRequestOptions } from '../types';
-import { NextResponse } from 'next/server';
-import settings from 'settings';
-import logger from '../utils/log';
-
-interface RouteParams {
-  params: {
-    slug: string[];
-  };
-}
-
-async function proxyRequest(...args) {
-  const [req, { params }] = args as [req: Request, params: RouteParams];
-  const { searchParams } = new URL(req.url);
-  const commerceUrl = settings.commerceUrl;
-
-  if (commerceUrl === 'default') {
-    return NextResponse.json(
-      { error: 'Commerce URL not found' },
-      { status: 404 }
-    );
-  }
-
-  const options: ClientRequestOptions = {
-    useTrailingSlash: true,
-    useFormData: false,
-    contentType: null,
-    accept: 'application/json',
-    responseType: 'json'
-  };
-
-  const slug = `${params.slug.join('/')}/`;
-  const options_ = JSON.parse(
-    decodeURIComponent((searchParams.get('options') as string) ?? '{}')
-  );
-  const urlSearchParams = new URLSearchParams();
-
-  Object.assign(options, options_);
-
-  Array.from(searchParams.keys())
-    .filter((key) => !['slug', 'options'].includes(key))
-    .forEach((key) => {
-      urlSearchParams.append(key, `${searchParams.get(key)}`);
-    });
-
-  const extraHeaders = Object.fromEntries(req.headers.entries());
-
-  [
-    'x-forwarded-host',
-    'x-forwarded-for',
-    'x-forwarded-proto',
-    'x-forwarded-port',
-    'origin',
-    'host',
-    'referer',
-    'accept',
-    'content-length',
-    'content-type'
-  ].forEach((header) => delete extraHeaders[header]);
-
-  const fetchOptions = {
-    method: req.method,
-    headers: {
-      ...extraHeaders,
-      'X-Requested-With': 'XMLHttpRequest',
-      Referer: commerceUrl,
-      Accept: options.accept
-    }
-  } as RequestInit;
-
-  if (options.contentType) {
-    fetchOptions.headers['Content-Type'] = options.contentType;
-  }
-
-  if (req.method !== 'GET') {
-    const formData = new URLSearchParams();
-    let body = {};
-
-    try {
-      body = await req.json();
-    } catch (error) {
-      logger.error(
-        `Client Proxy Request - Error while parsing request body to JSON`,
-        {
-          url: req.url,
-          error
-        }
-      );
-    }
-
-    Object.keys(body ?? {}).forEach((key) => {
-      if (body[key]) {
-        formData.append(key, body[key]);
-      }
-    });
-
-    fetchOptions.body = !options.useFormData ? JSON.stringify(body) : formData;
-  }
-
-  let url = `${commerceUrl}/${slug.replace(/,/g, '/')}`;
-
-  if (!options.useTrailingSlash) {
-    url = url.replace(/\/$/, '');
-  }
-
-  if (urlSearchParams.toString().length) {
-    url += `?${urlSearchParams.toString()}`;
-  }
-
-  try {
-    const request = await fetch(url, fetchOptions);
-    let response = {} as any;
-
-    try {
-      response = await (options.responseType === 'text'
-        ? request.text()
-        : request.json());
-    } catch (error) {
-      logger.error(
-        `Client Proxy Request - Error while parsing response body to ${options.responseType}`,
-        {
-          url,
-          status: request.status,
-          fetchOptions: JSON.stringify(fetchOptions),
-          error
-        }
-      );
-    }
-
-    const setCookieHeader = request.headers.get('set-cookie');
-    const responseHeaders: any = {};
-
-    if (setCookieHeader) {
-      responseHeaders['set-cookie'] = setCookieHeader;
-    }
-
-    const statusCode = new RegExp(/^20./).test(request.status.toString())
-      ? 200
-      : request.status;
-
-    return NextResponse.json(
-      options.responseType === 'text' ? { result: response } : response,
-      { status: statusCode, headers: responseHeaders }
-    );
-  } catch (error) {
-    logger.error('Client proxy request failed', error);
-
-    return NextResponse.json({ error }, { status: 500 });
-  }
-}
-
-export async function GET(...args) {
-  return proxyRequest(...args);
-}
-
-export async function POST(...args) {
-  return proxyRequest(...args);
-}
-
-export async function PUT(...args) {
-  return proxyRequest(...args);
-}
-
-export async function PATCH(...args) {
-  return proxyRequest(...args);
-}
-
-export async function DELETE(...args) {
-  return proxyRequest(...args);
-}
-
-export async function HEAD(...args) {
-  return proxyRequest(...args);
-}
+import { ClientRequestOptions } from '../types';
+import { NextResponse } from 'next/server';
+import settings from 'settings';
+import logger from '../utils/log';
+
+interface RouteParams {
+  params: {
+    slug: string[];
+  };
+}
+
+async function proxyRequest(...args) {
+  const [req, { params }] = args as [req: Request, params: RouteParams];
+  const { searchParams } = new URL(req.url);
+  const commerceUrl = settings.commerceUrl;
+
+  if (commerceUrl === 'default') {
+    return NextResponse.json(
+      { error: 'Commerce URL not found' },
+      { status: 404 }
+    );
+  }
+
+  const options: ClientRequestOptions = {
+    useTrailingSlash: true,
+    useFormData: false,
+    contentType: null,
+    accept: 'application/json',
+    responseType: 'json'
+  };
+
+  const slug = `${params.slug.join('/')}/`;
+  const options_ = JSON.parse(
+    decodeURIComponent((searchParams.get('options') as string) ?? '{}')
+  );
+  const urlSearchParams = new URLSearchParams();
+
+  Object.assign(options, options_);
+
+  Array.from(searchParams.keys())
+    .filter((key) => !['slug', 'options'].includes(key))
+    .forEach((key) => {
+      urlSearchParams.append(key, `${searchParams.get(key)}`);
+    });
+
+  const extraHeaders = Object.fromEntries(req.headers.entries());
+
+  [
+    'x-forwarded-host',
+    'x-forwarded-for',
+    'x-forwarded-proto',
+    'x-forwarded-port',
+    'origin',
+    'host',
+    'referer',
+    'accept',
+    'content-length',
+    'content-type'
+  ].forEach((header) => delete extraHeaders[header]);
+
+  const fetchOptions = {
+    method: req.method,
+    headers: {
+      ...extraHeaders,
+      'X-Requested-With': 'XMLHttpRequest',
+      Referer: commerceUrl,
+      Accept: options.accept
+    }
+  } as RequestInit;
+
+  if (options.contentType) {
+    fetchOptions.headers['Content-Type'] = options.contentType;
+  }
+
+  if (req.method !== 'GET') {
+    const formData = new URLSearchParams();
+    let body = {};
+
+    try {
+      body = await req.json();
+    } catch (error) {
+      logger.error(
+        `Client Proxy Request - Error while parsing request body to JSON`,
+        {
+          url: req.url,
+          error
+        }
+      );
+    }
+
+    Object.keys(body ?? {}).forEach((key) => {
+      if (body[key]) {
+        formData.append(key, body[key]);
+      }
+    });
+
+    fetchOptions.body = !options.useFormData ? JSON.stringify(body) : formData;
+  }
+
+  let url = `${commerceUrl}/${slug.replace(/,/g, '/')}`;
+
+  if (!options.useTrailingSlash) {
+    url = url.replace(/\/$/, '');
+  }
+
+  if (urlSearchParams.toString().length) {
+    url += `?${urlSearchParams.toString()}`;
+  }
+
+  try {
+    const request = await fetch(url, fetchOptions);
+    let response = {} as any;
+
+    try {
+      response = await (options.responseType === 'text'
+        ? request.text()
+        : request.json());
+    } catch (error) {
+      logger.error(
+        `Client Proxy Request - Error while parsing response body to ${options.responseType}`,
+        {
+          url,
+          status: request.status,
+          fetchOptions: JSON.stringify(fetchOptions),
+          error
+        }
+      );
+    }
+
+    const setCookieHeader = request.headers.get('set-cookie');
+    const responseHeaders: any = {};
+
+    if (setCookieHeader) {
+      responseHeaders['set-cookie'] = setCookieHeader;
+    }
+
+    const statusCode = new RegExp(/^20./).test(request.status.toString())
+      ? 200
+      : request.status;
+
+    return NextResponse.json(
+      options.responseType === 'text' ? { result: response } : response,
+      { status: statusCode, headers: responseHeaders }
+    );
+  } catch (error) {
+    logger.error('Client proxy request failed', error);
+
+    return NextResponse.json({ error }, { status: 500 });
+  }
+}
+
+export async function GET(...args) {
+  return proxyRequest(...args);
+}
+
+export async function POST(...args) {
+  return proxyRequest(...args);
+}
+
+export async function PUT(...args) {
+  return proxyRequest(...args);
+}
+
+export async function PATCH(...args) {
+  return proxyRequest(...args);
+}
+
+export async function DELETE(...args) {
+  return proxyRequest(...args);
+}
+
+export async function HEAD(...args) {
+  return proxyRequest(...args);
+}

package/api/logout.ts

@@ -1,42 +1,42 @@
-import { URLS } from '../data/urls';
-import { NextResponse } from 'next/server';
-
-export async function POST(req: Request) {
-  const regexText1 = /name=['|"]csrfmiddlewaretoken['|"] value=['|"]\w+/gi;
-  const regexText2 = /name=['|"]csrfmiddlewaretoken['|"] value=['|"]/gi;
-  let sessionCookie;
-
-  if (req.headers.get('osessionid')) {
-    sessionCookie = `osessionid=${req.headers.get('osessionid')}`;
-  }
-
-  const requestLogoutStep1 = await fetch(URLS.user.logout, {
-    method: 'POST',
-    headers: {
-      Cookie: `${sessionCookie}`
-    }
-  });
-
-  const responseHtml = await requestLogoutStep1.text();
-  const csrfTokenMatch = responseHtml.match(regexText1);
-  const csrfToken = csrfTokenMatch?.[0].replace(regexText2, '') || '';
-  const formData = new URLSearchParams();
-
-  formData.append('csrfmiddlewaretoken', csrfToken);
-
-  try {
-    const requestLogoutStep2 = await fetch(URLS.user.logout, {
-      method: 'POST',
-      headers: {
-        Cookie: `csrftoken=${csrfToken}; ${sessionCookie}`
-      },
-      body: formData
-    });
-
-    return NextResponse.json(requestLogoutStep2, {
-      status: requestLogoutStep2.status
-    });
-  } catch (error) {
-    return NextResponse.json(error, { status: 500 });
-  }
-}
+import { URLS } from '../data/urls';
+import { NextResponse } from 'next/server';
+
+export async function POST(req: Request) {
+  const regexText1 = /name=['|"]csrfmiddlewaretoken['|"] value=['|"]\w+/gi;
+  const regexText2 = /name=['|"]csrfmiddlewaretoken['|"] value=['|"]/gi;
+  let sessionCookie;
+
+  if (req.headers.get('osessionid')) {
+    sessionCookie = `osessionid=${req.headers.get('osessionid')}`;
+  }
+
+  const requestLogoutStep1 = await fetch(URLS.user.logout, {
+    method: 'POST',
+    headers: {
+      Cookie: `${sessionCookie}`
+    }
+  });
+
+  const responseHtml = await requestLogoutStep1.text();
+  const csrfTokenMatch = responseHtml.match(regexText1);
+  const csrfToken = csrfTokenMatch?.[0].replace(regexText2, '') || '';
+  const formData = new URLSearchParams();
+
+  formData.append('csrfmiddlewaretoken', csrfToken);
+
+  try {
+    const requestLogoutStep2 = await fetch(URLS.user.logout, {
+      method: 'POST',
+      headers: {
+        Cookie: `csrftoken=${csrfToken}; ${sessionCookie}`
+      },
+      body: formData
+    });
+
+    return NextResponse.json(requestLogoutStep2, {
+      status: requestLogoutStep2.status
+    });
+  } catch (error) {
+    return NextResponse.json(error, { status: 500 });
+  }
+}

package/bin/pz-check-dependencies.js

@@ -1,98 +1,98 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const semver = require('semver');
-
-function checkDir() {
-  let currentDir = __dirname;
-
-  while (currentDir !== path.resolve(currentDir, '..')) {
-    if (
-      fs.existsSync(
-        path.join(currentDir, 'node_modules/@akinon/next/package.json')
-      )
-    ) {
-      return currentDir;
-    }
-    currentDir = path.resolve(currentDir, '..');
-  }
-
-  return path.resolve(__dirname, '../../../../');
-}
-
-const BASE_DIR = checkDir();
-
-try {
-  const akinonNextPackagePath = fs.existsSync(
-    path.join(BASE_DIR, 'packages/akinon-next/package.json')
-  )
-    ? path.join(BASE_DIR, 'packages/akinon-next/package.json')
-    : path.join(BASE_DIR, 'node_modules/@akinon/next/package.json');
-
-  let akinonNextPackage = JSON.parse(
-    fs.readFileSync(akinonNextPackagePath, 'utf8')
-  );
-
-  const projectZeroPwaPackagePath = path.join(BASE_DIR, 'package.json');
-
-  const projectZeroPwaPackage = JSON.parse(
-    fs.readFileSync(projectZeroPwaPackagePath, 'utf8')
-  );
-
-  const { peerDependencies } = akinonNextPackage;
-
-  let hasErrors = false;
-
-  let errorMessages = [];
-
-  for (const dependency in peerDependencies) {
-    const requiredVersion = peerDependencies[dependency];
-
-    const installedVersion =
-      projectZeroPwaPackage.dependencies[dependency] ||
-      projectZeroPwaPackage.devDependencies[dependency];
-
-    if (!installedVersion) {
-      errorMessages.push(
-        `Dependency ${dependency} is missing in projectzeropwa.`
-      );
-      hasErrors = true;
-    } else {
-      const requiredSemver = semver.coerce(requiredVersion);
-
-      const installedSemver = semver.coerce(installedVersion);
-
-      if (!requiredSemver || !installedSemver) {
-        errorMessages.push(
-          `Invalid semver for ${dependency}: required ${requiredVersion}, found ${installedVersion}`
-        );
-        hasErrors = true;
-      } else if (
-        requiredSemver.major !== installedSemver.major ||
-        requiredSemver.minor !== installedSemver.minor
-      ) {
-        errorMessages.push(
-          `Version mismatch for ${dependency}: expected ${requiredVersion} or higher but found ${installedVersion}`
-        );
-        hasErrors = true;
-      }
-    }
-  }
-
-  if (hasErrors) {
-    console.error(
-      '\x1b[31mDependency errors found:\n' +
-        errorMessages.join('\n') +
-        '\x1b[0m'
-    );
-    process.exit(1);
-  }
-
-  console.log(
-    'All dependencies are installed and compatible in projectzeropwa.'
-  );
-} catch (error) {
-  console.error('\x1b[31mError:', error.message + '\x1b[0m');
-  process.exit(1);
-}
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const semver = require('semver');
+
+function checkDir() {
+  let currentDir = __dirname;
+
+  while (currentDir !== path.resolve(currentDir, '..')) {
+    if (
+      fs.existsSync(
+        path.join(currentDir, 'node_modules/@akinon/next/package.json')
+      )
+    ) {
+      return currentDir;
+    }
+    currentDir = path.resolve(currentDir, '..');
+  }
+
+  return path.resolve(__dirname, '../../../../');
+}
+
+const BASE_DIR = checkDir();
+
+try {
+  const akinonNextPackagePath = fs.existsSync(
+    path.join(BASE_DIR, 'packages/akinon-next/package.json')
+  )
+    ? path.join(BASE_DIR, 'packages/akinon-next/package.json')
+    : path.join(BASE_DIR, 'node_modules/@akinon/next/package.json');
+
+  let akinonNextPackage = JSON.parse(
+    fs.readFileSync(akinonNextPackagePath, 'utf8')
+  );
+
+  const projectZeroPwaPackagePath = path.join(BASE_DIR, 'package.json');
+
+  const projectZeroPwaPackage = JSON.parse(
+    fs.readFileSync(projectZeroPwaPackagePath, 'utf8')
+  );
+
+  const { peerDependencies } = akinonNextPackage;
+
+  let hasErrors = false;
+
+  let errorMessages = [];
+
+  for (const dependency in peerDependencies) {
+    const requiredVersion = peerDependencies[dependency];
+
+    const installedVersion =
+      projectZeroPwaPackage.dependencies[dependency] ||
+      projectZeroPwaPackage.devDependencies[dependency];
+
+    if (!installedVersion) {
+      errorMessages.push(
+        `Dependency ${dependency} is missing in projectzeropwa.`
+      );
+      hasErrors = true;
+    } else {
+      const requiredSemver = semver.coerce(requiredVersion);
+
+      const installedSemver = semver.coerce(installedVersion);
+
+      if (!requiredSemver || !installedSemver) {
+        errorMessages.push(
+          `Invalid semver for ${dependency}: required ${requiredVersion}, found ${installedVersion}`
+        );
+        hasErrors = true;
+      } else if (
+        requiredSemver.major !== installedSemver.major ||
+        requiredSemver.minor !== installedSemver.minor
+      ) {
+        errorMessages.push(
+          `Version mismatch for ${dependency}: expected ${requiredVersion} or higher but found ${installedVersion}`
+        );
+        hasErrors = true;
+      }
+    }
+  }
+
+  if (hasErrors) {
+    console.error(
+      '\x1b[31mDependency errors found:\n' +
+        errorMessages.join('\n') +
+        '\x1b[0m'
+    );
+    process.exit(1);
+  }
+
+  console.log(
+    'All dependencies are installed and compatible in projectzeropwa.'
+  );
+} catch (error) {
+  console.error('\x1b[31mError:', error.message + '\x1b[0m');
+  process.exit(1);
+}