Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"static-resources": "/icons,/images,/javascript,/locales"
},
"dependencies": {
"@jahia/js-server-core": "^0.0.15",
"@jahia/javascript-modules-library": "^0.0.4",
"graphql": "^16.7.1",
"i18next": "^23.10.1",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion template/src/server/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as jahiaTemplates from './templates';
import * as jahiaViews from './views';
import {registerJahiaComponents} from '@jahia/js-server-core';
import {registerJahiaComponents} from '@jahia/javascript-modules-library';

registerJahiaComponents(jahiaTemplates);
registerJahiaComponents(jahiaViews);
2 changes: 1 addition & 1 deletion template/src/server/templates/page/PageHome.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {AddResources, Area, defineJahiaComponent, useServerContext, useUrlBuilder} from '@jahia/js-server-core';
import {AddResources, Area, defineJahiaComponent, useServerContext, useUrlBuilder} from '@jahia/javascript-modules-library';
import {useTranslation} from 'react-i18next';

export const PageHome = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {useServerContext, getNodeProps, defineJahiaComponent} from '@jahia/js-server-core';
import {useServerContext, getNodeProps, defineJahiaComponent} from '@jahia/javascript-modules-library';

export const SimpleContentDefault = () => {
const {currentNode} = useServerContext();
Expand Down
12 changes: 6 additions & 6 deletions template/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = (env, argv) => {
let optimization = isDevelopment ? {} : {
minimizer: [
// This is required to make hydration working, as its implementation relies on the class name of the React component.
// See InBrowser.jsx in js-server-core for details
// See InBrowser.jsx in javascript-modules-library for details
new TerserPlugin({
terserOptions: {
// eslint-disable-next-line camelcase
Expand Down Expand Up @@ -121,11 +121,11 @@ module.exports = (env, argv) => {
},
externals: {
// Those libraries are supplied to webpack at runtime (by the npm-module-engine project), and are not packaged in the output bundle
'@jahia/js-server-core': 'jsServerCoreLibraryBuilder.getLibrary()',
react: 'jsServerCoreLibraryBuilder.getSharedLibrary(\'react\')',
'react-i18next': 'jsServerCoreLibraryBuilder.getSharedLibrary(\'react-i18next\')',
i18next: 'jsServerCoreLibraryBuilder.getSharedLibrary(\'i18next\')',
'styled-jsx/style': 'jsServerCoreLibraryBuilder.getSharedLibrary(\'styled-jsx\')'
'@jahia/javascript-modules-library': 'javascriptModulesLibraryBuilder.getLibrary()',
react: 'javascriptModulesLibraryBuilder.getSharedLibrary(\'react\')',
'react-i18next': 'javascriptModulesLibraryBuilder.getSharedLibrary(\'react-i18next\')',
i18next: 'javascriptModulesLibraryBuilder.getSharedLibrary(\'i18next\')',
'styled-jsx/style': 'javascriptModulesLibraryBuilder.getSharedLibrary(\'styled-jsx\')'
},
resolve: {
mainFields: ['module', 'main'],
Expand Down