@akinon/projectzero 1.91.0-rc.1 → 1.91.0-rc.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/projectzero
 
+## 1.91.0-rc.3
+
+### Minor Changes
+
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- e974d8e8: ZERO-3406: Fix rc build
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
+- 942490f2: ZERO-3295: move third party tailwind content list to akinon-next
+
+## 1.91.0-rc.2
+
 ## 1.91.0-rc.1
 
 ## 1.91.0-rc.0

package/app-template/CHANGELOG.md

@@ -1,5 +1,124 @@
 # projectzeronext
 
+## 1.91.0-rc.3
+
+### Minor Changes
+
+- 63774a6a: ZERO-3351: Add commerce redirection ignore list functionality and related utility
+- 4434c510: ZERO-3321: remove csp test script
+- 82174637: ZERO-2887: Add LoaderSpinner to Filters component
+- 3670f522: ZERO-3301 :Upgrade react-number-format to the latest version
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- e974d8e8: ZERO-3406: Fix rc build
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- 448adefb: ZERO-3321: move csp test to akinon-next
+- e9ce5edb: ZERO-3321: check last CSP header in test
+- 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
+- 942490f2: ZERO-3295: move third party tailwind content list to akinon-next
+- 100f03a9: ZERO-3321: add test for Content-Security-Policy header in Next.js config
+
+### Patch Changes
+
+- Updated dependencies [5dfeea04]
+- Updated dependencies [823d82f9]
+- Updated dependencies [63774a6a]
+- Updated dependencies [2d9b2b2c]
+- Updated dependencies [5e1feca6]
+- Updated dependencies [d8fad39f]
+- Updated dependencies [72bfcbf2]
+- Updated dependencies [40a46853]
+- Updated dependencies [68bbcb27]
+- Updated dependencies [2ba89b3c]
+- Updated dependencies [1e53e17a]
+- Updated dependencies [25524867]
+- Updated dependencies [f49bb74f]
+- Updated dependencies [155cd231]
+- Updated dependencies [e9541a13]
+- Updated dependencies [ad0bec92]
+- Updated dependencies [9b7d0de6]
+- Updated dependencies [72fd4d67]
+- Updated dependencies [c53ef7b9]
+- Updated dependencies [f8e4cac6]
+- Updated dependencies [310556ec]
+- Updated dependencies [64699d3f]
+- Updated dependencies [832bee36]
+- Updated dependencies [e974d8e8]
+- Updated dependencies [b31333ed]
+- Updated dependencies [28a59d49]
+- Updated dependencies [8feabe9a]
+- Updated dependencies [bf354de4]
+- Updated dependencies [7727ae55]
+- Updated dependencies [d552629f]
+- Updated dependencies [448adefb]
+- Updated dependencies [17f87524]
+- Updated dependencies [65d3b862]
+- Updated dependencies [bbe18b9f]
+- Updated dependencies [17bfadc4]
+- Updated dependencies [4920742c]
+- Updated dependencies [b6e5b624]
+- Updated dependencies [6c3629c2]
+- Updated dependencies [6bc260be]
+- Updated dependencies [7e56d6b6]
+- Updated dependencies [dfaceffd]
+- Updated dependencies [33377cfd]
+- Updated dependencies [43c182ee]
+- Updated dependencies [943a239e]
+- Updated dependencies [068dc394]
+- Updated dependencies [942490f2]
+- Updated dependencies [eeb20bea]
+- Updated dependencies [fec9638a]
+- Updated dependencies [3bf63c8a]
+- Updated dependencies [9be2c081]
+- Updated dependencies [f2c92d5c]
+- Updated dependencies [7bd3d992]
+- Updated dependencies [b6d5bda2]
+- Updated dependencies [fdd255ee]
+- Updated dependencies [07248e09]
+- Updated dependencies [acf03209]
+- Updated dependencies [387356b6]
+- Updated dependencies [49eeebfa]
+- Updated dependencies [3f9b8d7e]
+- Updated dependencies [b2ee69b9]
+- Updated dependencies [0cabbda3]
+  - @akinon/next@1.91.0-rc.3
+  - @akinon/pz-basket-gift-pack@1.91.0-rc.3
+  - @akinon/pz-tamara-extension@1.91.0-rc.3
+  - @akinon/pz-masterpass@1.91.0-rc.3
+  - @akinon/pz-credit-payment@1.91.0-rc.3
+  - @akinon/pz-checkout-gift-pack@1.91.0-rc.3
+  - @akinon/pz-one-click-checkout@1.91.0-rc.3
+  - @akinon/pz-pay-on-delivery@1.91.0-rc.3
+  - @akinon/pz-click-collect@1.91.0-rc.3
+  - @akinon/pz-akifast@1.91.0-rc.3
+  - @akinon/pz-gpay@1.91.0-rc.3
+  - @akinon/pz-b2b@1.91.0-rc.3
+  - @akinon/pz-bkm@1.91.0-rc.3
+  - @akinon/pz-otp@1.91.0-rc.3
+  - @akinon/pz-tabby-extension@1.91.0-rc.3
+  - @akinon/pz-saved-card@1.91.0-rc.3
+
+## 1.91.0-rc.2
+
+### Patch Changes
+
+- Updated dependencies [2552486]
+  - @akinon/next@1.91.0-rc.2
+  - @akinon/pz-akifast@1.91.0-rc.2
+  - @akinon/pz-b2b@1.91.0-rc.2
+  - @akinon/pz-basket-gift-pack@1.91.0-rc.2
+  - @akinon/pz-bkm@1.91.0-rc.2
+  - @akinon/pz-checkout-gift-pack@1.91.0-rc.2
+  - @akinon/pz-click-collect@1.91.0-rc.2
+  - @akinon/pz-credit-payment@1.91.0-rc.2
+  - @akinon/pz-gpay@1.91.0-rc.2
+  - @akinon/pz-masterpass@1.91.0-rc.2
+  - @akinon/pz-one-click-checkout@1.91.0-rc.2
+  - @akinon/pz-otp@1.91.0-rc.2
+  - @akinon/pz-pay-on-delivery@1.91.0-rc.2
+  - @akinon/pz-saved-card@1.91.0-rc.2
+  - @akinon/pz-tabby-extension@1.91.0-rc.2
+  - @akinon/pz-tamara-extension@1.91.0-rc.2
+
 ## 1.91.0-rc.1
 
 ### Patch Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.91.0-rc.1",
