generator-folklore 3.0.17 → 3.0.18

package/lib/generators/app/index.js

@@ -3,8 +3,8 @@
 var _chalk = _interopRequireDefault(require("chalk"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }

package/lib/generators/docs/index.js

@@ -5,8 +5,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }

package/lib/generators/laravel/index.js

@@ -8,8 +8,8 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _passwordGenerator = _interopRequireDefault(require("password-generator"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }

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

@@ -8,8 +8,8 @@ var _path = _interopRequireDefault(require("path"));
 var _yeomanRemote = _interopRequireDefault(require("yeoman-remote"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }

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

@@ -5,8 +5,8 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }

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

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

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

@@ -1,42 +1,38 @@
+import { RoutesProvider } from '@folklore/routes';
+import PropTypes from 'prop-types';
 import React from 'react';
-// import PropTypes from 'prop-types';
-import { Route, Routes } from 'react-router-dom';
-import { useRoutes } from '@folklore/routes';
+import { IntlProvider } from 'react-intl';
+import { BrowserRouter } 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';
+import Routes from './Routes';
 
-import '<%= getRelativeStylesPath('components/App.jsx', 'styles.scss') %>';
+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),
+};
 
-const propTypes = {};
+const defaultProps = {
+    intl: null,
+    routes: {},
+};
 
-const defaultProps = {};
-
-function App() {
-    const routes = useRoutes() || {};
+function App({ intl, routes }) {
+    const { locale = 'fr', messages = {} } = intl || {};
     return (
-        <Routes>
-            <Route
-                path={routes.home || '/'}
-                exact
-                element={
-                    <MainLayout>
-                        <HomePage />
-                    </MainLayout>
-                }
-            />
-            <Route
-                path="*"
-                element={
-                    <MainLayout>
-                        <ErrorPage />
-                    </MainLayout>
-                }
-            />
-        </Routes>
+        <IntlProvider locale={locale} messages={messages[locale] || messages}>
+            <BrowserRouter>
+                <RoutesProvider routes={routes}>
+                    <Routes />
+                </RoutesProvider>
+            </BrowserRouter>
+        </IntlProvider>
     );
 }
 

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

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

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

@@ -9,6 +9,7 @@ import * as AppPropTypes from '../../lib/PropTypes';
 import styles from '<%= getRelativeStylesPath('components/buttons/Button.jsx', 'buttons/button.module.scss') %>';
 
 const propTypes = {
+    text: PropTypes.string,
     type: PropTypes.string,
     href: PropTypes.string,
     external: PropTypes.bool,
@@ -28,6 +29,7 @@ const propTypes = {
 };
 
 const defaultProps = {
+    text: null,
     type: 'button',
     href: null,
     external: false,
@@ -47,6 +49,7 @@ const defaultProps = {
 };
 
 function Button({
+    text,
     type,
     href,
     external,

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

@@ -7,9 +7,7 @@ const propTypes = {
     children: PropTypes.node.isRequired,
 };
 
-const defaultProps = {
-
-};
+const defaultProps = {};
 
 function MainLayout({ children }) {
     return (

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

@@ -5,7 +5,6 @@ import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
 import * as AppPropTypes from '../../lib/PropTypes';
-import Label from '../partials/Label';
 
 import styles from '<%= getRelativeStylesPath('components/menus/Menu.jsx', 'menus/menu.module.scss') %>';
 
@@ -42,11 +41,11 @@ function Menu({ items, className }) {
                     >
                         {external ? (
                             <a href={url} target={target} className={styles.link}>
-                                <Label>{label}</Label>
+                                {label}
                             </a>
                         ) : (
                             <Link to={url} className={styles.link}>
-                                <Label>{label}</Label>
+                                {label}
                             </Link>
                         )}
                     </li>

package/lib/lib/generator.js

@@ -63,5 +63,4 @@ _defineProperty(Generator, "prompts", {
     }
   }
 });
-var _default = Generator;
-exports.default = _default;
+var _default = exports.default = Generator;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.17",
+    "version": "3.0.18",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -40,5 +40,5 @@
         "yeoman-generator": "^5.7.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "74bc16333dab2c70f94aad9439d6daf55388e96e"
+    "gitHead": "ed6cc1e8b1892af42c074d566d6a4096a0bbd233"
 }

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

@@ -1,42 +0,0 @@
-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 = {
-    intl: PropTypes.shape({
-        locale: PropTypes.string,
-        messages: PropTypes.oneOfType([
-            PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
-            PropTypes.objectOf(PropTypes.string),
-        ]),
-    }),
-    routes: PropTypes.objectOf(PropTypes.string),
-};
-
-const defaultProps = {
-    intl: null,
-    routes: {},
-};
-
-function Container({ intl, routes }) {
-    const { locale = null, messages = null } = intl || {};
-    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;