generator-folklore 3.0.16 → 3.0.17

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

@@ -1,36 +1,25 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _glob = _interopRequireDefault(require("glob"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
-
 var _passwordGenerator = _interopRequireDefault(require("password-generator"));
-
 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 _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); }
 module.exports = class LaravelProjectGenerator extends _generator.default {
   static safeDbString(str) {
     return str.replace(/[-s.]+/gi, '_').replace(/[^a-z0-9]+/gi, '');
   }
-
   static getPassword() {
     return (0, _passwordGenerator.default)(20, false);
   }
-
   constructor(...args) {
     super(...args);
     this.argument('project-name', {
@@ -120,26 +109,21 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
       defaults: false
     });
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('Laravel Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       },
-
       prompts() {
         const prompts = [];
-
         if (!this.options['project-name']) {
           prompts.push(_generator.default.prompts.project_name);
         }
-
         if (!this.options['project-host']) {
           prompts.push({
             type: 'input',
@@ -151,7 +135,6 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
             }
           });
         }
-
         if (!this.options['db-name']) {
           prompts.push({
             type: 'input',
@@ -163,7 +146,6 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
             }
           });
         }
-
         const featuresChoices = [!this.options.mediatheque && {
           name: 'Mediatheque',
           value: 'mediatheque',
@@ -177,7 +159,6 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
           value: 'auth',
           checked: true
         }].filter(Boolean);
-
         if (featuresChoices.length) {
           prompts.push({
             type: 'checkbox',
@@ -187,56 +168,40 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
             default: featuresChoices.filter(it => it.checked || false).map(it => it.name)
           });
         }
-
         if (!prompts.length) {
           return null;
         }
-
         return this.prompt(prompts).then(answers => {
           if (answers['project-name']) {
             this.options['project-name'] = answers['project-name'];
           }
-
           if (answers['project-host']) {
             this.options['project-host'] = answers['project-host'];
           }
-
           if (answers['db-name']) {
             this.options['db-name'] = answers['db-name'];
           }
-
           const features = answers.features || [];
-
           if (features.indexOf('panneau') !== -1) {
             this.options.panneau = true;
           }
-
           if (features.indexOf('auth') !== -1) {
             this.options.auth = true;
           }
-
           if (features.indexOf('mediatheque') !== -1) {
             this.options.mediatheque = true;
           }
         });
       }
-
     };
   }
-
   configuring() {
     const assetsPath = _lodash.default.get(this.options, 'assets-path', '').replace(/\/$/, '');
-
     const publicPath = _lodash.default.get(this.options, 'public-path');
-
     const jsPath = _lodash.default.get(this.options, 'js-path');
-
     const jsSrcPath = _path.default.join(assetsPath, jsPath);
-
     const stylesPath = _lodash.default.get(this.options, 'styles-path');
-
     const stylesSrcPath = _path.default.join(assetsPath, stylesPath);
-
     this.composeWith('folklore:prettier', {
       'skip-install': true,
       quiet: true
@@ -285,7 +250,6 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
       quiet: true,
       'skip-install': true
     });
-
     if (this.options.mediatheque) {
       this.composeWith('folklore:laravel-mediatheque', {
         'project-name': this.options['project-name'],
@@ -293,14 +257,15 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
         quiet: true
       });
     }
-
     if (this.options.panneau) {
       this.composeWith('folklore:laravel-panneau', {
         'project-name': this.options['project-name'],
         'skip-install': true,
         quiet: true
       });
-    } // if (this.options.auth) {
+    }
+
+    // if (this.options.auth) {
     //     this.composeWith('folklore:laravel-auth', {
     //         'project-name': this.options['project-name'],
     //         'js-path': jsSrcPath,
@@ -310,7 +275,6 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     //         quiet: true,
     //     });
     // }
-
   }
 
   get writing() {
@@ -323,36 +287,30 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
         } = this.options;
         const versionBranch = laravelVersion !== 'latest' && laravelVersion !== null ? `${laravelVersion.indexOf('.') !== -1 ? laravelVersion : `${laravelVersion}.x`}` : null;
         const branch = laravelBranch || versionBranch;
-
         const remoteCallback = (err, cachePath) => {
           const destinationPath = this.destinationPath();
-
           const files = _glob.default.sync('**', {
             dot: true,
             nodir: true,
             cwd: cachePath
           });
-
           let source;
           let destination;
           files.forEach(file => {
             source = _path.default.join(cachePath, file);
             destination = _path.default.join(destinationPath, file);
-
             if (!this.fs.exists(destination)) {
               this.fs.copy(source, destination);
             }
           });
           done();
         };
-
         if (branch !== null) {
           (0, _yeomanRemote.default)('laravel', 'laravel', branch, remoteCallback);
         } else {
           (0, _yeomanRemote.default)('laravel', 'laravel', remoteCallback);
         }
       },
