generator-folklore 3.0.16 → 3.0.18

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/generators/react-package/index.js

@@ -1,17 +1,11 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _changeCase = require("change-case");
-
 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 }; }
-
 module.exports = class ReactPackageGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
@@ -49,22 +43,18 @@ module.exports = class ReactPackageGenerator extends _generator.default {
       defaults: './examples'
     });
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('React Package Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       },
-
       prompts() {
         const prompts = [];
-
         if (!this.options['package-name']) {
           prompts.push({
             type: 'input',
@@ -76,7 +66,6 @@ module.exports = class ReactPackageGenerator extends _generator.default {
             }
           });
         }
-
         if (!this.options['component-name']) {
           prompts.push({
             type: 'input',
@@ -88,38 +77,27 @@ module.exports = class ReactPackageGenerator extends _generator.default {
             }
           });
         }
-
         if (!prompts.length) {
           return null;
         }
-
         return this.prompt(prompts).then(answers => {
           if (answers['package-name']) {
             this.options['package-name'] = answers['package-name'];
           }
-
           if (answers['component-name']) {
             this.options['component-name'] = answers['component-name'];
           }
         });
       }
-
     };
   }
-
   configuring() {
     const srcPath = _lodash.default.get(this.options, 'src-path');
-
     const destPath = _lodash.default.get(this.options, 'dest-path');
-
     const tmpPath = _lodash.default.get(this.options, 'tmp-path');
-
     const buildPath = _lodash.default.get(this.options, 'build-path');
-
     const examplesPath = _lodash.default.get(this.options, 'examples-path');
-
     const skipInstall = _lodash.default.get(this.options, 'skip-install', false);
-
     this.composeWith('folklore:npm-package', {
       'package-name': this.options['package-name'],
       src: false,
@@ -142,7 +120,6 @@ module.exports = class ReactPackageGenerator extends _generator.default {
       quiet: true
     });
   }
-
   get writing() {
     return {
       examples() {
@@ -150,7 +127,6 @@ module.exports = class ReactPackageGenerator extends _generator.default {
         const destPath = this.destinationPath('examples');
         this.fs.copyTpl(srcPath, destPath, this);
       },
-
       src() {
         const srcPath = this.templatePath('src');
         const destPath = this.destinationPath('src');
@@ -158,13 +134,11 @@ module.exports = class ReactPackageGenerator extends _generator.default {
           componentName: this.options['component-name']
         });
       },
-
       storybook() {
         const srcPath = this.templatePath('storybook');
         const destPath = this.destinationPath('.storybook');
         this.fs.copyTpl(srcPath, destPath, {});
       },
-
       packageJSON() {
         const packagePath = this.destinationPath('package.json');
         this.fs.extendJSON(packagePath, {
@@ -173,25 +147,20 @@ module.exports = class ReactPackageGenerator extends _generator.default {
           }
         });
       }
-
     };
   }
-
   get install() {
     return {
       npmInstall() {
         if (this.options['skip-install']) {
           return;
         }
-
         this.addDependencies(['react@latest', 'prop-types@latest', 'react-dom@latest']);
       },
-
       npmInstallDev() {
         if (this.options['skip-install']) {
           return;
         }
-
         this.addDevDependencies({
           domready: 'latest',
           jquery: 'latest',
@@ -203,8 +172,6 @@ module.exports = class ReactPackageGenerator extends _generator.default {
           'html-webpack-plugin': 'latest'
         });
       }
-
     };
   }
-
 };

package/lib/generators/rollup/index.js

@@ -1,33 +1,25 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = class RollupGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('Rollup Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       }
-
     };
   }
-
   get writing() {
     return {
       config() {
@@ -35,7 +27,6 @@ module.exports = class RollupGenerator extends _generator.default {
         const destPath = this.destinationPath('rollup.config.js');
         this.fs.copyTpl(srcPath, destPath);
       },
-
       dependencies() {
         this.addDevDependencies({
           '@rollup/plugin-babel': 'latest',
@@ -46,16 +37,12 @@ module.exports = class RollupGenerator extends _generator.default {
           rollup: '^2.79.1'
         });
       }
-
     };
   }
-
   async install() {
     if (this.options['skip-install']) {
       return;
     }
-
     await this.spawnCommand('npm', ['install']);
   }
-
 };

package/lib/generators/sass-lint/index.js

@@ -1,11 +1,8 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = class SassLintGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
@@ -15,22 +12,18 @@ module.exports = class SassLintGenerator extends _generator.default {
       defaults: false
     });
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('Sass lint Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       }
-
     };
   }
