Skip to content

Commit e1cc6bd

Browse files
authored
Fixed temporarily the upgrade to RR 7.2.0 problem introduced in remix-run/react-router#13078 (#6780)
1 parent 5f068e8 commit e1cc6bd

File tree

8 files changed

+89
-88
lines changed

8 files changed

+89
-88
lines changed

apps/seven/news/6780.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed the upgrade to 7.2.0 problem introduced in remix-run/react-router#13078 @sneridagh

apps/seven/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"dev": "react-router dev",
88
"start": "react-router dev",
9-
"build": "react-router build",
9+
"build": "pnpm exec init-loaders && react-router build",
1010
"start:prod": "react-router-serve ./build/server/index.js",
1111
"typecheck": "react-router typegen && tsc",
1212
"typegen": "react-router typegen",

packages/registry/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
dist
2-
/bin
32
/lib
43
/include
54

packages/registry/bin/init-loaders.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import path from 'path';
2+
import { AddonRegistry } from '@plone/registry/addon-registry';
3+
import { createAddonsLoader } from '@plone/registry/create-addons-loader';
4+
import { createAddonsStyleLoader } from '@plone/registry/create-addons-styles-loader';
5+
6+
function initPloneRegistryLoaders() {
7+
const projectRootPath = path.resolve('.');
8+
const { registry, shadowAliases } = AddonRegistry.init(projectRootPath);
9+
10+
const addonsLoaderPath = createAddonsLoader(
11+
registry.getAddonDependencies(),
12+
registry.getAddons(),
13+
{ tempInProject: true },
14+
);
15+
16+
createAddonsStyleLoader(registry.getAddonStyles());
17+
18+
return { registry, shadowAliases, addonsLoaderPath };
19+
}
20+
21+
initPloneRegistryLoaders();

packages/registry/news/6780.feature

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
New bin `init-loaders` for initialize via command line the @plone/registry loaders.
2+
This fixes the upgrade to 7.2.0 problem introduced in remix-run/react-router#13078 @sneridagh

packages/registry/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,13 @@
3434
"type": "module",
3535
"files": [
3636
"dist",
37+
"bin",
3738
"README.md",
3839
"vite-plugin.*"
3940
],
41+
"bin": {
42+
"init-loaders": "./bin/init-loaders.js"
43+
},
4044
"main": "dist/index.js",
4145
"exports": {
4246
"./package.json": "./package.json",
@@ -69,6 +73,7 @@
6973
}
7074
},
7175
"scripts": {
76+
"postinstall": "tsup",
7277
"build": "tsup",
7378
"build:force": "rm -rf dist && tsup",
7479
"check:exports": "attw --pack .",

pnpm-lock.yaml

Lines changed: 55 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ catalog:
1515
'@types/react': ^19.0.0
1616
'@types/react-dom': ^19.0.0
1717
react-aria-components: ^1.6.0
18-
react-router: 7.1.5
19-
'@react-router/dev': 7.1.5
20-
'@react-router/node': 7.1.5
21-
'@react-router/serve': 7.1.5
18+
react-router: 7.2.0
19+
'@react-router/dev': 7.2.0
20+
'@react-router/node': 7.2.0
21+
'@react-router/serve': 7.2.0
2222
'@tanstack/react-query': ^5.59.0
2323
release-it: ^18.1.2
2424
typescript: ^5.7.3

0 commit comments

Comments
 (0)