generator-folklore 3.0.3 → 3.0.6

package/lib/generators/{html → html-project}/index.js

@@ -1,16 +1,16 @@
 "use strict";
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
 var _lodash = _interopRequireDefault(require("lodash"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _chalk = _interopRequireDefault(require("chalk"));
-
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-module.exports = class HTMLGenerator extends _generator.default {
+module.exports = class HTMLProjectGenerator extends _generator.default {
   // The name `constructor` is important here
   constructor(...args) {
     super(...args);
@@ -18,21 +18,11 @@ module.exports = class HTMLGenerator extends _generator.default {
       type: String,
       required: false
     });
-    this.option('path', {
-      type: String,
-      desc: 'Path for the html project',
-      defaults: './'
-    });
     this.option('src-path', {
       type: String,
       desc: 'Path for source',
       defaults: './src'
     });
-    this.option('tmp-path', {
-      type: String,
-      desc: 'Path for temp files',
-      defaults: './.tmp'
-    });
     this.option('dest-path', {
       type: String,
       desc: 'Path for build',
@@ -43,26 +33,11 @@ module.exports = class HTMLGenerator extends _generator.default {
       desc: 'Path for the javascript',
       defaults: ''
     });
-    this.option('css-path', {
-      type: String,
-      desc: 'Path for the css',
-      defaults: 'css'
-    });
-    this.option('scss-path', {
+    this.option('styles-path', {
       type: String,
       desc: 'Path for the scss',
       defaults: 'styles'
     });
-    this.option('images-path', {
-      type: String,
-      desc: 'Path for the images',
-      defaults: 'img'
-    });
-    this.option('build-path', {
-      type: String,
-      desc: 'Path for the build tools',
-      defaults: 'build'
-    });
     this.option('server', {
       type: Boolean,
       defaults: false,
@@ -70,7 +45,12 @@ module.exports = class HTMLGenerator extends _generator.default {
     });
     this.option('server-path', {
       type: String,
-      desc: 'Path for the node.js server'
+      desc: 'Path for the node.js server',
+      defaults: ''
+    });
+    this.option('server-filename', {
+      type: String,
+      desc: 'Filename for the node.js server'
     });
 
     this.srcPath = filePath => this.destinationPath(_path.default.join(this.options['src-path'], filePath));
@@ -84,7 +64,7 @@ module.exports = class HTMLGenerator extends _generator.default {
         }
 
         console.log(_chalk.default.yellow('\n----------------------'));
-        console.log('HTML Generator');
+        console.log('HTML Project Generator');
         console.log(_chalk.default.yellow('----------------------\n'));
       },
 
@@ -110,64 +90,75 @@ module.exports = class HTMLGenerator extends _generator.default {
   }
 
   configuring() {
-    const projectName = _lodash.default.get(this.options, 'project-name');
-
-    const projectPath = this.destinationPath();
-
-    const srcPath = _lodash.default.get(this.options, 'src-path');
-
-    const destPath = _lodash.default.get(this.options, 'dest-path');
-
-    const buildPath = _lodash.default.get(this.options, 'build-path') || `${projectPath}/build`;
-
-    const jsPath = _lodash.default.get(this.options, 'js-path');
-
-    const jsSrcPath = _path.default.join(projectPath, srcPath, jsPath);
+    const {
+      'project-name': projectName,
+      'src-path': srcPath,
+      'dest-path': destPath,
+      'js-path': jsPath,
+      'styles-path': stylesPath,
+      'server-path': serverPath,
+      'server-filename': serverFilename
+    } = this.options;
 
-    const scssPath = _lodash.default.get(this.options, 'scss-path');
+    const jsSrcPath = _path.default.join(srcPath, jsPath);
 
-    const scssSrcPath = _path.default.join(projectPath, srcPath, scssPath);
+    const stylesSrcPath = _path.default.join(srcPath, stylesPath);
 
-    const skipInstall = _lodash.default.get(this.options, 'skip-install', false);
+    const serverSrcPath = _path.default.join(srcPath, serverPath);
 
-    this.composeWith('folklore:js', {
-      'project-name': projectName,
-      'hot-reload': true,
-      path: jsSrcPath,
-      'root-props-import': './data/root',
-      'skip-install': skipInstall,
+    this.composeWith('folklore:prettier', {
+      'skip-install': true,
+      quiet: true
+    });
+    this.composeWith('folklore:eslint', {
+      'skip-install': true,
+      quiet: true
+    });
+    this.composeWith('folklore:stylelint', {
+      'skip-install': true,
+      quiet: true
+    });
+    this.composeWith('folklore:browserslist', {
+      'skip-install': true,
       quiet: true
     });
     this.composeWith('folklore:editorconfig', {
       quiet: true
     });
+    this.composeWith('folklore:react-app', {
+      'project-name': projectName,
+      path: jsSrcPath,
+      stylesPath: stylesSrcPath,
+      'skip-install': true,
+      quiet: true
+    });
     this.composeWith('folklore:scss', {
       'project-name': projectName,
-      path: scssSrcPath,
+      path: stylesSrcPath,
       react: true,
-      'skip-install': skipInstall,
+      'skip-install': true,
       quiet: true
     });
 
     if (this.options.server) {
       this.composeWith('folklore:server', {
-        'project-name': projectName,
-        path: _lodash.default.get(this.options, 'server-path') || `${projectPath}/server`,
-        'skip-install': skipInstall,
+        path: serverSrcPath,
+        filename: serverFilename,
+        'skip-install': true,
         quiet: true
       });
     }
 
+    console.log(srcPath, jsSrcPath, _path.default.join(jsSrcPath, 'index.js'), _path.default.join(srcPath, 'index.html.ejs'));
     this.composeWith('folklore:build', {
-      path: buildPath,
       'src-path': srcPath,
-      'entry-path': _path.default.join(srcPath, 'index'),
+      'entry-path': _path.default.join(jsSrcPath, 'index.js'),
       'html-path': _path.default.join(srcPath, 'index.html.ejs'),
       'build-path': destPath,
       'empty-path': destPath,
       copy: true,
       'copy-path': _path.default.join(srcPath, '*.{html,ico,txt,png}'),
-      'skip-install': skipInstall,
+      'skip-install': true,
       quiet: true
     });
   }
@@ -196,18 +187,6 @@ module.exports = class HTMLGenerator extends _generator.default {
         this.fs.copy(srcPath, destPath);
       },
 
-      data() {
-        const srcPath = this.templatePath('root.js');
-        const destPath = this.srcPath('data/root.js');
-        this.fs.copy(srcPath, destPath);
-      },
-
-      utils() {
-        const srcPath = this.templatePath('utils.js');
-        const destPath = this.srcPath('lib/utils.js');
-        this.fs.copy(srcPath, destPath);
-      },
-
       gitignore() {
         const srcPath = this.templatePath('gitignore');
         const destPath = this.destinationPath('.gitignore');
@@ -217,4 +196,12 @@ module.exports = class HTMLGenerator extends _generator.default {
     };
   }
 
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
+  }
+
 };

package/lib/generators/{html → html-project}/templates/index.html.ejs

@@ -18,6 +18,9 @@
     <meta property="og:url" content="">
 </head>
 <body>
-    <div id="root"></div>
+    <script type="text/javascript">
+        var props = {};
+    </script>
+    <div id="app"></div>
 </body>
 </html>

package/lib/generators/intl/index.js

@@ -0,0 +1,93 @@
+"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 IntlGenerator extends _generator.default {
+  constructor(...args) {
+    super(...args);
+    this.option('translations-path', {
+      type: String,
+      desc: 'Path for to search for translations',
+      defaults: './src/**/*.{js,jsx}'
+    });
+    this.option('locales', {
+      type: String,
+      desc: 'Supported locales',
+      defaults: 'fr,en'
+    });
+    this.option('output-path', {
+      type: String,
+      desc: 'Path to output locale files',
+      defaults: './locale'
+    });
+    this.option('json-path', {
+      type: String,
+      desc: 'Path to copy json files'
+    });
+    this.option('without-id-only', {
+      type: String,
+      desc: 'Extract only messages without id',
+      defaults: false
+    });
+  }
+
+  get prompting() {
+    return {
+      welcome() {
+        if (this.options.quiet) {
+          return;
+        }
+
+        console.log(_chalk.default.yellow('\n----------------------'));
+        console.log('Intl Generator');
+        console.log(_chalk.default.yellow('----------------------\n'));
+      }
+
+    };
+  }
+
+  get writing() {
+    return {
+      packageJSON() {
+        const {
+          'translations-path': translationsPath = null,
+          'output-path': outputPath = null,
+          'json-path': jsonPath = null,
+          'without-id-only': withoutIdOnly = false,
+          locales
+        } = this.options;
+        const intlCommand = `flklr intl --po${withoutIdOnly ? ' --without-id-only' : ''} --output-path$ '${outputPath}' '${translationsPath}'`;
+        this.packageJson.merge({
+          scripts: jsonPath !== null ? {
+            intl: 'npm run intl:build && npm run intl:copy',
+            'intl:build': intlCommand,
+            'intl:copy': `cp ${_path.default.join(outputPath, '*.json')} ${jsonPath}`
+          } : {
+            intl: intlCommand
+          },
+          supportedLocales: locales.split(',')
+        });
+      },
+
+      dependencies() {
+        this.addDevDependencies(['@folklore/cli']);
+      }
+
+    };
+  }
+
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
+  }
+
+};

package/lib/generators/laravel/index.js

@@ -250,7 +250,7 @@ module.exports = class LaravelGenerator extends _generator.default {
       project_name: this.options['project-name']
     }).replace(/^(http)?(s)?(:\/\/)?/, 'http$2://');
 
-    this.composeWith('folklore:js', {
+    this.composeWith('folklore:react-app', {
       'project-name': this.options['project-name'],
       path: jsSrcPath,
       'styles-path': stylesSrcPath,
@@ -341,11 +341,11 @@ module.exports = class LaravelGenerator extends _generator.default {
       },
 
       packageJSON() {
-        const jsonPath = this.destinationPath('package.json');
         const packageJSON = this.fs.exists(jsonPath) ? this.fs.readJSON(jsonPath) : {};
-        packageJSON.scripts = {};
-        packageJSON.devDependencies = {};
-        this.fs.writeJSON(jsonPath, packageJSON);
+        this.packageJson.merge(_objectSpread(_objectSpread({}, packageJSON), {}, {
+          scripts: {},
+          devDependencies: {}
+        }));
       },
 
       composerJSON() {

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

@@ -0,0 +1,133 @@
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _glob = _interopRequireDefault(require("glob"));
+
+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 LaravelMediathequeGenerator extends _generator.default {
+  constructor(...args) {
+    super(...args);
+    this.argument('project-name', {
+      type: String,
+      required: false
+    });
+    this.argument('overrides', {
+      type: Boolean,
+      required: false,
+      default: false
+    });
+    this.argument('skip-publish', {
+      type: Boolean,
+      required: false,
+      default: false
+    });
+  }
+
+  get prompting() {
+    return {
+      welcome() {
+        if (this.options.quiet) {
+          return;
+        }
+
+        console.log(_chalk.default.yellow('\n----------------------'));
+        console.log('Laravel Mediatheque Generator');
+        console.log(_chalk.default.yellow('----------------------\n'));
+      },
+
+      prompts() {
+        const prompts = [];
+
+        if (!this.options['project-name']) {
+          prompts.push(_generator.default.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 {
+      composerJSON() {
+        this.composerJson.merge({
+          require: {
+            'folklore/laravel-folklore': 'v1.x-dev',
+            'folklore/laravel-mediatheque': 'v1.1.x-dev'
+          }
+        });
+      },
+
+      files() {
+        if (!this.options.overrides) {
+          return;
+        }
+
+        const folders = ['app'];
+        folders.forEach(folder => {
+          const templatePath = this.templatePath(folder);
+          const destinationPath = this.destinationPath(folder);
+
+          _glob.default.sync('**', {
+            dot: true,
+            nodir: true,
+            cwd: templatePath
+          }).forEach(file => {
+            const source = _path.default.join(templatePath, file);
+
+            const destination = _path.default.join(destinationPath, file);
+
+            if (file.match(/\.(jpg|jpeg|gif|png)$/i)) {
+              this.fs.copy(source, destination);
+            } else {
+              this.fs.copyTpl(source, destination, {
+                project_name: this.options['project-name']
+              });
+            }
+          });
+        });
+      }
+
+    };
+  }
+
+  get install() {
+    return {
+      composer() {
+        if (this.options['skip-install']) {
+          return;
+        }
+
+        const done = this.async();
+        this.spawnCommand('composer', ['install']).on('close', done);
+      },
+
+      async vendorPublish() {
+        if (this.options['skip-publish']) {
+          return;
+        }
+
+        await this.spawnCommand('php', ['artisan', 'vendor:publish', '--provider=Folklore\\Mediatheque\\ServiceProvider']);
+      }
+
+    };
+  }
+
+};

package/lib/generators/laravel-mediatheque/templates/app/Models/Media.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+use Folklore\Models\Media as BaseMedia;
+
+class Media extends BaseMedia
+{
+}

package/lib/generators/laravel-mediatheque/templates/app/Models/MediaFile.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models;
+
+use Folklore\Models\MediaFile as BaseMediaFile;
+
+class MediaFile extends BaseMediaFile
+{
+}

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

@@ -1,11 +1,11 @@
 "use strict";
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
 
 var _glob = _interopRequireDefault(require("glob"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _path = _interopRequireDefault(require("path"));
 
 var _generator = _interopRequireDefault(require("../../lib/generator"));
@@ -19,11 +19,6 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
       type: String,
       required: false
     });
-    this.option('install-npm', {
-      type: Boolean,
-      desc: 'Install NPM dependencies',
-      defaults: false
-    });
   }
 
   get prompting() {
@@ -62,24 +57,31 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
   get writing() {
     return {
       composerJSON() {
-        const srcPath = this.templatePath('_composer.json');
-        const destPath = this.destinationPath('composer.json');
-        const newJson = this.fs.readJSON(srcPath);
-        const currentJson = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
-        this.fs.writeJSON(destPath, _lodash.default.merge(currentJson, newJson));
+        this.composerJson.merge({
+          require: {
+            'folklore/laravel-panneau': 'v1.2.x-dev'
+          }
+        });
       },
 
       packageJSON() {
-        const srcPath = this.templatePath('_package.json');
-        const destPath = this.destinationPath('package.json');
-        const newJson = this.fs.readJSON(srcPath);
-        const currentJson = this.fs.exists(destPath) ? this.fs.readJSON(destPath) : {};
-        this.fs.writeJSON(destPath, _lodash.default.merge(currentJson, newJson));
+        this.addDependencies(['@panneau/app@^1.0.0-alpha.193', '@panneau/core@^1.0.0-alpha.193']);
+      },
+
+      routes() {
+        const source = this.templatePath('routes.php');
+        const destination = this.destinationPath('routes/panneau.php');
+
+        if (this.fs.exists(destination)) {
+          this.fs.delete(destination);
+        }
+
+        this.fs.copyTpl(source, destination, {});
       },
 
       layout() {
         const source = this.templatePath('layout.blade.php');
-        const destination = this.destinationPath('resources/views/vendor/panneau/index.blade.php');
+        const destination = this.destinationPath('resources/views/vendor/panneau/layout.blade.php');
 
         if (this.fs.exists(destination)) {
           this.fs.delete(destination);
@@ -88,8 +90,29 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
         this.fs.copyTpl(source, destination, {});
       },
 
+      app() {
+        const source = this.templatePath('app.blade.php');
+        const destination = this.destinationPath('resources/views/vendor/panneau/app.blade.php');
+
+        if (this.fs.exists(destination)) {
+          this.fs.delete(destination);
+        }
+
+        this.fs.copyTpl(source, destination, {});
+      },
+
+      indexJs() {
+        const source = this.templatePath('index.js');
+        const destination = this.destinationPath('resources/assets/js/index.js');
+        this.fs.copyTpl(source, destination, {});
+      },
+
+      npmDependencies() {
+        this.addDependencies(['@panneau/app@^1.0.0-alpha.193', '@panneau/core@^1.0.0-alpha.193', '@panneau/data@^1.0.0-alpha.193', '@panneau/field-text@^1.0.0-alpha.193', '@panneau/field-localized@^1.0.0-alpha.193']);
+      },
+
       files() {
-        const folders = ['app', 'resources'];
+        const folders = ['app', 'resources', 'lang'];
         folders.forEach(folder => {
           const templatePath = this.templatePath(folder);
           const destinationPath = this.destinationPath(folder);
@@ -119,30 +142,28 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
 
   get install() {
     return {
-      composer() {
+      async npm() {
         if (this.options['skip-install']) {
           return;
         }
 
-        const done = this.async();
-        this.spawnCommand('composer', ['install']).on('close', done);
+        await this.spawnCommand('npm', ['install']);
       },
 
-      vendorPublish() {
+      async composer() {
         if (this.options['skip-install']) {
           return;
         }
 
-        const done = this.async();
-        this.spawnCommand('php', ['artisan', 'vendor:publish', '--all']).on('close', done);
+        await this.spawnCommand('composer', ['install']);
       },
 
-      panneau() {
-        if (this.options['skip-install'] && !this.options['install-npm']) {
+      async vendorPublish() {
+        if (this.options['skip-install']) {
           return;
         }
 
-        this.addDependencies(['panneau@^0.6.53']);
+        await this.spawnCommand('php', ['artisan', 'vendor:publish', '--provider=Panneau\\ServiceProvider']);
       }
 
     };

package/lib/generators/laravel-panneau/templates/app/Contracts/Repositories/Pages.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Contracts\Repositories;
+
+use Folklore\Contracts\Repositories\Pages as BasePages;
+use App\Contracts\Resources\Page as PageResource;
+
+interface Pages extends BasePages
+{
+    public function findById(string $id): ?PageResource;
+
+    public function findByHandle(string $handle): ?PageResource;
+
+    public function findBySlug(string $slug, string $locale = null): ?PageResource;
+
+    public function create(array $data): PageResource;
+
+    public function update(string $id, array $data): ?PageResource;
+}

package/lib/generators/laravel-panneau/templates/app/Contracts/Resources/Blocks/Text.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Contracts\Resources\Blocks;
+
+use App\Contracts\Resources\Block as BaseBlock;
+
+interface Text extends BaseBlock
+{
+    public function body(string $locale): ?string;
+}