-
       removeFiles() {
         const files = ['package.json', 'config/app.php', 'config/auth.php', 'routes/web.php', 'vite.config.js', 'resources/css', 'resources/js', 'resources/views/welcome.blade.php', 'app/Http/Controllers/HomeController.php', 'app/Http/Middleware/TrustProxies.php', 'app/Models/User.php'];
         files.forEach(file => {
@@ -360,7 +318,6 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
           this.fs.delete(filePath);
         });
       },
-
       composerJSON() {
         this.composerJson.merge({
           require: {
@@ -380,7 +337,6 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
           'prefer-stable': true
         });
       },
-
       packageJSON() {
         this.packageJson.merge({
           scripts: {
@@ -393,23 +349,19 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
           }
         });
       },
-
       env() {
         const url = _lodash.default.template(_lodash.default.get(this.options, 'url'))({
           project_host: this.options['project-host'],
           project_name: this.options['project-name']
         }).replace(/^(http)?(s)?(:\/\/)?/, 'http$2://');
-
         const urlLocal = _lodash.default.template(_lodash.default.get(this.options, 'local-url'))({
           project_host: this.options['project-host'],
           project_name: this.options['project-name']
         }).replace(/^(http)?(s)?(:\/\/)?/, 'http$2://');
-
         const urlProxy = _lodash.default.template(_lodash.default.get(this.options, 'proxy-url', _lodash.default.get(this.options, 'local-url')))({
           project_host: this.options['project-host'],
           project_name: this.options['project-name']
         }).replace(/^(http)?(s)?(:\/\/)?/, 'http$2://');
-
         const templateData = {
           project_name: this.options['project-name'],
           db_host: this.options['db-host'],
@@ -419,18 +371,18 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
           url: urlLocal,
           proxy_url: urlProxy
         };
-
         const prodTemplateData = _objectSpread(_objectSpread({}, templateData), {}, {
           url,
           db_username: this.options['db-name']
         });
-
         const src = this.templatePath('env');
         const dest = this.destinationPath('.env');
         this.fs.copyTpl(src, dest, templateData);
         const srcExample = this.templatePath('env');
         const destExample = this.destinationPath('.env.example');
-        this.fs.copyTpl(srcExample, destExample, templateData); // const srcProd = this.templatePath('env.prod');
+        this.fs.copyTpl(srcExample, destExample, templateData);
+
+        // const srcProd = this.templatePath('env.prod');
         // const destProd = this.destinationPath('.env.prod');
         // this.fs.copyTpl(srcProd, destProd, prodTemplateData);
       },
@@ -438,18 +390,14 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
       files() {
         const templatePath = this.templatePath('laravel');
         const destinationPath = this.destinationPath();
-
         const files = _glob.default.sync('**', {
           dot: true,
           nodir: true,
           cwd: templatePath
         });
-
         files.forEach(file => {
           const source = _path.default.join(templatePath, file);
-
           const destination = _path.default.join(destinationPath, file);
-
           if (file.match(/\.php$/i)) {
             this.fs.copyTpl(source, destination, {
               options: this.options
@@ -459,63 +407,48 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
           }
         });
       }
-
     };
   }
-
   get install() {
     return {
       async npm() {
         if (this.options['skip-install']) {
           return;
         }
-
         await this.spawnCommand('npm', ['install']);
       },
-
       async composer() {
         if (this.options['skip-install']) {
           return;
         }
-
         await this.spawnCommand('composer', ['install']);
       },
-
       async keyGenerate() {
         if (this.options['skip-install']) {
           return;
         }
-
         await this.spawnCommand('php', ['artisan', 'key:generate']);
       },
-
       async vendorPublish() {
         if (this.options['skip-install']) {
           return;
         }
-
         await this.spawnCommand('php', ['artisan', 'vendor:publish', '--provider=Folklore\\ServiceProvider']);
         await this.spawnCommand('php', ['artisan', 'vendor:publish', '--provider=Folklore\\Locale\\LocaleServiceProvider']);
         await this.spawnCommand('php', ['artisan', 'vendor:publish', '--provider=Folklore\\Image\\ServiceProvider']);
       },
-
       async telescope() {
         if (this.options['skip-install']) {
           return;
         }
-
         await this.spawnCommand('php', ['artisan', 'telescope:install']);
       },
-
       async valet() {
         if (this.options['skip-install']) {
           return;
         }
-
         await this.spawnCommand('valet', ['link', '--secure', this.options['project-host']]);
       }
-
     };
   }
-
 };

package/lib/generators/lerna-package/index.js