-
   get writing() {
     return {
       eslintrc() {
@@ -40,8 +33,6 @@ module.exports = class SassLintGenerator extends _generator.default {
           camelCase: this.options['camel-case']
         });
       }
-
     };
   }
-
 };

package/lib/generators/scss/index.js

@@ -1,13 +1,9 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = class ScssGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
@@ -19,43 +15,34 @@ module.exports = class ScssGenerator extends _generator.default {
       type: String,
       defaults: 'src/scss'
     });
-
     this.stylesPath = destPath => this.destinationPath(_path.default.join(this.options.path, destPath || ''));
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('SCSS Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       },
-
       prompts() {
         const prompts = [];
-
         if (!this.options['project-name']) {
           prompts.push(ScssGenerator.prompts.project_name);
         }
-
         if (!prompts.length) {
           return null;
         }
-
         return this.prompt(prompts).then(answers => {
           if (answers['project-name']) {
             this.options['project-name'] = answers['project-name'];
           }
         });
       }
-
     };
   }
-
   get writing() {
     return {
       styles() {
@@ -63,14 +50,11 @@ module.exports = class ScssGenerator extends _generator.default {
         const destPath = this.stylesPath('styles.scss');
         this.fs.copy(srcPath, destPath);
       },
-
       commmons() {
         const srcPath = this.templatePath('commons');
         const destPath = this.stylesPath('commons');
         this.fs.copy(srcPath, destPath);
       }
-
     };
   }
-
 };

package/lib/generators/server/index.js

@@ -1,15 +1,10 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 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 }; }
-
 module.exports = class ServerGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {
@@ -27,22 +22,18 @@ module.exports = class ServerGenerator extends _generator.default {
       defaults: false
     });
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('Server Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       }
-
     };
   }
-
   get writing() {
     return {
       index() {
@@ -55,7 +46,6 @@ module.exports = class ServerGenerator extends _generator.default {
           socketIo
         });
       },
-
       dependencies() {
         const {
           'socket-io': socketIo
@@ -66,23 +56,18 @@ module.exports = class ServerGenerator extends _generator.default {
           ejs: 'latest',
           express: 'latest'
         });
-
         if (socketIo) {
           this.addDependencies({
             'socket.io': 'latest'
           });
         }
       }
-
     };
   }
-
   async install() {
     if (this.options['skip-install']) {
       return;
     }
-
     await this.spawnCommand('npm', ['install']);
   }
-
 };

package/lib/generators/storybook/index.js

@@ -1,13 +1,9 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = class StorybookGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
@@ -21,25 +17,20 @@ module.exports = class StorybookGenerator extends _generator.default {
       required: false,
       defaults: '../src/__stories__/*.story.jsx'
     });
-
     this.storybookPath = destPath => this.destinationPath(_path.default.join(this.options.path, destPath));
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('Storybook Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       }
-
     };
   }
-
   get writing() {
     return {
       staticFiles() {
@@ -52,13 +43,11 @@ module.exports = class StorybookGenerator extends _generator.default {
         this.fs.copy(this.templatePath('preview-head.html'), this.storybookPath('preview-head.html'));
         this.fs.copy(this.templatePath('storiesOf.jsx'), this.storybookPath('storiesOf.jsx'));
       },
-
       storiesPattern() {
         this.fs.copyTpl(this.templatePath('stories.pattern'), this.storybookPath('stories.pattern'), {
           pattern: this.options.pattern
         });
       },
-
       packageJSON() {
         const packageJSON = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
         packageJSON['storybook-deployer'] = {
@@ -68,17 +57,14 @@ module.exports = class StorybookGenerator extends _generator.default {
         };
         this.packageJson.merge(packageJSON);
       }
-
     };
   }
-
   get install() {
     return {
       npm() {
         if (this.options['skip-install']) {
           return;
         }
-
         this.addDevDependencies({
           '@storybook/addon-actions': 'latest',
           '@storybook/addon-info': 'latest',
@@ -89,8 +75,6 @@ module.exports = class StorybookGenerator extends _generator.default {
           'glob-loader': 'latest'
         });
       }
-
     };
   }
-
 };