+  "version": "1.91.0-rc.3",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,22 +24,22 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.91.0-rc.1",
-    "@akinon/pz-akifast": "1.91.0-rc.1",
-    "@akinon/pz-b2b": "1.91.0-rc.1",
-    "@akinon/pz-basket-gift-pack": "1.91.0-rc.1",
-    "@akinon/pz-bkm": "1.91.0-rc.1",
-    "@akinon/pz-checkout-gift-pack": "1.91.0-rc.1",
-    "@akinon/pz-click-collect": "1.91.0-rc.1",
-    "@akinon/pz-credit-payment": "1.91.0-rc.1",
-    "@akinon/pz-gpay": "1.91.0-rc.1",
-    "@akinon/pz-masterpass": "1.91.0-rc.1",
-    "@akinon/pz-one-click-checkout": "1.91.0-rc.1",
-    "@akinon/pz-otp": "1.91.0-rc.1",
-    "@akinon/pz-pay-on-delivery": "1.91.0-rc.1",
-    "@akinon/pz-saved-card": "1.91.0-rc.1",
-    "@akinon/pz-tabby-extension": "1.91.0-rc.1",
-    "@akinon/pz-tamara-extension": "1.91.0-rc.1",
+    "@akinon/next": "1.91.0-rc.3",
+    "@akinon/pz-akifast": "1.91.0-rc.3",
+    "@akinon/pz-b2b": "1.91.0-rc.3",
+    "@akinon/pz-basket-gift-pack": "1.91.0-rc.3",
+    "@akinon/pz-bkm": "1.91.0-rc.3",
+    "@akinon/pz-checkout-gift-pack": "1.91.0-rc.3",
+    "@akinon/pz-click-collect": "1.91.0-rc.3",
+    "@akinon/pz-credit-payment": "1.91.0-rc.3",
+    "@akinon/pz-gpay": "1.91.0-rc.3",
+    "@akinon/pz-masterpass": "1.91.0-rc.3",
+    "@akinon/pz-one-click-checkout": "1.91.0-rc.3",
+    "@akinon/pz-otp": "1.91.0-rc.3",
+    "@akinon/pz-pay-on-delivery": "1.91.0-rc.3",
+    "@akinon/pz-saved-card": "1.91.0-rc.3",
+    "@akinon/pz-tabby-extension": "1.91.0-rc.3",
+    "@akinon/pz-tamara-extension": "1.91.0-rc.3",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -62,7 +62,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.91.0-rc.1",
+    "@akinon/eslint-plugin-projectzero": "1.91.0-rc.3",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/tailwind.config.js

@@ -1,3 +1,4 @@
+const getAkinonNextContent = require("@akinon/next/tailwind/content");
 const deepMerge = require('@akinon/next/utils/deep-merge');
 const defaultTheme = require('tailwindcss/defaultTheme');
 const plugins = require('./src/plugins');
