generator-folklore 3.0.3 → 3.0.4

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

@@ -0,0 +1,47 @@
+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';
+
+export const plugins = [
+    json(),
+    resolve({
+        extensions: ['.mjs', '.js', '.jsx', '.json', '.node'],
+        jail: path.join(process.cwd(), 'src'),
+        preferBuiltins: true,
+    }),
+    commonjs(),
+    babel({
+        extensions: ['.mjs', '.js', '.jsx', '.json', '.node'],
+        exclude: 'node_modules/**',
+        rootMode: 'upward',
+        babelHelpers: 'runtime',
+    }),
+    replace({
+        'process.env.NODE_ENV': JSON.stringify('production'),
+        __buildDate__: () => JSON.stringify(new Date()),
+        __buildVersion: 15,
+    }),
+];
+
+export default [
+    {
+        input: 'src/index.js',
+        output: {
+            file: 'index.js',
+            format: 'cjs',
+        },
+        plugins,
+    },
+    // {
+    //     input: 'src/cli.js',
+    //     output: {
+    //         file: 'cli.js',
+    //         format: 'cjs',
+    //         banner: '#!/usr/bin/env node',
+    //     },
+    //     plugins,
+    // },
+];

package/lib/generators/scss/index.js

@@ -19,11 +19,6 @@ module.exports = class ScssGenerator extends _generator.default {
       type: String,
       defaults: 'src/scss'
     });
-    this.option('react', {
-      type: Boolean,
-      required: false,
-      defaults: false
-    });
 
     this.stylesPath = destPath => this.destinationPath(_path.default.join(this.options.path, destPath || ''));
   }
@@ -61,19 +56,11 @@ module.exports = class ScssGenerator extends _generator.default {
     };
   }
 
-  configuring() {
-    this.composeWith('folklore:stylelint', {
-      quiet: true,
-      'camel-case': this.options.react
-    });
-  }
-
   get writing() {
     return {
-      main() {
-        const reactSuffix = this.options.react ? '.global' : '';
-        const srcPath = this.templatePath('main.scss');
-        const destPath = this.stylesPath(`main${reactSuffix}.scss`);
+      styles() {
+        const srcPath = this.templatePath('styles.scss');
+        const destPath = this.stylesPath('styles.scss');
         this.fs.copy(srcPath, destPath);
       },
 

package/lib/generators/server/index.js

@@ -0,0 +1,81 @@
+"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) {
+    super(...args);
+    this.option('path', {
+      type: String,
+      defaults: 'src'
+    });
+    this.option('filename', {
+      type: String,
+      defaults: 'server.js'
+    });
+    this.option('socket-io', {
+      type: String,
+      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() {
+        const {
+          filename,
+          path: serverPath,
+          'socket-io': socketIo
+        } = this.options;
+        this.fs.copyTpl(this.templatePath('server.js'), this.destinationPath(_path.default.join(serverPath, filename)), {
+          socketIo
+        });
+      },
+
+      dependencies() {
+        const {
+          'socket-io': socketIo
+        } = this.options;
+        this.addDependencies(['commander', 'debug', 'ejs', 'express']);
+
+        if (socketIo) {
+          this.addDependencies(['socket.io']);
+        }
+      }
+
+    };
+  }
+
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
+  }
+
+};

package/lib/generators/server/templates/server.js

@@ -0,0 +1,59 @@
+import { program } from 'commander';
+import createDebug from 'debug';
+import { renderFile } from 'ejs';
+import express from 'express';
+import { createServer } from 'http';
+import path from 'path';<% if (socketIo) { %>
+import { Server } from 'socket.io';<% } %>
+
+const debug = createDebug('server');
+
+program
+    .description('Run server')
+    .option('-p, --path <path>', 'Path to static', './dist')
+    .option('--port <port>', 'Server port', process.env.PORT || 5000);
+program.parse();
+
+const { port, path: staticPath } = program.opts();
+
+const webPath = path.join(process.cwd(), staticPath);
+
+// Express server
+const app = express();
+const httpServer = createServer(app);
+app.set('view engine', 'html');
+app.set('views', webPath);
+app.engine('html', renderFile);
+app.use(express.json());
+app.use(
+    express.urlencoded({
+        extended: false,
+    }),
+);
+app.use(express.static(webPath));
+
+app.get('/', async (req, res) =>
+    res.render('index.html.ejs', {
+        fromServer: true,
+    }),
+);
+
+app.get('*', async (req, res) => {
+    return res.render('index.html.ejs', {
+        fromServer: true,
+    });
+});<% if (socketIo) { %>
+
+// Socket io
+const io = new Server(httpServer, {
+    cors: {
+        origin: '*',
+        methods: ['GET', 'POST'],
+    },
+});
+io.on('connection', (socket) => {});<% } %>
+
+// Start server
+httpServer.listen(port, () => {
+    debug('Listening on port %i', port);
+});

package/lib/generators/storybook/index.js

@@ -60,19 +60,13 @@ module.exports = class StorybookGenerator extends _generator.default {
       },
 
       packageJSON() {
-        const destPath = this.destinationPath('package.json');
-
-        if (!this.fs.exists(destPath)) {
-          return;
-        }
-
         const packageJSON = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
         packageJSON['storybook-deployer'] = {
           gitUsername: 'Folklore',
           gitEmail: 'info@folklore.email',
           commitMessage: 'Deploy Storybook to GitHub Pages'
         };
-        this.fs.writeJSON(destPath, packageJSON);
+        this.packageJson.merge(packageJSON);
       }
 
     };