@@ -1,19 +1,12 @@
 "use strict";
 
 var _lodash = _interopRequireDefault(require("lodash"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _get = _interopRequireDefault(require("lodash/get"));
-
 var _changeCase = require("change-case");
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 module.exports = class LernaPackageGenerator extends _generator.default {
   constructor(...args) {
     super(...args);
@@ -37,28 +30,23 @@ module.exports = class LernaPackageGenerator extends _generator.default {
       type: String,
       required: false
     });
-
     this.packagePath = destPath => {
       const nameParts = this.options['package-name'].split('/');
       return this.destinationPath(_path.default.join(this.options['package-folder'], nameParts[nameParts.length - 1], destPath || ''));
     };
   }
-
   get prompting() {
     return {
       welcome() {
         if (this.options.quiet) {
           return;
         }
-
         console.log(_chalk.default.yellow('\n----------------------'));
         console.log('Lerna Package Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       },
-
       prompts() {
         const prompts = [];
-
         if (!this.options['package-name']) {
           prompts.push({
             type: 'input',
@@ -70,7 +58,6 @@ module.exports = class LernaPackageGenerator extends _generator.default {
             }
           });
         }
-
         if (this.packageFolders.length > 1) {
           prompts.push({
             type: 'list',
@@ -79,7 +66,6 @@ module.exports = class LernaPackageGenerator extends _generator.default {
             choices: this.packageFolders
           });
         }
-
         if (!this.options.type) {
           prompts.push({
             type: 'list',
@@ -94,7 +80,6 @@ module.exports = class LernaPackageGenerator extends _generator.default {
             }]
           });
         }
-
         prompts.push({
           type: 'input',
           name: 'component-name',
@@ -106,24 +91,19 @@ module.exports = class LernaPackageGenerator extends _generator.default {
             return (0, _changeCase.pascal)(`${parts[parts.length - 1]}-component`);
           }
         });
-
         if (!prompts.length) {
           return null;
         }
-
         return this.prompt(prompts).then(answers => {
           if (answers['package-name']) {
             this.options['package-name'] = answers['package-name'];
           }
-
           if (answers.type) {
             this.options.type = answers.type;
           }
-
           if (answers['component-name']) {
             this.options['component-name'] = answers['component-name'];
           }
-
           if (answers['package-folder']) {
             this.options['package-folder'] = answers['package-folder'];
           } else {
@@ -131,10 +111,8 @@ module.exports = class LernaPackageGenerator extends _generator.default {
           }
         });
       }
-
     };
   }
-
   get writing() {
     return {
       gitignore() {
@@ -142,19 +120,16 @@ module.exports = class LernaPackageGenerator extends _generator.default {
         const destPath = this.packagePath('.gitignore');
         this.fs.copy(srcPath, destPath);
       },
-
       babelrc() {
         const srcPath = this.templatePath('babelrc');
         const destPath = this.packagePath('.babelrc');
         this.fs.copy(srcPath, destPath);
       },
-
       npmrc() {
         const srcPath = this.templatePath('npmrc');
         const destPath = this.packagePath('.npmrc');
         this.fs.copy(srcPath, destPath);
       },
-
       packageJSON() {
         const {
           type
@@ -162,7 +137,6 @@ module.exports = class LernaPackageGenerator extends _generator.default {
         const srcPath = this.templatePath('_package.json');
         const packageJSON = this.fs.readJSON(srcPath);
         packageJSON.name = this.options['package-name'];
-
         if (type === 'react') {
           packageJSON.dependencies['prop-types'] = '^15.6.0';
           packageJSON.dependencies['react-intl'] = '^2.4.0';
@@ -175,10 +149,8 @@ module.exports = class LernaPackageGenerator extends _generator.default {
             'react-dom': '>=15.0.0 || ^16.0.0'
           };
         }
-
         this.packageJson.merge(packageJSON);
       },
-
       webpackConfig() {
         const srcPath = this.templatePath('webpack.config.js');
         const destPath = this.packagePath('webpack.config.js');
@@ -187,18 +159,15 @@ module.exports = class LernaPackageGenerator extends _generator.default {
           libraryName: (0, _changeCase.pascal)(this.options['package-name'])
         });
       },
-
       readme() {
         const srcPath = this.templatePath('Readme.md');
         const destPath = this.packagePath('Readme.md');
         this.fs.copy(srcPath, destPath);
       },
-
       src() {
         const {
           type
         } = this.options;
-
         if (type === 'react') {
           const componentName = this.options['component-name'];
           this.fs.copyTpl(this.templatePath('src/react/Component.jsx'), this.packagePath(`src/${componentName}.jsx`), {
@@ -220,22 +189,17 @@ module.exports = class LernaPackageGenerator extends _generator.default {
           this.fs.copy(srcPath, destPath);
         }
       }
-
     };
   }
-
   get install() {
     return {
       bootstrap() {
         if (this.options['skip-install']) {
           return;
         }
-
         const done = this.async();
         this.spawnCommand('lerna', ['bootstrap', '--ignore-scripts']).on('close', done);
       }
-
     };
   }
-
 };