@akinon/projectzero 2.0.0-beta.0 → 2.0.0-beta.10

package/app-template/tailwind.config.js

@@ -1,5 +1,4 @@
 const deepMerge = require('@akinon/next/utils/deep-merge');
-const defaultTheme = require('tailwindcss/defaultTheme');
 const plugins = require('./src/plugins');
 const fs = require('fs');
 const path = require('path');
@@ -19,148 +18,13 @@ if (themeName !== 'default' && fs.existsSync(themeConfigPath)) {
 
 const defaultConfig = {
   content: [
-    './src/app/**/*.{js,ts,jsx,tsx}',
-    './src/pages/**/*.{js,ts,jsx,tsx}',
-    './src/components/**/*.{js,ts,jsx,tsx}',
-    './src/views/**/*.{js,ts,jsx,tsx}',
-    './src/widgets/**/*.{js,ts,jsx,tsx}',
-    './src/hooks/**/*.{js,ts,jsx,tsx}',
-    './src/utils/**/*.{js,ts,jsx,tsx}',
     ...plugins
       .map((plugin) => [
         `./node_modules/@akinon/${plugin}/**/*.{js,ts,jsx,tsx}`,
         `../../node_modules/@akinon/${plugin}/**/*.{js,ts,jsx,tsx}`
       ])
       .flat()
-  ],
-  theme: {
-    extend: {
-      fontSize: {
-        '2xs': '0.5rem'
-      },
-      outline: {
-        off: 'none'
-      },
-      width: {
-        '1/10': '10%',
-        '2/10': '20%',
-        '3/10': '30%',
-        '4/10': '40%',
-        '5/10': '50%',
-        '6/10': '60%',
-        '7/10': '70%',
-        '8/10': '80%',
-        '9/10': '90%'
-      },
-      transitionProperty: {
-        'max-width': 'max-width'
-      },
-      backgroundImage: {
-        'skeleton-shimmer':
-          'linear-gradient(90deg, #d7d7d7 0%, #ebebeb 40%, #eeeeee 60%, #d7d7d7)'
-      },
-      keyframes: {
-        'skeleton-shimmer': {
-          '100%': {
-            transform: 'translateX(100%)'
-          }
-        }
-      },
-      animation: {
-        'skeleton-shimmer': 'skeleton-shimmer 2s linear infinite'
-      }
-    },
-    colors: {
-      transparent: 'transparent',
-      white: '#ffffff',
-      primary: {
-        DEFAULT: '#000000',
-        hover: '#181818',
-        foreground: '#ffffff',
-        100: '#525252',
-        200: '#404040',
-        300: '#3d3d3d',
-        400: '#333333',
-        500: '#2d2d2d',
-        600: '#292929',
-        700: '#2b2b2b',
-        800: '#181818',
-        900: '#000000'
-      },
-      secondary: {
-        DEFAULT: '#e95151',
-        hover: '#d03838',
-        foreground: '#ffffff',
-        100: '#ffb7b7',
-        200: '#ff9e9e',
-        300: '#ff8484',
-        400: '#ff6b6b',
-        500: '#e95151',
-        600: '#d72b01',
-        700: '#b61e1e',
-        800: '#9d0505',
-        900: '#830000'
-      },
-      black: {
-        DEFAULT: '#000000',
-        100: '#525252',
-        200: '#404040',
-        300: '#3d3d3d',
-        400: '#333333',
-        500: '#2d2d2d',
-        600: '#292929',
-        700: '#2b2b2b',
-        800: '#181818',
-        900: '#000000'
-      },
-      gray: {
-        DEFAULT: '#ebebeb',
-        25: '#fdfdfd',
-        50: '#f7f7f7',
-        100: '#f5f5f5',
-        150: '#f4f4f4',
-        200: '#eeeeee',
-        300: '#ebebeb',
-        400: '#d7d7d7',
-        450: '#d4d4d4',
-        500: '#c9c9c9',
-        600: '#9d9d9d',
-        700: '#686868',
-        800: '#615f62',
-        850: '#58585a',
-        900: '#4a4f54',
-        950: '#424242'
-      },
-      error: {
-        DEFAULT: '#d72b01',
-        100: '#e20008'
-      },
-      success: {
-        DEFAULT: '#7b9d76',
-        100: '#7b9d76'
-      }
-    },
-    container: {
-      center: true,
-      padding: {
-        DEFAULT: '0rem',
-        sm: '2rem',
-        '2xl': '0rem'
-      }
-    },
-    fontFamily: {
-      sans: ['Jost'].concat(defaultTheme.fontFamily.sans)
-    },
-    screens: {
-      xs: '575px',
-      sm: '640px',
-      md: '768px',
-      lg: '1024px',
-      xl: '1170px',
-      '2xl': '1370px'
-    }
-  },
-  plugins: [require('@tailwindcss/typography')]
+  ]
 };
 
 if (Object.keys(themeOverrides).length === 0) {

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/commands/plugins.ts

@@ -113,6 +113,10 @@ export default async () => {
     {
       name: 'Tabby Payment Extension',
       value: 'pz-tabby-extension'
+    },
+    {
+      name: 'Tamara Payment Extension',
+      value: 'pz-tamara-extension'
     }
   ];
 

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/commerce-url.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/commands/create.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

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/dist/commands/plugins.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -127,6 +137,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         {
             name: 'Tabby Payment Extension',
             value: 'pz-tabby-extension'
+        },
+        {
+            name: 'Tamara Payment Extension',
+            value: 'pz-tamara-extension'
         }
     ];
     const prompt = new Prompt({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.10",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {

package/app-template/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {}
-  }
-};

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.edge.config.ts

