generator-folklore 3.0.27 → 3.0.29

package/lib/generators/build/index.js

@@ -83,6 +83,18 @@ module.exports = class AppGenerator extends _generator.default {
         this.addDevDependencies({
           '@folklore/cli': '^0.1.28'
         });
+        this.addDevDependencies({
+          '@tsconfig/create-react-app': '^2.0.7'
+        });
+      },
+      templates() {
+        // const srcPathJs = this.templatePath('.jsconfig.json');
+        // const destPathJs = this.destinationPath('jsconfig.json');
+        // this.fs.copy(srcPathJs, destPathJs);
+
+        const srcPathTs = this.templatePath('.tsconfig.json');
+        const destPathTs = this.destinationPath('tsconfig.json');
+        this.fs.copy(srcPathTs, destPathTs);
       }
     };
   }

package/lib/generators/build/templates/.jsconfig.json

@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "jsx": "react-jsx",
+        "module": "esnext",
+        "moduleResolution": "Bundler",
+        "target": "ES5"
+    },
+    "include": ["src/**/*"]
+}

package/lib/generators/build/templates/.tsconfig.json

@@ -0,0 +1,7 @@
+{
+    "extends": "@tsconfig/create-react-app/tsconfig.json",
+    "compilerOptions": {
+        "strict": false
+    },
+    "include": []
+}

package/lib/generators/laravel/templates/_composer.json

@@ -3,6 +3,7 @@
         "folklore/image": "v1.x-dev",
         "folklore/laravel-locale": "^3.0",
         "barryvdh/laravel-debugbar": "^3.2",
-        "hackzilla/password-generator": "^1.4"
+        "hackzilla/password-generator": "^1.4",
+        "laravel/sanctum": "^4.2"
     }
 }

package/lib/generators/laravel/templates/laravel/config/app.php

@@ -189,12 +189,13 @@ return [
          * Application Service Providers...
          */
         App\Providers\AppServiceProvider::class,
-        App\Providers\AuthServiceProvider::class,
+        // App\Providers\AuthServiceProvider::class,
         // App\Providers\BroadcastServiceProvider::class,
-        App\Providers\EventServiceProvider::class,<% if (options.panneau) { %>
-        App\Providers\PanneauServiceProvider::class,<% } %>
+        // App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-        App\Providers\ViewServiceProvider::class,
+        App\Providers\ViewServiceProvider::class,<% if (options.panneau) { %>
+        App\Providers\FortifyServiceProvider::class,
+        App\Panneau\PanneauServiceProvider::class,<% } %>
     ],
 
     /*

package/lib/generators/laravel/templates/laravel/routes/api.php

@@ -0,0 +1,3 @@
+<?php
+
+use Illuminate\Support\Facades\Route;

package/lib/generators/laravel/templates/laravel/routes/console.php

@@ -1,8 +1,11 @@
 <?php
 
 use Illuminate\Foundation\Inspiring;
+use Illuminate\Support\Facades\Schedule;
 
-//Db Install
+$isProduction = app()->environment('production');
+
+// DB Install
 Artisan::command('db:install {--force}', function () {
     $args = [];
     if ($this->option('force')) {
@@ -12,7 +15,7 @@ Artisan::command('db:install {--force}', function () {
     Artisan::call('db:seed', $args);
 })->describe('Install database');
 
-//DB reset
+// DB reset
 Artisan::command('db:reset {--force}', function () {
     $args = [];
     if ($this->option('force')) {

package/lib/generators/laravel-panneau/templates/app/Models/Block.php

@@ -16,7 +16,7 @@ class Block extends BaseBlock
         'image' => \App\Entities\Blocks\ImageBlock::class,
     ];
 
-    public function toResource(): BlockContract
+    public function toEntity(): BlockContract
     {
         return $this->toTypedEntity() ?? new BlockResource($this);
     }

package/lib/generators/laravel-panneau/templates/app/Models/Page.php

@@ -15,7 +15,7 @@ class Page extends BasePage
         'home' => \App\Resources\Pages\HomePage::class,
     ];
 
-    public function toResource(): PageContract
+    public function toEntity(): PageContract
     {
         return $this->toTypedEntity() ?? new PageResource($this);
     }

package/lib/generators/laravel-panneau/templates/index.js

@@ -18,7 +18,7 @@ function renderApp(Container, props) {
 function loadContainer({ isPanneau = false }) {
     return isPanneau
         ? import('./components/Panneau').then(({ default: Container }) => Container)
-        : import('./components/Container').then(({ default: Container }) => Container);
+        : import('./components/App').then(({ default: Container }) => Container);
 }
 
 const props = getAppProps();

package/lib/generators/laravel-panneau/templates/resources/assets/js/components/Panneau.jsx

@@ -4,8 +4,6 @@ import { FIELDS_NAMESPACE } from '@panneau/core/contexts';
 import PropTypes from 'prop-types';
 import React, { useState, useEffect } from 'react';
 
-import * as AppPropTypes from '../lib/PropTypes';
-
 import * as fieldsComponents from './panneau/fields';
 
 import '../../styles/panneau.scss';
@@ -14,8 +12,8 @@ const propTypes = {
     definition: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
     baseUrl: PropTypes.string.isRequired,
     uploadEndpoint: PropTypes.string,
-    user: AppPropTypes.user,
-    statusCode: AppPropTypes.statusCode,
+    user: PropTypes.object,
+    statusCode: PropTypes.string,
 };
 
 const defaultProps = {

package/lib/generators/laravel-project/index.js

@@ -33,7 +33,7 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     this.option('laravel-version', {
       type: String,
       desc: 'Laravel version',
-      defaults: '10'
+      defaults: '12'
     });
     this.option('laravel-branch', {
       type: String,

package/lib/generators/laravel-project/templates/laravel/app/Models/User.php

@@ -13,7 +13,7 @@ class User extends BaseUser
 {
     use HasApiTokens, HasFactory;
 
-    public function toResource(): UserContract
+    public function toEntity(): UserContract
     {
         return new UserResource($this);
     }

package/lib/generators/laravel-project/templates/laravel/config/app.php

@@ -191,9 +191,9 @@ return [
          * Application Service Providers...
          */
         App\Providers\AppServiceProvider::class,
