generator-folklore 3.0.5 → 3.0.7

package/lib/generators/build/index.js

@@ -92,7 +92,7 @@ module.exports = class AppGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@folklore/cli']);
+        this.addDevDependencies(['@folklore/cli@^0.0.47']);
       }
 
     };

package/lib/generators/eslint/index.js

@@ -32,7 +32,7 @@ module.exports = class EslintGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['babel-preset-airbnb', '@babel/eslint-parser', 'eslint', 'eslint-config-airbnb', 'eslint-config-prettier', 'eslint-plugin-prettier', 'eslint-plugin-import', 'eslint-plugin-jsx-a11y', 'eslint-plugin-react', 'eslint-plugin-formatjs']);
+        this.addDevDependencies(['babel-preset-airbnb@^5.0.0', '@babel/eslint-parser@^7.0.0', 'eslint@^8.0.0', 'eslint-config-airbnb@^19.0.0', 'eslint-config-prettier@^8.0.0', 'eslint-plugin-prettier@^4.0.0', 'eslint-plugin-import@^2.0.0', 'eslint-plugin-jsx-a11y@^6.0.0', 'eslint-plugin-react@^7.0.0', 'eslint-plugin-formatjs@^4.0.0']);
       }
 
     };

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@^0.0.47']);
+      }
+
+    };
+  }
+
+  async install() {
+    if (this.options['skip-install']) {
+      return;
+    }
+
+    await this.spawnCommand('npm', ['install']);
+  }
+
+};

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

@@ -0,0 +1,151 @@
+"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']);
+      }
+
+    };
+  }
+
+  end() {
+    if (this.options.quiet) {
+      return;
+    }
+
+    console.log('\n\n');
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log(_chalk.default.bold('Instructions'));
+    console.log(_chalk.default.yellow('----------------------\n\n'));
+    console.log(`1. Add to ${_chalk.default.bold.yellow('app/Providers/AppServiceProvider.php')}:`);
+    const serviceProvider = fs.readFileSync(_path.default.join(__dirname, './instructions/ServiceProvider.php'));
+    console.log('---');
+    console.log(highlight(serviceProvider.toString('utf-8'), {
+      language: 'php',
+      ignoreIllegals: true
+    }));
+  }
+
+};

package/lib/generators/laravel-mediatheque/instructions/ServiceProvider.php

@@ -0,0 +1,26 @@
+<?php
+
+class AppServiceProvider extends ServiceProvider
+{
+    //...
+    public function register()
+    {
+        // ...
+
+        $this->registerMediatheque();
+    }
+
+    protected function registerMediatheque()
+    {
+        $this->app->bind(
+            \Folklore\Mediatheque\Contracts\Models\Media::class,
+            \App\Models\Media::class
+        );
+
+        $this->app->bind(
+            \Folklore\Mediatheque\Contracts\Models\File::class,
+            \App\Models\MediaFile::class
+        );
+    }
+    //...
+}

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,15 @@
 "use strict";
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
 
+var _cliHighlight = require("cli-highlight");
+
+var _fs = _interopRequireDefault(require("fs"));
+
 var _glob = _interopRequireDefault(require("glob"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _path = _interopRequireDefault(require("path"));
 
 var _generator = _interopRequireDefault(require("../../lib/generator"));
@@ -19,11 +23,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 +61,42 @@ 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.3-alpha.1', '@panneau/core@^1.0.3-alpha.1', '@panneau/data@^1.0.3-alpha.1', '@panneau/field-text@^1.0.3-alpha.1', '@panneau/field-localized@^1.0.3-alpha.1']);
+      },
+
+      config() {
+        const source = this.templatePath('config.php');
+        const destination = this.destinationPath('config/panneau.php');
+
+        if (this.fs.exists(destination)) {
+          this.fs.delete(destination);
+        }
+
+        this.fs.copyTpl(source, destination, {});
+      },
+
+      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 +105,25 @@ 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, {});
+      },
+
       files() {
-        const folders = ['app', 'resources'];
+        const folders = ['app', 'resources', 'lang'];
         folders.forEach(folder => {
           const templatePath = this.templatePath(folder);
           const destinationPath = this.destinationPath(folder);
@@ -119,33 +153,60 @@ 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']);
       }
 
     };
   }
 