@@ -1,3 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-initSentry('Edge');

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/sentry.server.config.ts

@@ -1,3 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-initSentry('Server');

package/app-template/src/app/[commerce]/[locale]/[currency]/product/[pk]/loading.tsx

@@ -1,67 +0,0 @@
-import { Skeleton, SkeletonWrapper } from 'components';
-
-export default function Loading() {
-  return (
-    <div className="container mx-auto">
-      <div className="max-w-5xl mx-auto my-5 px-7">
-        <SkeletonWrapper className="md:mb-7">
-          <Skeleton className="w-[17.25rem] h-4 lg:w-64" />
-        </SkeletonWrapper>
-      </div>
-      <div className="grid max-w-5xl grid-cols-2 lg:gap-8 mx-auto px-7">
-        <div className="col-span-2 mb-7 md:mb-0 lg:col-span-1">
-          <div className="flex gap-1">
-            <SkeletonWrapper className="hidden md:block md:mb-7">
-              {Array(5)
-                .fill(null)
-                .map((_, index) => (
-                  <Skeleton key={index} className="w-20	h-24 mb-2" />
-                ))}
-            </SkeletonWrapper>
-
-            <div className="flex-1">
-              <SkeletonWrapper className="md:mb-7">
-                <Skeleton className="w-full h-[30.375rem] md:h-[36.375rem]" />
-              </SkeletonWrapper>
-            </div>
-          </div>
-        </div>
-        <div className="flex flex-col items-center col-span-2 lg:col-span-1">
-          <div className="w-full">
-            <SkeletonWrapper className="w-full md:mb-7 flex justify-center items-center">
-              <Skeleton className="w-96 h-16 mb-9" />
-              <Skeleton className="hidden w-36	h-14 mb-9 md:block" />
-
-              <div className="flex flex-col justify-center items-center mb-9">
-                <Skeleton className="w-36 h-4 mb-2" />
-                <div className="flex items-center gap-2">
-                  {Array(3)
-                    .fill(null)
-                    .map((_, index) => (
-                      <Skeleton key={index} className="w-24	h-10" />
-                    ))}
-                </div>
-              </div>
-
-              <div className="flex flex-col justify-center items-center mb-4">
-                <Skeleton className="w-36 h-4 mb-2" />
-                <div className="flex items-center gap-2">
-                  {Array(5)
-                    .fill(null)
-                    .map((_, index) => (
-                      <Skeleton key={index} className="w-11 h-11" />
-                    ))}
-                </div>
-              </div>
-
-              <Skeleton className="hidden w-full h-14 mb-6 md:block" />
-              <Skeleton className="w-40 h-10 mb-9 md:w-72" />
-              <Skeleton className="w-24 h-10 mb-7" />
-              <Skeleton className="w-full h-36" />
-            </SkeletonWrapper>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}