generator-folklore 3.0.4 → 3.0.5

package/lib/generators/babel/index.js

@@ -46,7 +46,7 @@ module.exports = class BabelGenerator extends _generator.default {
           'transform-runtime': transformRuntime,
           'react-intl': reactIntl
         } = this.options;
-        const srcPath = this.templatePath('config');
+        const srcPath = this.templatePath('config.js');
         const destPath = this.destinationPath('babel.config.js');
         this.fs.copyTpl(srcPath, destPath, {
           react,

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 
-import App from './components/App';
+import Container from './components/Container';
 import shouldPolyfill from './polyfills/should';
 
 function getAppProps() {
@@ -9,10 +9,11 @@ function getAppProps() {
 }
 
 function renderApp(props) {
-    const container = document.getElementById('app');
-    const app = React.createElement(App, props);
-    const root = createRoot(container);
-    root.render(app);
+    const element = document.getElementById('app');
+    const container = React.createElement(Container, props);
+    const strictMode = React.createElement(React.StrictMode, {}, container);
+    const root = createRoot(element);
+    root.render(strictMode);
 }
 
 if (shouldPolyfill()) {

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

@@ -1,40 +1,43 @@
-import { RoutesProvider } from '@folklore/routes';
-import PropTypes from 'prop-types';
 import React from 'react';
-import { IntlProvider } from 'react-intl';
-import { BrowserRouter } from 'react-router-dom';
+// import PropTypes from 'prop-types';
+import { Route, Routes } from 'react-router-dom';
 
+// import { useUrlGenerator } from '@folklore/routes';
 // import * as AppPropTypes from '../lib/PropTypes';
-import Routes from './Routes';
+import MainLayout from './layouts/Main';
+import ErrorPage from './pages/Error';
+import HomePage from './pages/Home';
 
 import '<%= getRelativeStylesPath('components/App.jsx', 'styles.scss') %>';
 
-const propTypes = {
-    locale: PropTypes.string,
-    messages: PropTypes.oneOfType([
-        PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
-        PropTypes.objectOf(PropTypes.string),
-    ]),
-    routes: PropTypes.objectOf(PropTypes.string),
-};
+const propTypes = {};
 
-const defaultProps = {
-    locale: 'fr',
-    messages: {},
-    routes: {},
-};
+const defaultProps = {};
 
-function App({ locale, messages, routes, statusCode, googleApiKey }) {
+function App() {
+    // const urlGenerator = useUrlGenerator();
     return (
-        <IntlProvider locale={locale} messages={messages[locale] || messages}>
-            <BrowserRouter>
-                <RoutesProvider routes={routes}>
-                    <Routes />
-                </RoutesProvider>
-            </BrowserRouter>
-        </IntlProvider>
+        <Routes>
+            <Route
+                path="/"
+                exact
+                element={
+                    <MainLayout>
+                        <HomePage />
+                    </MainLayout>
+                }
+            />
+            <Route
+                path="*"
+                element={
+                    <MainLayout>
+                        <ErrorPage />
+                    </MainLayout>
+                }
+            />
+        </Routes>
     );
-};
+}
 
 App.propTypes = propTypes;
 App.defaultProps = defaultProps;

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

@@ -0,0 +1,40 @@
+import { RoutesProvider } from '@folklore/routes';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { IntlProvider } from 'react-intl';
+import { BrowserRouter } from 'react-router-dom';
+
+// import * as AppPropTypes from '../lib/PropTypes';
+import App from './App';
+
+const propTypes = {
+    locale: PropTypes.string,
+    messages: PropTypes.oneOfType([
+        PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
+        PropTypes.objectOf(PropTypes.string),
+    ]),
+    routes: PropTypes.objectOf(PropTypes.string),
+};
+
+const defaultProps = {
+    locale: 'fr',
+    messages: {},
+    routes: {},
+};
+
+function Container({ locale, messages, routes }) {
+    return (
+        <IntlProvider locale={locale} messages={messages[locale] || messages}>
+            <BrowserRouter>
+                <RoutesProvider routes={routes}>
+                    <App />
+                </RoutesProvider>
+            </BrowserRouter>
+        </IntlProvider>
+    );
+}
+
+Container.propTypes = propTypes;
+Container.defaultProps = defaultProps;
+
+export default Container;

package/lib/generators/react-app/templates/src/components/menus/Menu.jsx

@@ -30,7 +30,7 @@ function Menu({ items, className }) {
             ])}
         >
             <ul className={styles.items}>
-                {items.map(({ label, url, active = false, external = false }, index) => (
+                {items.map(({ label, url, active = false, external = false, target = '_blank' }, index) => (
                     <li
                         className={classNames([
                             styles.item,
@@ -41,7 +41,7 @@ function Menu({ items, className }) {
                         key={`item-${index}`}
                     >
                         {external ? (
-                            <a href={url} className={styles.link}>
+                            <a href={url} target={target} className={styles.link}>
                                 <Label>{label}</Label>
                             </a>
                         ) : (

package/lib/generators/rollup/templates/config.js

@@ -1,9 +1,9 @@
-import path from 'path';
 import babel from '@rollup/plugin-babel';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
 import resolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
+import path from 'path';
 
 export const plugins = [
     json(),
@@ -20,9 +20,12 @@ export const plugins = [
         babelHelpers: 'runtime',
     }),
     replace({
-        'process.env.NODE_ENV': JSON.stringify('production'),
-        __buildDate__: () => JSON.stringify(new Date()),
-        __buildVersion: 15,
+        values: {
+            'process.env.NODE_ENV': JSON.stringify('production'),
+            __buildDate__: () => JSON.stringify(new Date()),
+            __buildVersion: 15,
+        },
+        preventAssignment: false,
     }),
 ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.4",
+    "version": "3.0.5",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -39,5 +39,5 @@
         "yeoman-generator": "^5.6.1",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "19f9dc4807a6f4992e3c0f56b2bb448414d6876b"
+    "gitHead": "49ba685c19aa4e7e0a358eb8d7f04a285e5732a5"
 }

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

@@ -1,43 +0,0 @@
-import React from 'react';
-// import PropTypes from 'prop-types';
-import { Route, Routes as Switch } from 'react-router-dom';
-
-// 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';
-
-const propTypes = {};
-
-const defaultProps = {};
-
-function Routes() {
-    // const urlGenerator = useUrlGenerator();
-    return (
-        <Switch>
-            <Route
-                path="/"
-                exact
-                element={
-                    <MainLayout>
-                        <HomePage />
-                    </MainLayout>
-                }
-            />
-            <Route
-                path="*"
-                element={
-                    <MainLayout>
-                        <ErrorPage />
-                    </MainLayout>
-                }
-            />
-        </Switch>
-    );
-}
-
-Routes.propTypes = propTypes;
-Routes.defaultProps = defaultProps;
-
-export default Routes;