@akinon/next 1.21.0-rc.3 → 1.21.0-rc.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.21.0-rc.5
+
+### Patch Changes
+
+- ZERO-2296: Fix ROUTES import
+
+## 1.21.0-rc.4
+
+### Minor Changes
+
+- Revert ZERO-2435
+
 ## 1.21.0-rc.3
 
 ### Minor Changes

package/bin/pz-install-plugins.js

@@ -1,40 +1,39 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
 const path = require('path');
+const rootDir = path.resolve(process.cwd());
 const spawn = require('cross-spawn');
+const availablePlugins = require('../plugins');
 
-function findBaseDir() {
-  const insideNodeModules = __dirname.includes('node_modules');
-  return insideNodeModules
-    ? path.resolve(__dirname, '../../../../')
-    : path.resolve(__dirname, '../../../apps/projectzeronext');
-}
-
-const BASE_DIR = findBaseDir();
+let plugins;
 
-const getFullPath = (relativePath) => path.join(BASE_DIR, relativePath);
+try {
+  plugins = require(path.resolve(rootDir, './src/plugins.js'));
+} catch (error) {
+  console.error('No plugins.js file found, skipping plugin installation.');
+  process.exit(0);
+}
 
-const packageJsonPath = getFullPath('package.json');
-const akinonPackageNumber = require(packageJsonPath).dependencies[
-  '@akinon/next'
-].replace('^', '');
-//just in case
+let installCmd = [];
 
-const availablePlugins = require('../plugins');
+availablePlugins
+  .filter((p) => plugins?.includes(p))
+  .forEach((name) => {
+    installCmd.push(`@akinon/${name}`);
+  });
 
-let installCmd = availablePlugins.map(
-  (name) => `@akinon/${name}@${akinonPackageNumber}`
-);
+spawn.sync('yarn', ['cache clean']);
 
-spawn.sync('yarn', ['cache clean'], { stdio: 'inherit', cwd: BASE_DIR });
+for (const plugin of availablePlugins) {
+  spawn.sync('yarn', ['remove', `@akinon/${plugin}`]);
+}
 
-availablePlugins.forEach((plugin) => {
-  spawn.sync('yarn', ['remove', `@akinon/${plugin}`], {
-    stdio: 'inherit',
-    cwd: BASE_DIR
+if (
+  installCmd.length > 0 &&
+  !fs.existsSync(path.resolve(rootDir, '../../turbo.json'))
+) {
+  spawn.sync('yarn', ['add', ...installCmd, '--ignore-scripts'], {
+    stdio: 'inherit'
   });
-});
-
-if (installCmd.length > 0) {
-  const yarnArgs = ['add', ...installCmd, '--ignore-scripts'];
-
-  spawn.sync('yarn', yarnArgs, { stdio: 'inherit', cwd: BASE_DIR });
 }

package/middlewares/default.ts

@@ -1,5 +1,6 @@
 import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
 import Settings from 'settings';
+import { ROUTES } from 'routes';
 import {
   PzNextRequest,
   withCheckoutProvider,
@@ -17,7 +18,6 @@ import withLocale from './locale';
 import logger from '../utils/log';
 import { user } from '../data/urls';
 import { getUrlPathWithLocale } from '../utils/localization';
-import { ROUTES } from 'projectzeronext/src/routes';
 
 const withPzDefault =
   (middleware: NextMiddleware) =>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.21.0-rc.3",
+  "version": "1.21.0-rc.5",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -32,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.21.0-rc.3",
+    "@akinon/eslint-plugin-projectzero": "1.21.0-rc.5",
     "eslint-config-prettier": "8.5.0"
   }
 }