-        App\Providers\AuthServiceProvider::class,
+        // App\Providers\AuthServiceProvider::class,
         // App\Providers\BroadcastServiceProvider::class,
-        App\Providers\EventServiceProvider::class,
+        // App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
         App\Providers\ViewServiceProvider::class,<% if (options.panneau) { %>
         App\Providers\FortifyServiceProvider::class,

package/lib/generators/laravel-project/templates/laravel/routes/api.php

@@ -0,0 +1,3 @@
+<?php
+
+use Illuminate\Support\Facades\Route;

package/lib/generators/micromag-project/templates/Routes.jsx

@@ -4,17 +4,12 @@ import { Route, Switch } from 'wouter';
 import { useRoutes } from '@folklore/routes';
 
 // import { useUrlGenerator } from '@folklore/routes';
-// import * as AppPropTypes from '../lib/PropTypes';
 import MainLayout from './layouts/Main';
-import ErrorPage from './pages/Error';
+// import ErrorPage from './pages/Error';
 import HomePage from './pages/Home';
 
 import '<%= getRelativeStylesPath('components/App.jsx', 'styles.css') %>';
 
-const propTypes = {};
-
-const defaultProps = {};
-
 function Routes() {
     const routes = useRoutes() || {};
     return (
@@ -28,7 +23,4 @@ function Routes() {
     );
 }
 
-Routes.propTypes = propTypes;
-Routes.defaultProps = defaultProps;
-
 export default Routes;

package/lib/generators/react-app/index.js

@@ -25,6 +25,9 @@ module.exports = class ReactAppGenerator extends _generator.default {
     this.option('styles-path', {
       type: String
     });
+    this.option('types-path', {
+      type: String
+    });
   }
   initializing() {
     this.react_features = [];
@@ -78,6 +81,13 @@ module.exports = class ReactAppGenerator extends _generator.default {
         const destPath = this.destinationPath(stylesPath);
         this.fs.copyTpl(srcPath, destPath, templateData);
       },
+      types() {
+        const typesPath = this.options['types-path'] || _path.default.join(this.options.path, 'types');
+        console.log('yo', typesPath, this.templatePath('types'));
+        const srcPath = this.templatePath('types');
+        const destPath = this.destinationPath(typesPath);
+        this.fs.copy(srcPath, destPath);
+      },
       packageJSON() {
         const srcPath = this.templatePath('_package.json');
         const destPath = this.destinationPath('package.json');
@@ -88,17 +98,17 @@ module.exports = class ReactAppGenerator extends _generator.default {
       },
       dependencies() {
         this.addDependencies({
-          react: '^19.1.1',
-          'react-dom': '^19.1.1',
+          react: '^18.3.1',
+          'react-dom': '^18.3.1',
           'react-intl': '^7.1.1',
           wouter: '^3.7.1',
           'react-helmet': '^6.1.0',
           classnames: '^2.5.1',
-          '@folklore/routes': '^0.2.42',
-          '@folklore/fonts': '^0.0.15',
-          '@folklore/forms': '^0.0.28',
+          '@folklore/routes': '^0.2.43',
+          '@folklore/fonts': '^0.0.16',
+          '@folklore/forms': '^0.0.29',
           '@folklore/fetch': '^0.1.21',
-          '@folklore/hooks': '^0.0.74',
+          '@folklore/hooks': '^0.0.75',
           '@folklore/tracking': '^0.0.33',
           // Polyfills
           intl: '^1.2.5',

package/lib/generators/react-app/templates/_package.json

@@ -14,6 +14,10 @@
         {
             "name": "Nicolas Roy-Bourdages",
             "email": "nrb@folklore.email"
+        },
+        {
+            "name": "Samuel Poisson",
+            "email": "samuel@urbania.ca"
         }
     ]
 }

package/lib/generators/react-app/templates/src/components/{App.jsx → App.tsx}

@@ -1,24 +1,18 @@
 import { RoutesProvider } from '@folklore/routes';
-import PropTypes from 'prop-types';
-import React from 'react';
 import { IntlProvider } from 'react-intl';
 import { Router } from 'wouter';
 
-// import * as AppPropTypes from '../lib/PropTypes';
 import Routes from './Routes';
 
-const propTypes = {
-    intl: PropTypes.shape({
-        locale: PropTypes.string,
-        messages: PropTypes.oneOfType([
-            PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
-            PropTypes.objectOf(PropTypes.string),
-        ]),
-    }),
-    routes: PropTypes.objectOf(PropTypes.string),
-};
+interface AppProps {
+    intl?: {
+        locale?: string;
+        messages?: Record<string, Record<string, string>> | Record<string, string>;
+    } | null;
+    routes?: Record<string, string>;
+}
 
-function App({ intl = null, routes = { home: '/' } }) {
+function App({ intl = null, routes = { home: '/' } }: AppProps) {
     const { locale = 'fr', messages = {} } = intl || {};
     return (
         <IntlProvider locale={locale} messages={messages[locale] || messages}>
@@ -31,6 +25,4 @@ function App({ intl = null, routes = { home: '/' } }) {
     );
 }
 
-App.propTypes = propTypes;
-
 export default App;

package/lib/generators/react-app/templates/src/components/{Routes.jsx → Routes.tsx}

@@ -1,18 +1,12 @@
-import React from 'react';
-// import PropTypes from 'prop-types';
 import { Route, Switch } from 'wouter';
 import { useRoutes } from '@folklore/routes';
 
-// import { useUrlGenerator } from '@folklore/routes';
-// import * as AppPropTypes from '../lib/PropTypes';
 import MainLayout from './layouts/Main';
 import ErrorPage from './pages/Error';
 import HomePage from './pages/Home';
 
 import '<%= getRelativeStylesPath('components/App.jsx', 'styles.css') %>';
 
-const propTypes = {};
-
 function Routes() {
     const routes = useRoutes() || {};
     return (
@@ -31,6 +25,4 @@ function Routes() {
     );
 }
 
-Routes.propTypes = propTypes;
-
 export default Routes;

package/lib/generators/react-app/templates/src/components/buttons/{Button.jsx → Button.tsx}

@@ -1,32 +1,36 @@
 /* eslint-disable react/button-has-type */
-import React from 'react';
-import PropTypes from 'prop-types';
+import { ReactNode, MouseEvent } from 'react';
 import classNames from 'classnames';
 import { Link } from 'wouter';
 
-import * as AppPropTypes from '../../lib/PropTypes';
-
 import styles from '<%= getRelativeStylesPath('components/buttons/Button.jsx', 'buttons/button.module.css') %>';
 
-const propTypes = {
-    text: PropTypes.string,
-    type: PropTypes.string,
-    href: PropTypes.string,
-    external: PropTypes.bool,
-    direct: PropTypes.bool,
-    target: PropTypes.string,
-    label: AppPropTypes.label,
-    children: AppPropTypes.label,
-    icon: PropTypes.node,
-    iconPosition: PropTypes.oneOf(['left', 'right', 'inline']),
-    disabled: PropTypes.bool,
-    loading: PropTypes.bool,
-    disableOnLoading: PropTypes.bool,
-    className: PropTypes.string,
-    iconClassName: PropTypes.string,
-    labelClassName: PropTypes.string,
-    onClick: PropTypes.func,
-};
+interface Message {
+    id: string;
+    defaultMessage?: string;
+}
+
+type Label = Message | ReactNode;
+
+interface ButtonProps {
+    text?: string | null;
+    type?: 'button' | 'submit' | 'reset';
+    href?: string | null;
+    external?: boolean;
+    direct?: boolean;
+    target?: string;
+    label?: Label | null;
+    children?: Label | null;
+    icon?: ReactNode | null;
+    iconPosition?: 'left' | 'right' | 'inline';
+    disabled?: boolean;
+    loading?: boolean;
+    disableOnLoading?: boolean;
+    className?: string | null;
+    iconClassName?: string | null;
+    labelClassName?: string | null;
+    onClick?: ((e: MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => void) | null;
+}
 
 function Button({
     text = null,
@@ -46,7 +50,7 @@ function Button({
     iconClassName = null,
     labelClassName = null,
     onClick = null,
-}) {
+}: ButtonProps) {
     const finalLabel = label || children;
     const hasChildren = label !== null && children !== null;
     const hasIcon = icon !== null;
@@ -135,8 +139,6 @@ function Button({
             {content}
         </button>
     );
-};
-
-Button.propTypes = propTypes;
+}
 
 export default Button;

package/lib/generators/react-app/templates/src/components/layouts/{Main.jsx → Main.tsx}

@@ -1,13 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
 import styles from '<%= getRelativeStylesPath('components/layouts/Main.jsx', 'layouts/main.module.css') %>';
 
-const propTypes = {
-    children: PropTypes.node.isRequired,
-};
-
-function MainLayout({ children = null }) {
+function MainLayout({ children = null }: { children: React.ReactNode }) {
     return (
         <div className={styles.container}>
             <div className={styles.inner}>
@@ -17,6 +10,4 @@ function MainLayout({ children = null }) {
     );
 };
 
-MainLayout.propTypes = propTypes;
-
 export default MainLayout;

package/lib/generators/react-app/templates/src/components/menus/{Menu.jsx → Menu.tsx}

@@ -1,19 +1,23 @@
 /* eslint-disable react/no-array-index-key */
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { Link } from 'wouter';
 
-import * as AppPropTypes from '../../lib/PropTypes';
-
 import styles from '<%= getRelativeStylesPath('components/menus/Menu.jsx', 'menus/menu.module.css') %>';
 
-const propTypes = {
-    items: AppPropTypes.menuItems,
-    className: PropTypes.string,
-};
+interface MenuItem {
+    label: string;
+    url: string;
+    active?: boolean;
+    external?: boolean;
+    target?: string;
+}
+
+interface MenuProps {
+    items?: MenuItem[];
+    className?: string | null;
+}
 
-function Menu({ items = [], className = null }) {
+function Menu({ items = [], className = null }: MenuProps) {
     return (
         <nav
             className={classNames([

package/lib/generators/react-app/templates/src/components/pages/{Error.jsx → Error.tsx}

@@ -1,11 +1,8 @@
 /* eslint-disable react/jsx-props-no-spreading */
-import React from 'react';
-import PropTypes from 'prop-types';
 import { Link } from 'wouter';
 import { defineMessages, FormattedMessage } from 'react-intl';
 import { useUrlGenerator } from '@folklore/routes';
 
-// import * as AppPropTypes from '../../lib/PropTypes';
 import PageMeta from '../partials/PageMeta';
 
 import styles from '<%= getRelativeStylesPath('components/pages/Error.jsx', 'pages/error.module.css') %>';
@@ -69,11 +66,7 @@ export const messages = defineMessages({
     },
 });
 
-const propTypes = {
-    statusCode: PropTypes.number,
-};
-
-function ErrorPage({ statusCode = 404 }) {
+function ErrorPage({ statusCode = 404 }: { statusCode?: number }) {
     const url = useUrlGenerator();
     return (
         <div className={styles.container}>
@@ -95,6 +88,4 @@ function ErrorPage({ statusCode = 404 }) {
     );
 };
 
-ErrorPage.propTypes = propTypes;
-
 export default ErrorPage;

package/lib/generators/react-app/templates/src/components/pages/{Home.jsx → Home.tsx}

@@ -1,8 +1,5 @@
-import React from 'react';
-// import PropTypes from 'prop-types';
 import { defineMessages } from 'react-intl';
 
-// import * as AppPropTypes from '../../lib/PropTypes';
 import PageMeta from '../partials/PageMeta';
 
 import styles from '<%= getRelativeStylesPath('components/pages/Home.jsx', 'pages/home.module.css') %>';
@@ -14,10 +11,6 @@ const messages = defineMessages({
     },
 });
 
-const propTypes = {
-    // intl: AppPropTypes.intl.isRequired,
-};
-
 function HomePage () {
     return (
         <div className={styles.container}>
@@ -27,6 +20,4 @@ function HomePage () {
     );
 }
 
-HomePage.propTypes = propTypes;
-
 export default HomePage;

package/lib/generators/react-app/templates/src/components/partials/PageMeta.tsx

@@ -0,0 +1,16 @@
+/* eslint-disable react/no-array-index-key */
+import { Helmet } from 'react-helmet';
+import { useIntl } from 'react-intl';
+
+import { isMessage } from '../../lib/utils';
+
+function PageMeta({ title = null }: { title: string | object | null }) {
+    const intl = useIntl();
+    return (
+        <Helmet>
+            <title>{isMessage(title) ? intl.formatMessage(title) : title}</title>
+        </Helmet>
+    );
+}
+
+export default PageMeta;

package/lib/generators/react-app/templates/src/contexts/KeysContext.tsx

@@ -0,0 +1,14 @@
+/* globals GOOGLE_API_KEY: true */
+import React, { useContext } from 'react';
+
+const KeysContext = React.createContext({
+    googleApiKey: typeof GOOGLE_API_KEY !== 'undefined' ? GOOGLE_API_KEY : null,
+});
+
+export const useKeys = () => useContext(KeysContext);
+
+export const KeysProvider = ({ children = null, keys = null }: { children: React.ReactNode, keys: object | null }) => (
+    <KeysContext.Provider value={keys}>{children}</KeysContext.Provider>
+);
+
+export default KeysContext;

package/lib/generators/react-app/templates/types/base.d.ts

@@ -0,0 +1,79 @@
+interface IntlMessage {
+    id?: string;
+    defaultMessage?: string;
+}
+
+interface Labels {
+    [key: string]: string;
+}
+
+interface Theme {
+    name: string;
+}
+
+interface ImageSize {
+    id: string;
+    url: string;
+    width: number;
+    height: number;
+}
+
+interface Source {
+    id: string;
+    mime?: string | null;
+    url: string;
+    size?: number | null;
+}
+
+interface Embed {
+    provider: string;
+    iframeUrl?: string;
+    html?: string;
+}
+
+interface Media {
+    id: string;
+    type: string;
+    url: string;
+    name?: string | null;
+    description?: string | null;
+    files?: Record<string, Source>;
+}
+
+interface Image extends Media, ImageSize {
+    type: 'image';
+    sizes: ImageSize[];
+    credits?: string;
+}
+
+interface Audio extends Media {
+    type: 'audio';
+}
+
+interface Video extends Media {
+    type: 'video';
+    embed?: Embed;
+    sources?: Source[];
+}
+
+interface MenuItem {
+    id: string;
+    href: string;
+    external?: boolean;
+    label?: string | ReactNode;
+    icon?: ReactNode;
+}
+
+interface Page {
+    id: string;
+    title?: string | null;
+    slug?: string | null;
+    path?: string | null;
+    description?: string | null;
+    image?: Image | null;
+}
+
+interface User {
+    id: string;
+}
+

package/lib/generators/react-app/templates/types/blocks.d.ts

@@ -0,0 +1,41 @@
+export interface BaseBlock {
+    id: string;
+    uuid?: string;
+    type: string;
+    placement?: string;
+}
+
+export interface TextBlock extends BaseBlock {
+    type: 'text';
+}
+
+export interface ImageBlock extends BaseBlock {
+    type: 'image';
+    media: {
+        url: string;
+        width?: number;
+        height?: number;
+    };
+    caption?: string;
+}
+
+export interface HeadingBlock extends BaseBlock {
+    type: 'heading';
+}
+
+export interface CardsBlock extends BaseBlock {
+    type: 'cards';
+    cards: Card[];
+}
+
+export type Block = TextBlock | ImageBlock | HeadingBlock | CardsBlock | BaseBlock;
+
+export interface BaseCard {
+    id: string;
+    type: string;
+    title?: string | null;
+    description?: string | null;
+    image?: Image | null;
+}
+
+export type Card = BaseCard;

package/lib/generators/react-app/templates/types/forms.d.ts

@@ -0,0 +1,55 @@
+interface BaseField {
+    name: string;
+    type: string;
+    component?: string;
+    label?: string;
+    description?: string;
+    image?: Image | null;
+}
+
+interface FieldOption {
+    value: string;
+    label: string;
+}
+
+interface OptionsField extends BaseField {
+    type: 'options';
+    options: FieldOption[];
+    multiple?: boolean;
+}
+
+interface ButtonsField extends OptionsField {
+    type: 'buttons';
+}
+
+interface SelectField extends OptionsField {
+    type: 'select';
+}
+
+interface TextField extends BaseField {
+    type: 'text';
+}
+
+type FormBaseField = OptionsField | TextField | BaseField;
+
+interface GroupField extends BaseField {
+    type: 'group';
+    fields: FormBaseField[];
+}
+
+type FormField = FormBaseField | GroupField;
+
+interface Form {
+    id: string;
+    title?: string;
+    fields: FormField[];
+}
+
+interface FormErrors {
+    [fieldName: string]: string[] | null;
+}
+
+interface FormSnippet {
+    id: string;
+    title?: string;
+}

package/lib/generators/react-app/templates/types/global.d.ts

@@ -0,0 +1,28 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+declare module '*.scss' {
+    const value: any;
+    export default value;
+}
+declare module '*.css' {
+    const value: any;
+    export default value;
+}
+declare module '*.png' {
+    const value: any;
+    export default value;
+}
+declare module '*.svg' {
+    const value: any;
+    export default value;
+    export const ReactComponent: any;
+}
+
+declare module '*.md' {
+    const value: string;
+    export default value;
+}
+
+interface Window {
+    cioanalytics: any;
+    cioanalyticsReady?: () => void;
+}

package/lib/generators/react-app/templates/types/metadata.d.ts

@@ -0,0 +1,36 @@
+interface Microformat {
+    '@context': string;
+    '@type': string;
+    identifier: string;
+    [key: string]: unknown;
+}
+
+interface Taxonomy {
+    id: string;
+    type: string;
+    label: string;
+    slug: string;
+}
+
+interface Category extends Taxonomy {
+    type: 'category';
+}
+
+interface Author {
+    id: string;
+    slug: string;
+    name: string;
+    image?: Image | null;
+    isPerson?: boolean;
+}
+
+interface Credit {
+    author?: Author | null;
+    name?: string | null;
+    role?: string;
+}
+
+interface Organisation {
+    id: string;
+    name: string;
+}

package/lib/generators/react-package/index.js

@@ -155,7 +155,7 @@ module.exports = class ReactPackageGenerator extends _generator.default {
         if (this.options['skip-install']) {
           return;
         }
-        this.addDependencies(['react@latest', 'prop-types@latest', 'react-dom@latest']);
+        this.addDependencies(['react@18.3.1', 'prop-types@latest', 'react-dom@18.3.1']);
       },
       npmInstallDev() {
         if (this.options['skip-install']) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.27",
+    "version": "3.0.29",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -40,5 +40,5 @@
         "yeoman-generator": "5.9.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "2056c43ca08a0a3eafdd4542887c6923871e100b"
+    "gitHead": "d700a0347ce006f62fa5e83f79435a1d283e80d3"
 }

package/lib/generators/react-app/templates/src/components/partials/PageMeta.jsx

@@ -1,31 +0,0 @@
-/* eslint-disable react/no-array-index-key */
-import React from 'react';
-import { Helmet } from 'react-helmet';
-import { defineMessages, useIntl } from 'react-intl';
-
-import * as AppPropTypes from '../../lib/PropTypes';
-import { isMessage } from '../../lib/utils';
-
-const messages = defineMessages({
-    title: {
-        defaultMessage: 'Title',
-        description: 'Page title',
-    },
-});
-
-const propTypes = {
-    title: AppPropTypes.message,
-};
-
-function PageMeta({ title = null }) {
-    const intl = useIntl();
-    return (
-        <Helmet>
-            <title>{isMessage(title) ? intl.formatMessage(title) : title}</title>
-        </Helmet>
-    );
-}
-
-PageMeta.propTypes = propTypes;
-
-export default PageMeta;

package/lib/generators/react-app/templates/src/contexts/KeysContext.jsx

@@ -1,37 +0,0 @@
-/* globals GOOGLE_API_KEY: true */
-
-/* eslint-disable react/jsx-props-no-spreading */
-import PropTypes from 'prop-types';
-import React, { useContext } from 'react';
-
-const KeysContext = React.createContext({
-    googleApiKey: typeof GOOGLE_API_KEY !== 'undefined' ? GOOGLE_API_KEY : null,
-});
-
-export const useKeys = () => useContext(KeysContext);
-
-export const withKeys = (WrappedComponent) => {
-    const getDisplayName = ({ displayName = null, name = null }) =>
-        displayName || name || 'Component';
-
-    const WithKeysComponent = (props) => (
-        <KeysContext.Consumer>
-            {(keys) => <WrappedComponent {...keys} {...props} />}
-        </KeysContext.Consumer>
-    );
-    WithKeysComponent.displayName = `WithKeys(${getDisplayName(WrappedComponent)})`;
-    return WithKeysComponent;
-};
-
-const propTypes = {
-    children: PropTypes.node.isRequired,
-    keys: PropTypes.objectOf(PropTypes.string),
-};
-
-export const KeysProvider = ({ children = null, keys = null }) => (
-    <KeysContext.Provider value={keys}>{children}</KeysContext.Provider>
-);
-
-KeysProvider.propTypes = propTypes;
-
-export default KeysContext;

package/lib/generators/react-app/templates/src/lib/PropTypes.js

@@ -1,66 +0,0 @@
-import PropTypes from 'prop-types';
-
-/**
- * Core
- */
-export const urlGenerator = PropTypes.shape({
-    route: PropTypes.func.isRequired,
-});
-
-export const history = PropTypes.shape({
-    listen: PropTypes.func.isRequired,
-});
-
-export const intl = PropTypes.shape({
-    locale: PropTypes.string.isRequired,
-    formatMessage: PropTypes.func.isRequired,
-});
-
-export const message = PropTypes.shape({
-    id: PropTypes.string.isRequired,
-    defaultMessage: PropTypes.string,
-});
-
-export const text = PropTypes.oneOfType([message, PropTypes.string]);
-
-export const label = PropTypes.oneOfType([message, PropTypes.node]);
-
-export const statusCode = PropTypes.oneOf([401, 403, 404, 500]);
-
-/**
- * Site
- */
-export const user = PropTypes.shape({
-    id: PropTypes.number,
-    firstname: PropTypes.string,
-    lastname: PropTypes.string,
-    email: PropTypes.string,
-    gender: PropTypes.string,
-    birthdate: PropTypes.string,
-});
-
-export const menuItem = PropTypes.shape({
-    label,
-    url: PropTypes.string,
-    external: PropTypes.bool,
-    active: PropTypes.bool,
-});
-export const menuItems = PropTypes.arrayOf(menuItem);
-
-/**
- * Forms
- */
-export const errors = PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]);
-export const formErrors = PropTypes.objectOf(errors);
-
-export const selectOption = PropTypes.shape({
-    value: PropTypes.string,
-    label: PropTypes.string,
-});
-export const selectOptions = PropTypes.arrayOf(selectOption);
-
-export const formField = PropTypes.shape({
-    value: PropTypes.any,
-    name: PropTypes.string,
-});
-export const formFields = PropTypes.objectOf(formField);