@akinon/projectzero 1.82.0-rc.16 → 1.82.0-rc.18

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/projectzero
 
+## 1.82.0-rc.18
+
+## 1.82.0-rc.17
+
+### Minor Changes
+
+- e2583ac2: ZERO-3282: Switch to execSync for synchronous execution, enhance file checks, and add error page replacement script
+
 ## 1.82.0-rc.16
 
 ### Minor Changes

package/app-template/CHANGELOG.md

@@ -1,5 +1,54 @@
 # projectzeronext
 
+## 1.82.0-rc.18
+
+### Patch Changes
+
+- Updated dependencies [e4761d2]
+  - @akinon/next@1.82.0-rc.18
+  - @akinon/pz-akifast@1.82.0-rc.18
+  - @akinon/pz-b2b@1.82.0-rc.18
+  - @akinon/pz-basket-gift-pack@1.82.0-rc.18
+  - @akinon/pz-bkm@1.82.0-rc.18
+  - @akinon/pz-checkout-gift-pack@1.82.0-rc.18
+  - @akinon/pz-click-collect@1.82.0-rc.18
+  - @akinon/pz-credit-payment@1.82.0-rc.18
+  - @akinon/pz-gpay@1.82.0-rc.18
+  - @akinon/pz-masterpass@1.82.0-rc.18
+  - @akinon/pz-one-click-checkout@1.82.0-rc.18
+  - @akinon/pz-otp@1.82.0-rc.18
+  - @akinon/pz-pay-on-delivery@1.82.0-rc.18
+  - @akinon/pz-saved-card@1.82.0-rc.18
+  - @akinon/pz-tabby-extension@1.82.0-rc.18
+  - @akinon/pz-tamara-extension@1.82.0-rc.18
+
+## 1.82.0-rc.17
+
+### Minor Changes
+
+- e2c6d426: ZERO-2935: Add @sentry/nextjs dependency to akinon-next and remove from projectzeronext
+
+### Patch Changes
+
+- Updated dependencies [e2c6d426]
+- Updated dependencies [70bc0aed]
+  - @akinon/next@1.82.0-rc.17
+  - @akinon/pz-akifast@1.82.0-rc.17
+  - @akinon/pz-b2b@1.82.0-rc.17
+  - @akinon/pz-basket-gift-pack@1.82.0-rc.17
+  - @akinon/pz-bkm@1.82.0-rc.17
+  - @akinon/pz-checkout-gift-pack@1.82.0-rc.17
+  - @akinon/pz-click-collect@1.82.0-rc.17
+  - @akinon/pz-credit-payment@1.82.0-rc.17
+  - @akinon/pz-gpay@1.82.0-rc.17
+  - @akinon/pz-masterpass@1.82.0-rc.17
+  - @akinon/pz-one-click-checkout@1.82.0-rc.17
+  - @akinon/pz-otp@1.82.0-rc.17
+  - @akinon/pz-pay-on-delivery@1.82.0-rc.17
+  - @akinon/pz-saved-card@1.82.0-rc.17
+  - @akinon/pz-tabby-extension@1.82.0-rc.17
+  - @akinon/pz-tamara-extension@1.82.0-rc.17
+
 ## 1.82.0-rc.16
 
 ### Minor Changes

package/app-template/next.config.mjs