+  end() {
+    if (this.options.quiet) {
+      return;
+    }
+
+    console.log('\n\n');
+    console.log(_chalk.default.yellow('\n----------------------'));
+    console.log(_chalk.default.bold('Instructions'));
+    console.log(_chalk.default.yellow('----------------------\n\n'));
+    console.log(`1. Add to ${_chalk.default.bold.yellow('app/Providers/AppServiceProvider.php')}:`);
+
+    const serviceProvider = _fs.default.readFileSync(_path.default.join(__dirname, './instructions/ServiceProvider.php'));
+
+    console.log('---');
+    console.log((0, _cliHighlight.highlight)(serviceProvider.toString('utf-8'), {
+      language: 'php',
+      ignoreIllegals: true
+    }));
+    console.log(`\n2. Add to ${_chalk.default.bold.yellow('config/app.php')}:`);
+
+    const config = _fs.default.readFileSync(_path.default.join(__dirname, './instructions/config.php'));
+
+    console.log('---');
+    console.log((0, _cliHighlight.highlight)(config.toString('utf-8'), {
+      language: 'php',
+      ignoreIllegals: true
+    }));
+  }
+
 };

package/lib/generators/laravel-panneau/instructions/ServiceProvider.php

@@ -0,0 +1,21 @@
+<?php
+
+class AppServiceProvider extends ServiceProvider
+{
+    //...
+    protected function registerRepositories()
+    {
+        //...
+
+        $this->app->bind(
+            \Folklore\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );
+
+        $this->app->bind(
+            \App\Contracts\Repositories\Pages::class,
+            \App\Repositories\Pages::class
+        );
+    }
+    //...
+}

package/lib/generators/laravel-panneau/instructions/config.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    // ...
+
+    'providers' => [
+        // ...
+
+        App\Panneau\PanneauServiceProvider::class,
+    ],
+
+    // ...
+];

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($data): PageResource;
+
+    public function update(string $id, $data): ?PageResource;
+}

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

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Contracts\Resources\Blocks;
+
+use App\Contracts\Resources\Block as BaseBlock;
+use Folklore\Contracts\Resources\Image as ImageContract;
+
+interface Image extends BaseBlock
+{
+    public function image(): ?ImageContract;
+
+    public function caption(string $locale): ?string;
+
+    public function credits(string $locale): ?string;
+}

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

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

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

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Contracts\Resources;
+
+use Folklore\Contracts\Resources\Page as BasePage;
+
+interface Page extends BasePage
+{
+
+}

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

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Contracts\Resources\Pages;
+
+use App\Contracts\Resources\Page as BasePage;
+
+interface Home extends BasePage
+{
+}

package/lib/generators/laravel-panneau/templates/app/Http/Resources/BlockResource.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use App\Contracts\Resources\HasBlocks;
+use Folklore\Http\Resources\LocalizedResource;
+use App\Contracts\Resources\Blocks\Text as TextBlock;
+
+class BlockResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $type = $this->type();
+        $locale = $request->locale();
+        return [
+            'id' => $this->id(),
+            'type' => $type,
+            'blocks' => $this->when($this->resource instanceof HasBlocks, function () {
+                $blocks = $this->blocks();
+                return !is_null($blocks) ? new BlocksCollection($blocks) : [];
+            }),
+
+            $this->mergeWhen($this->resource instanceof TextBlock, function () use ($locale) {
+                return [
+                    'body' => $this->body($locale),
+                ];
+            }),
+        ];
+    }
+}

package/lib/generators/laravel-panneau/templates/app/Http/Resources/BlocksCollection.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Http\Resources;
+
+class BlocksCollection extends Collection
+{
+    public $collects = BlockResource::class;
+}