generator-folklore 3.0.16 → 3.0.18

package/lib/generators/stylelint/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 StylelintGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
@@ -15,17 +12,14 @@ module.exports = class StylelintGenerator extends _generator.default {
       defaults: true
     });
   }
-
   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 {
       stylelintrc() {
@@ -35,7 +29,6 @@ module.exports = class StylelintGenerator extends _generator.default {
           camelCase: this.options['camel-case']
         });
       },
-
       dependencies() {
         this.addDevDependencies({
           stylelint: '^15.0.0',
@@ -44,16 +37,12 @@ module.exports = class StylelintGenerator extends _generator.default {
           'stylelint-config-standard': '^30.0.1'
         });
       }
-
     };
   }
-
   async install() {
     if (this.options['skip-install']) {
       return;
     }
-
     await this.spawnCommand('npm', ['install']);
   }
-
 };

package/lib/generators/stylelint/templates/stylelintrc

@@ -13,6 +13,7 @@
                 "message": "Selector should be written in camel-case (selector-class-pattern)"
             }
         ],<% } %>
-        "max-nesting-depth": 4
+        "max-nesting-depth": 4,
+        "import-notation": ["string", "url"]
     }
 }

package/lib/generators/test/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 TestGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
@@ -15,22 +12,18 @@ module.exports = class TestGenerator extends _generator.default {
       defaults: 'jest'
     });
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('Test Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       }
-
     };
   }
-
   get writing() {
     return {
       directories() {
@@ -40,33 +33,26 @@ module.exports = class TestGenerator extends _generator.default {
         this.fs.copy(this.templatePath(`${type}/mocks`), this.destinationPath('__mocks__'));
         this.fs.copy(this.templatePath(`${type}/tests`), this.destinationPath('__tests__'));
       },
-
       jestConfig() {
         const {
           type
         } = this.options;
-
         if (type !== 'jest') {
           return;
         }
-
         const destPath = this.destinationPath('jest.config.js');
-
         if (!this.fs.exists(destPath)) {
           this.fs.copy(this.templatePath(`${type}/jest.config.js`), destPath);
         }
       }
-
     };
   }
-
   get install() {
     return {
       npm() {
         if (this.options['skip-install']) {
           return;
         }
-
         this.addDevDependencies({
           'babel-jest': 'latest',
           enzyme: 'latest',
@@ -78,8 +64,6 @@ module.exports = class TestGenerator extends _generator.default {
           sinon: 'latest'
         });
       }
-
     };
   }
-
 };

package/lib/lib/generator.js

@@ -4,25 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _yeomanGenerator = _interopRequireDefault(require("yeoman-generator"));
-
 var _immutable = _interopRequireDefault(require("immutable"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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); }
 class Generator extends _yeomanGenerator.default {
   static getConfigPath() {
     const home = process.env[process.platform === 'win32' ? 'USERPROFILE' : 'HOME'];
     return _path.default.join(home, '.config/yeoman-generator-folklore/config.json');
   }
-
   constructor(args, options) {
     super(args, options);
     this._composerJson = null;
@@ -31,45 +25,33 @@ class Generator extends _yeomanGenerator.default {
       defaults: false
     });
   }
-
   get composerJson() {
     if (!this._composerJson) {
       this._composerJson = this.createStorage('composer.json');
     }
-
     return this._composerJson;
   }
-
   getConfig() {
     const configPath = Generator.getConfigPath();
     return this.fs.exists(configPath) ? this.fs.readJSON(configPath) : {};
   }
-
   updateConfig(data, force) {
     const forceUpdate = force || false;
-
     const config = _immutable.default.fromJS(this.getConfig());
-
     let newConfig = Object.assign({}, config);
-
     _lodash.default.each(data, (value, key) => {
       if (forceUpdate || value && value.length && value !== _lodash.default.get(config, key)) {
         newConfig = newConfig.set(key, value);
       }
     });
-
     const newData = newConfig.toJS();
-
     if (config !== newConfig) {
       const configPath = Generator.getConfigPath();
       this.fs.writeJSON(configPath, newData);
     }
-
     return newData;
   }
-
 }
-
 _defineProperty(Generator, "prompts", {
   project_name: {
     type: 'input',
@@ -81,6 +63,4 @@ _defineProperty(Generator, "prompts", {
     }
   }
 });
-
-var _default = Generator;
-exports.default = _default;
+var _default = exports.default = Generator;

package/lib/lib/mysql.js

@@ -8,56 +8,46 @@ module.exports = connection => {
           if (err) {
             return reject(err);
           }
-
           return resolve(rows);
         });
       });
     },
-
     createUser(user, password) {
       return new Promise((resolve, reject) => {
         connection.query(`CREATE USER "${user}"@"localhost" IDENTIFIED BY "${password}"`, (err, rows) => {
           if (err) {
             return reject(err);
           }
-
           return resolve(rows);
         });
       });
     },
-
     createDatabaseUser(database, user, password) {
       return new Promise((resolve, reject) => {
         connection.query(`GRANT ALL ON \`${database}\`.* TO "${user}"@"localhost" IDENTIFIED BY "${password}"`, (err, rows) => {
           if (err) {
             return reject(err);
           }
-
           return resolve(rows);
         });
       });
     },
-
     grantPrivileges(user, database) {
       return new Promise((resolve, reject) => {
         let newDatabase = database;
-
         if (typeof database !== 'undefined' && database && database.length) {
           newDatabase += '.*';
         } else {
           newDatabase = '*.*';
         }
-
         connection.query(`GRANT ALL PRIVILEGES ON ${newDatabase} TO "${user}"@"localhost" WITH GRANT OPTION`, (err, rows) => {
           if (err) {
             return reject(err);
           }
-
           return resolve(rows);
         });
       });
     }
-
   };
   return Mysql;
 };

package/lib/lib/utils.js

@@ -4,13 +4,9 @@ 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.16",
+    "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": "6ec0b30e81fd5508831e2b6f7b7337fa9b69e208"
+    "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;