@@ -26,7 +26,10 @@ const withPwaConfig = withPWA({
 
 const sentryConfig = {
   silent: true,
-  dryRun: !process.env.SENTRY_DSN
+  dryRun: !process.env.SENTRY_DSN,
+  org: 'akinon'
+  // project: 'enter_your_project_name_here',
+  // authToken: 'enter_your_auth_token_here'
 };
 
 const enhancedConfig = withPzConfig(nextConfig);

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.82.0-rc.16",
+  "version": "1.82.0-rc.18",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,26 +22,25 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.82.0-rc.16",
-    "@akinon/pz-akifast": "1.82.0-rc.16",
-    "@akinon/pz-b2b": "1.82.0-rc.16",
-    "@akinon/pz-basket-gift-pack": "1.82.0-rc.16",
-    "@akinon/pz-bkm": "1.82.0-rc.16",
-    "@akinon/pz-checkout-gift-pack": "1.82.0-rc.16",
-    "@akinon/pz-click-collect": "1.82.0-rc.16",
-    "@akinon/pz-credit-payment": "1.82.0-rc.16",
-    "@akinon/pz-gpay": "1.82.0-rc.16",
-    "@akinon/pz-masterpass": "1.82.0-rc.16",
-    "@akinon/pz-one-click-checkout": "1.82.0-rc.16",
-    "@akinon/pz-otp": "1.82.0-rc.16",
-    "@akinon/pz-pay-on-delivery": "1.82.0-rc.16",
-    "@akinon/pz-saved-card": "1.82.0-rc.16",
-    "@akinon/pz-tabby-extension": "1.82.0-rc.16",
-    "@akinon/pz-tamara-extension": "1.82.0-rc.16",
+    "@akinon/next": "1.82.0-rc.18",
+    "@akinon/pz-akifast": "1.82.0-rc.18",
+    "@akinon/pz-b2b": "1.82.0-rc.18",
+    "@akinon/pz-basket-gift-pack": "1.82.0-rc.18",
+    "@akinon/pz-bkm": "1.82.0-rc.18",
+    "@akinon/pz-checkout-gift-pack": "1.82.0-rc.18",
+    "@akinon/pz-click-collect": "1.82.0-rc.18",
+    "@akinon/pz-credit-payment": "1.82.0-rc.18",
+    "@akinon/pz-gpay": "1.82.0-rc.18",
+    "@akinon/pz-masterpass": "1.82.0-rc.18",
+    "@akinon/pz-one-click-checkout": "1.82.0-rc.18",
+    "@akinon/pz-otp": "1.82.0-rc.18",
+    "@akinon/pz-pay-on-delivery": "1.82.0-rc.18",
+    "@akinon/pz-saved-card": "1.82.0-rc.18",
+    "@akinon/pz-tabby-extension": "1.82.0-rc.18",
+    "@akinon/pz-tamara-extension": "1.82.0-rc.18",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
-    "@sentry/nextjs": "8.35.0",
     "dayjs": "1.11.5",
     "lossless-json": "2.0.5",
     "next": "14.2.25",
@@ -62,7 +61,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.16",
+    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.18",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/app/[commerce]/[locale]/[currency]/error.tsx

@@ -1,11 +1,7 @@
 'use client';
 
-import { useLocalization } from '@akinon/next/hooks';
-import { Button, Link } from '@theme/components';
-import { ROUTES } from '@theme/routes';
-import { useEffect, useState } from 'react';
-import * as Sentry from '@sentry/nextjs';
-import { ClientLogType } from '@akinon/next/sentry';
+import { useSentryUncaughtErrors } from '@akinon/next/hooks';
+import PzErrorPage from '@akinon/next/views/error-page';
 
 export default function ErrorPage({
   error,
@@ -14,103 +10,8 @@ export default function ErrorPage({
   error: Error & { digest?: string; isServerError?: boolean };
   reset: () => void;
 }) {
-  const [isServerError, setIsServerError] = useState<boolean>(false);
+  // DO NOT REMOVE THIS LINE TO REPORT UNCAUGHT ERRORS TO SENTRY
+  useSentryUncaughtErrors(error);
 
-  useEffect(() => {
-    Sentry.withScope(function (scope) {
-      scope.setLevel('fatal');
-      scope.setTags({
-        APP_TYPE: 'ProjectZeroNext',
-        TYPE: 'Client',
-        LOG_TYPE: ClientLogType.UNCAUGHT_ERROR_PAGE
-      });
-      scope.setExtra('error', error);
-
-      const error_ = new Error('FATAL: Uncaught client error');
-      error_.name = 'UNCAUGHT_ERROR_PAGE';
-
-      Sentry.captureException(error_, {
-        fingerprint: ['UNCAUGHT_ERROR_PAGE', error.digest]
-      });
-    });
-  }, [error]);
-
-  useEffect(() => {
-    if ('isServerError' in error) {
-      setIsServerError(true);
-      return;
-    }
-
-    setIsServerError(!!error.digest);
-  }, [error]);
-
-  return isServerError ? (
-    <ServerErrorUI />
-  ) : (
-    <ClientErrorUI error={error} reset={reset} />
-  );
-}
-
-function ClientErrorUI({
-  error,
-  reset
-}: {
-  error: Error & { digest?: string };
-  reset: () => void;
-}) {
-  const { t } = useLocalization();
-
-  const errorMessage = error?.message || 'Unknown error';
-
-  return (
-    <section className="text-center px-6 my-14 md:px-0 md:m-14">
-      <div className="text-4xl font-bold md:text-6xl text-red-500">Oops!</div>
-      <h1 className="text-lg md:text-xl mt-4">
-        {t('common.client_error.title')}
-      </h1>
-      <p className="text-lg md:text-xl mt-2">
-        {t('common.client_error.description')}
-      </p>
-
-      <div className="mt-4 mx-auto max-w-lg">
-        <p className="text-xs text-gray-600 font-mono bg-gray-100 p-3 rounded overflow-auto text-left">
-          <span className="font-semibold">Error:</span> {errorMessage}
-        </p>
-      </div>
-
-      <div className="mt-6 flex flex-col gap-4 items-center justify-center">
-        <Link href={ROUTES.HOME} className="text-lg underline">
-          {t('common.client_error.link_text')}
-        </Link>
-        <Button onClick={reset} className="text-lg w-28">
-          {t('common.try_again')}
-        </Button>
-      </div>
-    </section>
-  );
-}
-
-function ServerErrorUI() {
-  const { t } = useLocalization();
-
-  const reloadPage = () => {
-    window.location.reload();
-  };
-
-  return (
-    <section className="text-center px-6 my-14 md:px-0 md:m-14">
-      <div className="text-7xl font-bold md:text-8xl">500</div>
-      <h1 className="text-lg md:text-xl"> {t('common.page_500.title')} </h1>
-      <p className="text-lg md:text-xl"> {t('common.page_500.description')} </p>
-      <Link href={ROUTES.HOME} className="text-lg underline">
-        {t('common.page_500.link_text')}
-      </Link>
-
-      <div className="mt-6 flex flex-col gap-4 items-center justify-center">
-        <Button onClick={reloadPage} className="text-lg w-28">
-          {t('common.try_again')}
-        </Button>
-      </div>
-    </section>
-  );
+  return <PzErrorPage error={error} reset={reset} />;
 }

package/codemods/sentry-9/index.js

@@ -0,0 +1,30 @@
+const path = require('path');
+const { execSync } = require('child_process');
+
+const codemodScripts = [
+  path.resolve(__dirname, 'remove-sentry-dependency.js'),
+  path.resolve(__dirname, 'remove-sentry-configs.js'),
+  path.resolve(__dirname, 'replace-error-page.js')
+];
+
+const transform = () => {
+  const workingDir = path.resolve(process.cwd());
+
+  codemodScripts.forEach((script) => {
+    try {
+      execSync(
+        `jscodeshift --ignore-pattern="**/node_modules/**" -t ${script} ${workingDir} --extensions=json,ts,tsx,js,jsx,properties,md`,
+        {
+          cwd: workingDir,
+          stdio: 'inherit'
+        }
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  });
+};
+
+module.exports = {
+  transform
+};

package/codemods/sentry-9/remove-sentry-configs.js

@@ -0,0 +1,14 @@
+const fs = require('fs');
+
+const transform = (fileInfo, api, options) => {
+  const filePath = fileInfo.path;
+  const regex = /sentry\.\w+\.config\.(ts|js)$|sentry\.properties$/i;
+
+  if (regex.test(filePath) && fs.existsSync(filePath)) {
+    fs.unlinkSync(filePath);
+  }
+
+  return fileInfo.source;
+};
+
+module.exports = transform;

package/codemods/sentry-9/remove-sentry-dependency.js

@@ -0,0 +1,25 @@
+const transform = (fileInfo, api, options) => {
+  if (fileInfo.path.endsWith('package.json')) {
+    const packageJson = JSON.parse(fileInfo.source);
+
+    if (
+      packageJson.dependencies &&
+      packageJson.dependencies['@sentry/nextjs']
+    ) {
+      delete packageJson.dependencies['@sentry/nextjs'];
+    }
+
+    if (
+      packageJson.devDependencies &&
+      packageJson.devDependencies['@sentry/nextjs']
+    ) {
+      delete packageJson.devDependencies['@sentry/nextjs'];
+    }
+
+    return JSON.stringify(packageJson, null, 2);
+  }
+
+  return fileInfo.source;
+};
+
+module.exports = transform;

package/codemods/sentry-9/replace-error-page.js

@@ -0,0 +1,32 @@
+const fs = require('fs');
+
+const template = `
+'use client';
+
+import { useSentryUncaughtErrors } from '@akinon/next/hooks';
+import PzErrorPage from '@akinon/next/views/error-page';
+
+export default function ErrorPage({
+  error,
+  reset
+}: {
+  error: Error & { digest?: string; isServerError?: boolean };
+  reset: () => void;
+}) {
+  // DO NOT REMOVE THIS LINE TO REPORT UNCAUGHT ERRORS TO SENTRY
+  useSentryUncaughtErrors(error);
+
+  return <PzErrorPage error={error} reset={reset} />;
+}
+
+`;
+
+const transform = (fileInfo, api, options) => {
+  const filePath = fileInfo.path;
+
+  if (filePath.endsWith('error.tsx')) {
+    fs.writeFileSync(filePath, template, { encoding: 'utf8' });
+  }
+};
+
+module.exports = transform;

package/commands/codemod.ts

@@ -0,0 +1,18 @@
+import path from 'path';
+
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+const args = yargs(hideBin(process.argv)).argv;
+
+export default () => {
+  const workingDir = path.resolve(process.cwd());
+  const codemodName = args.codemod;
+  const codemodPath = path.resolve(
+    __dirname,
+    `../../codemods/${codemodName}/index.js`
+  );
+
+  const codemod = require(codemodPath);
+
+  codemod.transform();
+};

package/commands/index.ts

@@ -4,6 +4,7 @@ import addLanguage from './add-language';
 import removeLanguage from './remove-language';
 import defaultLanguage from './default-language';
 import plugins from './plugins';
+import codemod from './codemod';
 
 export default {
   commerceUrl,
@@ -11,5 +12,6 @@ export default {
   addLanguage,
   removeLanguage,
   defaultLanguage,
-  plugins
+  plugins,
+  codemod
 };

package/dist/codemods/sentry-9/templates/error.js

@@ -0,0 +1,14 @@
+"use strict";
+'use client';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const hooks_1 = require("@akinon/next/hooks");
+const error_page_1 = __importDefault(require("@akinon/next/views/error-page"));
+function ErrorPage({ error, reset }) {
+    // DO NOT REMOVE THIS LINE TO REPORT UNCAUGHT ERRORS TO SENTRY
+    (0, hooks_1.useSentryUncaughtErrors)(error);
+    return React.createElement(error_page_1.default, { error: error, reset: reset });
+}
+exports.default = ErrorPage;

package/dist/commands/codemod.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+const args = yargs(hideBin(process.argv)).argv;
+exports.default = () => {
+    const workingDir = path_1.default.resolve(process.cwd());
+    const codemodName = args.codemod;
+    const codemodPath = path_1.default.resolve(__dirname, `../../codemods/${codemodName}/index.js`);
+    const codemod = require(codemodPath);
+    codemod.transform();
+};

package/dist/commands/index.js

@@ -9,11 +9,13 @@ const add_language_1 = __importDefault(require("./add-language"));
 const remove_language_1 = __importDefault(require("./remove-language"));
 const default_language_1 = __importDefault(require("./default-language"));
 const plugins_1 = __importDefault(require("./plugins"));
+const codemod_1 = __importDefault(require("./codemod"));
 exports.default = {
     commerceUrl: commerce_url_1.default,
     create: create_1.default,
     addLanguage: add_language_1.default,
     removeLanguage: remove_language_1.default,
     defaultLanguage: default_language_1.default,
-    plugins: plugins_1.default
+    plugins: plugins_1.default,
+    codemod: codemod_1.default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.82.0-rc.16",
+  "version": "1.82.0-rc.18",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {

package/app-template/sentry.client.config.ts

@@ -1,16 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-async function initializeSentry() {
-  const response = await fetch('/api/sentry', { next: { revalidate: 0 } });
-  const data = await response.json();
-
-  const options = {
-    dsn: data.dsn,
-    integrations: [],
-    tracesSampleRate: 1.0
-  };
-
-  initSentry('Client', options);
-}
-
-initializeSentry();

package/app-template/sentry.properties

@@ -1,4 +0,0 @@
-defaults.url=https://sentry.io/
-defaults.org=akinon
-defaults.project=console--zero-pwa
-cli.executable=node_modules/@sentry/cli/bin/sentry-cli

package/app-template/src/components/widget/widget-placeholder.tsx

@@ -1,12 +0,0 @@
-import 'server-only';
-import { DynamicWidgetContainer } from '../dynamic-widget-renderer';
-
-export default async function WidgetPlaceholder({ slug }: { slug: string }) {
-  return (
-    <>
-      <DynamicWidgetContainer />
-    </>
-  );
-
-  return <div>WidgetPlaceholder</div>;
-}