@@ -26,12 +27,7 @@ const defaultConfig = {
     './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()
+    ...getAkinonNextContent(plugins)
   ],
   theme: {
     extend: {

package/codemods/update-tailwind-config/index.js

@@ -0,0 +1,30 @@
+const path = require('path');
+const jscodeshift = require('jscodeshift/src/Runner');
+
+const codemodScript = path.resolve(__dirname, 'transform.js');
+
+const transform = () => {
+  const workingDir = path.resolve(process.cwd());
+
+  jscodeshift
+    .run(codemodScript, [workingDir], {
+      verbose: 0,
+      dry: false,
+      print: false,
+      extensions: 'js',
+      ignorePattern: '**/node_modules/**',
+      filter: '**/tailwind.config.js'
+    })
+    .then(
+      (stats) => {
+        console.log(`Codemod completed. Stats:`, stats);
+      },
+      (error) => {
+        console.error(`Error executing codemod: ${error.message}`);
+      }
+    );
+};
+
+module.exports = {
+  transform
+};

package/codemods/update-tailwind-config/transform.js

@@ -0,0 +1,102 @@
+function transform(fileInfo, api) {
+  const j = api.jscodeshift;
+  const root = j(fileInfo.source);
+
+  if (!fileInfo.path.includes('tailwind.config.js')) {
+    return fileInfo.source;
+  }
+
+  console.log(`Processing file: ${fileInfo.path}`);
+
+  const hasAkinonNextImport = root.find(j.VariableDeclarator, {
+    id: { name: 'getAkinonNextContent' }
+  });
+
+  if (hasAkinonNextImport.size() === 0) {
+    const requireStatement = j.variableDeclaration('const', [
+      j.variableDeclarator(
+        j.identifier('getAkinonNextContent'),
+        j.callExpression(j.identifier('require'), [
+          j.literal('@akinon/next/tailwind/content')
+        ])
+      )
+    ]);
+
+    root.get().node.program.body.unshift(requireStatement);
+
+    console.log(`Added getAkinonNextContent import to ${fileInfo.path}`);
+  }
+
+  const defaultConfig = root
+    .find(j.VariableDeclarator, {
+      id: { name: 'defaultConfig' },
+      init: { type: 'ObjectExpression' }
+    })
+    .paths()[0];
+
+  if (!defaultConfig) {
+    console.log(`No defaultConfig found in ${fileInfo.path}`);
+    return fileInfo.source;
+  }
+
+  const contentArray = defaultConfig.value.init.properties.find(
+    (prop) =>
+      prop.key.name === 'content' && prop.value.type === 'ArrayExpression'
+  );
+
+  if (!contentArray) {
+    console.log(`No content array found in defaultConfig`);
+    return fileInfo.source;
+  }
+
+  const pluginsVarName = root
+    .find(j.VariableDeclarator, {
+      id: { name: 'plugins' },
+      init: {
+        type: 'CallExpression',
+        callee: { name: 'require' }
+      }
+    })
+    .paths()[0]?.value.id.name;
+
+  if (!pluginsVarName) {
+    console.log(`No plugins variable found in ${fileInfo.path}`);
+    return fileInfo.source;
+  }
+
+  const contentElements = contentArray.value.elements;
+
+  const filteredElements = contentElements.filter((element) => {
+    if (element.type === 'SpreadElement') {
+      if (
+        element.argument.type === 'CallExpression' &&
+        element.argument.callee.object?.callee.object.name === 'plugins'
+      ) {
+        return false;
+      }
+
+      if (
+        element.argument.type === 'CallExpression' &&
+        element.argument.callee.name === 'getAkinonNextContent'
+      ) {
+        return false;
+      }
+    }
+    return true;
+  });
+
+  filteredElements.push(
+    j.spreadElement(
+      j.callExpression(j.identifier('getAkinonNextContent'), [
+        j.identifier(pluginsVarName)
+      ])
+    )
+  );
+
+  contentArray.value.elements = filteredElements;
+
+  console.log(`Successfully updated ${fileInfo.path}`);
+  return root.toSource();
+}
+
+module.exports = transform;

package/commands/codemod.ts

@@ -5,7 +5,6 @@ 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,

package/dist/commands/codemod.js

@@ -8,7 +8,6 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.91.0-rc.1",
+  "version": "1.91.0-rc.3",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {
@@ -19,6 +19,7 @@
     "@types/temp": "0.9.4"
   },
   "dependencies": {
+    "jscodeshift": "^0.15.1",
     "@inquirer/prompts": "7.5.0",
     "loading-spinner": "1.2.1",
     "semver": "7.6.2",