package/lib/generators/stylelint/index.js

@@ -16,29 +16,28 @@ module.exports = class StylelintGenerator extends _generator.default {
     });
   }
 
-  get prompting() {
-    return {
-      welcome() {
-        if (this.options.quiet) {
-          return;
-        }
-
-        console.log(_chalk.default.yellow('\n----------------------'));
-        console.log('Stylelint Generator');
-        console.log(_chalk.default.yellow('----------------------\n'));
-      }
+  prompting() {
+    if (this.options.quiet) {
+      return;
+    }
 
-    };
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log('Stylelint Generator');
+    console.log(_chalk.default.yellow('----------------------\n'));
   }
 
   get writing() {
     return {
-      eslintrc() {
+      stylelintrc() {
         const srcPath = this.templatePath('stylelintrc');
         const destPath = this.destinationPath('.stylelintrc');
         this.fs.copyTpl(srcPath, destPath, {
           camelCase: this.options['camel-case']
         });
+      },
+
+      dependencies() {
+        this.addDevDependencies(['stylelint', 'stylelint-config-standard-scss', 'stylelint-config-idiomatic-order', 'stylelint-config-prettier']);
       }
 
     };
@@ -49,7 +48,7 @@ module.exports = class StylelintGenerator extends _generator.default {
       return;
     }
 
-    await this.addDevDependencies(['stylelint', 'stylelint-config-standard-scss', 'stylelint-config-idiomatic-order', 'stylelint-config-prettier']);
+    await this.spawnCommand('npm', ['install']);
   }
 
 };

package/lib/lib/utils.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ensureLeadingDotSlash = ensureLeadingDotSlash;
+
+var _lodash = require("lodash");
+
+var _path = _interopRequireDefault(require("path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ensureLeadingDotSlash(filePath) {
+  return (0, _lodash.isString)(filePath) && !_path.default.isAbsolute(filePath) && filePath.match(/^\./) === null ? `./${filePath}` : filePath;
+  ;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.3",
+    "version": "3.0.4",
     "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": "cf8f69f622f7ce5476723a2dea46157be2fe5833"
+    "gitHead": "19f9dc4807a6f4992e3c0f56b2bb448414d6876b"
 }

package/lib/generators/babel/templates/babel-preset-react.js

@@ -1,7 +0,0 @@
-/* eslint-disable global-require */
-/* eslint-disable import/no-extraneous-dependencies, import/no-dynamic-require */
-module.exports = () => ({
-    presets: [
-        require('babel-preset-react-app'),
-    ],
-});

package/lib/generators/babel/templates/babel-preset.js

@@ -1,57 +0,0 @@
-<% if(hasCompile) { %>const path = require('path');
-
-<% } %>const env = process.env.BABEL_ENV || process.env.NODE_ENV;
-const isEnvDevelopment = env === 'development';
-const isEnvProduction = env === 'production';
-const isEnvTest = env === 'test';<% if(hasCompile) { %>
-const isCommonJS = env === 'cjs';
-const isCompiling = env === 'es' || env === 'cjs';<% } %>
-
-const presets = [
-    [require.resolve('@babel/preset-env'), isEnvTest ? {
-        targets: {
-            node: 'current',
-        },
-    } : {
-        modules: <% if(hasCompile) { %>isCommonJS ? 'commonjs' : false<% } else { %>false<% } %>,
-        targets: {
-            ie: 9,
-        },
-    }],
-    require.resolve('@babel/preset-react'),
-];
-
-const plugins = [
-    require.resolve('@babel/plugin-syntax-dynamic-import'),
-    require.resolve('@babel/plugin-proposal-object-rest-spread'),<% if(hasTransformRuntime) { %>
-    [require.resolve('@babel/plugin-transform-runtime'), {
-        helpers: true,
-        polyfill: false,
-        regenerator: true,
-    }],<% } %>
-];
-
-if (isEnvTest) {
-    plugins.push(require.resolve('babel-plugin-dynamic-import-node'));
-}
-<% if(hasCompile) { %>
-if (isCompiling) {
-    plugins.push([require.resolve('babel-plugin-css-modules-transform'), {
-        preprocessCss: path.join(__dirname, './utils/processScss.js'),
-        extensions: ['.css', '.scss'],
-        generateScopedName: path.join(__dirname, './utils/getLocalIdent.js'),
-    }]);
-    plugins.push([path.join(__dirname, './utils/transformRequireIgnore'), {
-        extensions: ['.global.scss'],
-    }]);
-<% if(hasReactIntl) { %>    if (isCompiling && !isCommonJS) {
-        plugins.push([require.resolve('babel-plugin-react-intl'), {
-            messagesDir: './intl/messages/',
-        }]);
-    }<% } %>
-}
-<% } %>
-module.exports = () => ({
-    presets,
-    plugins,
-});

package/lib/generators/babel/templates/babelrc

@@ -1,5 +0,0 @@
-{
-    "presets": [
-        "<%= presetPath %>"
-    ]
-}

package/lib/generators/babel/templates/utils/processScss.js

@@ -1,10 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const sass = require('node-sass');
-
-module.exports = (data, filename) => {
-    const result = sass.renderSync({
-        data,
-        file: filename,
-    }).css;
-    return result.toString('utf8');
-};

package/lib/generators/babel/templates/utils/transformRequireIgnore.js

@@ -1,80 +0,0 @@
-/* eslint-disable */
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-
-exports.default = function () {
-    function extFix(ext) {
-        return ext.charAt(0) === '.' ? ext : '.' + ext;
-    }
-
-    return {
-        visitor: {
-            CallExpression: {
-                enter: function enter(nodePath, _ref) {
-                    var opts = _ref.opts;
-
-                    var extensionsInput = [].concat(opts.extensions || []);
-                    if (extensionsInput.length === 0) {
-                        return;
-                    }
-                    var extensions = extensionsInput.map(extFix);
-                    var callee = nodePath.get('callee');
-
-                    if (callee.isIdentifier() && callee.equals('name', 'require')) {
-                        var arg = nodePath.get('arguments')[0];
-                        if (arg && arg.isStringLiteral() && extensions.indexOf(_path2.default.extname(arg.node.value)) > -1) {
-                            if (nodePath.parentPath.isVariableDeclarator()) {
-                                throw new Error(arg.node.value + ' should not be assign to variable.');
-                            } else {
-                                nodePath.remove();
-                            }
-                        }
-                    }
-                }
-            },
-
-            ImportDeclaration: {
-                enter: function enter(nodePath, _ref2) {
-                    var opts = _ref2.opts;
-
-                    var extensionsInput = [].concat(opts.extensions || []);
-
-                    if (extensionsInput.length === 0) {
-                        return;
-                    }
-                    var extensions = extensionsInput.map(extFix);
-                    const regExp = new RegExp('('+extensions.join('|')+')$', 'i');
-
-                    if (nodePath.node.source.value.match(regExp)) {
-                        var specifiers = nodePath.get('specifiers');
-
-                        if (specifiers.length) {
-                            var specifier = specifiers[specifiers.length - 1];
-
-                            if (specifier.isImportDefaultSpecifier()) {
-                                throw new Error(nodePath.node.source.value + ' should not be imported using default imports.');
-                            }
-                            if (specifier.isImportSpecifier()) {
-                                throw new Error(nodePath.node.source.value + ' should not be imported using named imports.');
-                            }
-                            if (specifier.isImportNamespaceSpecifier()) {
-                                throw new Error(nodePath.node.source.value + ' should not be imported using namespace imports.');
-                            }
-                        }
-
-                        nodePath.remove();
-                    }
-                }
-            }
-        }
-    };
-};
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/generators/html/templates/index.js

@@ -1,9 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import Root from './components/Root';
-import rootProps from './data/root';
-
-const rootEl = document.getElementById('root');
-const root = React.createElement(Root, rootProps);
-ReactDOM.render(root, rootEl);

package/lib/generators/html/templates/root.js

@@ -1,23 +0,0 @@
-export default {
-    locale: 'fr',
-    messages: {
-        'meta.title': 'Titre',
-        'meta.title_401': 'Error 401',
-        'meta.title_403': 'Error 403',
-        'meta.title_404': 'Error 404',
-        'meta.title_500': 'Error 500',
-
-        'errors.title_401': 'Error 401',
-        'errors.description_401': 'You are not authorized to access this page.',
-        'errors.title_403': 'Error 403',
-        'errors.description_403': 'Access to this page is forbidden',
-        'errors.title_404': 'Error 404',
-        'errors.description_404': 'This page doesn’t exists',
-        'errors.title_500': 'Error 500',
-        'errors.description_500': 'There was an error',
-        'errors.goto_home': 'Go to home',
-    },
-    routes: {
-        home: '/',
-    },
-};

package/lib/generators/html/templates/utils.js

@@ -1,7 +0,0 @@
-// eslint-disable-next-line import/prefer-default-export
-export const getLocaleFromLocation = (locales = ['fr', 'en'], currentLocation = window.location) => {
-    const { pathname = '/' } = currentLocation;
-    const localeRegEx = new RegExp(`^/(${locales.join('|')})(/.*)?$`, 'i');
-    const matches = pathname.match(localeRegEx);
-    return matches !== null ? matches[1] : locales[0];
-};

package/lib/generators/js/templates/browserslistrc

@@ -1,9 +0,0 @@
-[production staging]
-last 4 versions
-> 1%
-ie >= 9
-
-[development]
-last 4 versions
-> 1%
-ie >= 9

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

@@ -1,33 +0,0 @@
-import get from 'lodash/get';
-import set from 'lodash/set';
-
-class Config {
-    constructor(config) {
-        this.config = config || {};
-    }
-
-    get(str) {
-        return get(this.config, str);
-    }
-
-    set(str, val) {
-        return set(this.config, str, val);
-    }
-}
-
-const config = new Config();
-
-// eslint-disable-next-line no-unused-vars
-const configFunc = (key, value) => {
-    if (typeof value !== 'undefined') {
-        return config.set(key, value);
-    } else if (typeof key === 'undefined') {
-        return config.get();
-    }
-    return config.get(key);
-};
-
-const root = global || window || null;
-if (root !== null) {
-    root.app_config = configFunc;
-}

package/lib/generators/js/templates/index.js

@@ -1,41 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import domready from 'domready';<% if (rootPropsImport !== null) { %>
-import defaultRootProps from '<%= rootPropsImport %>';<% } %>
-
-import Root from './components/Root';
-
-<%
-    if (rootPropsImport !== null) {
-        %>const getRootProps = () => defaultRootProps;<%
-    } else {
-        %>const getRootProps = () => {
-    const propsEl = document.getElementById('root-props');
-    return propsEl !== null ? JSON.parse(propsEl.innerHTML) || {} : {};
-};<%
-    }
-%>
-
-const renderRoot = (props) => {
-    const rootEl = document.getElementById('root');
-    const root = React.createElement(Root, props);
-    ReactDOM.render(root, rootEl);
-};
-
-const boot = () => {
-    const rootProps = getRootProps();
-
-    if (typeof window.Intl === 'undefined') {
-        const { locale = 'fr' } = rootProps;
-        import(`./vendor/polyfills/intl-${locale}`).then(() => renderRoot(rootProps));
-    } else {
-        renderRoot(rootProps);
-    }
-};
-
-const ready = (document.readyState || 'loading') !== 'loading';
-if (ready) {
-    boot();
-} else {
-    domready(boot);
-}

package/lib/generators/js/templates/src/actions/LayoutActions.js

@@ -1,12 +0,0 @@
-/**
- * Constants
- */
-export const SET_SIZE = 'layout@SET_SIZE';
-
-/**
- * Actions creator
- */
-export const setSize = payload => ({
-    type: SET_SIZE,
-    payload,
-});

package/lib/generators/js/templates/src/actions/SiteActions.js

@@ -1,22 +0,0 @@
-/**
- * Constants
- */
-export const SET_ERRORS = 'site@SET_ERRORS';
-export const RESET_REQUEST = 'site@RESET_REQUEST';
-
-/**
- * Actions creator
- */
-export const setErrors = payload => ({
-    type: SET_ERRORS,
-    payload,
-});
-
-export const resetErrors = () => ({
-    type: SET_ERRORS,
-    payload: null,
-});
-
-export const resetRequest = () => ({
-    type: RESET_REQUEST,
-});