generator-folklore 3.0.7 → 3.0.9

package/Readme.md

@@ -1,12 +1,15 @@
 # Folklore Generator
+
 Yeoman generator to start projects at Folklore
 
 ## Install
+
 ```
 npm install -g generator-folklore
 ```
 
 ## Usage
+
 ```
 yo folklore
 ```
@@ -14,20 +17,23 @@ yo folklore
 ## Sub-Generators
 
 ```
-yo folklore:laravel
+yo folklore:laravel-project
 ```
-Laravel 5 project, JS, Sass, and miscellaneous Laravel boilerplate.
+
+Laravel boilerplate.
 
 --
 
 ```
-yo folklore:html
+yo folklore:html-project
 ```
+
 HTML static application
 
 --
 
 ```
-yo folklore:npm-package
+yo folklore:node-project
 ```
-NPM package
+
+Node package

package/lib/generators/app/index.js

@@ -53,6 +53,9 @@ module.exports = class AppGenerator extends _generator.default {
             choices: [{
               name: 'HTML',
               value: 'html-project'
+            }, {
+              name: 'Laravel',
+              value: 'laravel-project'
             }, {
               name: 'Node',
               value: 'node-project'

package/lib/generators/babel/index.js

@@ -56,7 +56,14 @@ module.exports = class BabelGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@babel/cli', '@babel/core', '@babel/node', '@babel/plugin-transform-runtime', '@babel/preset-env', '@babel/preset-react']);
+        this.addDevDependencies({
+          '@babel/core': '^7.19.3',
+          '@babel/cli': 'latest',
+          '@babel/node': 'latest',
+          '@babel/plugin-transform-runtime': 'latest',
+          '@babel/preset-env': 'latest',
+          '@babel/preset-react': 'latest'
+        });
       }
 
     };

package/lib/generators/build/index.js

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

package/lib/generators/cli/index.js

@@ -75,7 +75,10 @@ module.exports = class CliGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDependencies(['commander', 'debug']);
+        this.addDependencies({
+          'commander': 'latest',
+          'debug': 'latest'
+        });
       }
 
     };

package/lib/generators/docs/index.js

@@ -1,11 +1,11 @@
 "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 }; }
@@ -141,10 +141,15 @@ module.exports = class DocsGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['gitbook-cli@latest']);
+        this.addDevDependencies({
+          'gitbook-cli': 'latest'
+        });
 
         if (this.options.language === 'js') {
-          this.addDevDependencies(['jsdoc@latest', 'jsdoc-babel@latest']);
+          this.addDevDependencies({
+            jsdoc: 'latest',
+            'jsdoc-babel': 'latest'
+          });
         }
       }
 

package/lib/generators/eslint/index.js

@@ -32,7 +32,18 @@ module.exports = class EslintGenerator extends _generator.default {
       },
 
       dependencies() {
-        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']);
+        this.addDevDependencies({
+          'babel-preset-airbnb': 'latest',
+          '@babel/eslint-parser': 'latest',
+          eslint: '^8.0.0',
+          'eslint-config-airbnb': 'latest',
+          'eslint-config-prettier': 'latest',
+          'eslint-plugin-prettier': 'latest',
+          'eslint-plugin-import': 'latest',
+          'eslint-plugin-jsx-a11y': 'latest',
+          'eslint-plugin-react': 'latest',
+          'eslint-plugin-formatjs': 'latest'
+        });
       }
 
     };

package/lib/generators/intl/index.js

@@ -62,7 +62,7 @@ module.exports = class IntlGenerator extends _generator.default {
           'without-id-only': withoutIdOnly = false,
           locales
         } = this.options;
-        const intlCommand = `flklr intl --po${withoutIdOnly ? ' --without-id-only' : ''} --output-path$ '${outputPath}' '${translationsPath}'`;
+        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',
@@ -76,7 +76,9 @@ module.exports = class IntlGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@folklore/cli@^0.0.47']);
+        this.addDevDependencies({
+          '@folklore/cli': '^0.0.47'
+        });
       }
 
     };

package/lib/generators/laravel-auth/templates/routes/auth.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
+
 Route::groupWithLocales(function ($locale) {
     // Authentication Routes...
     Route::getLocalized('login', 'LoginController@showLoginForm')->nameWithLocale('auth.login');

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

@@ -69,7 +69,13 @@ module.exports = class LaravelPanneauGenerator extends _generator.default {
       },
 
       packageJSON() {
-        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']);
+        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() {

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

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

package/lib/generators/laravel-panneau/templates/app/Http/Middleware/Authenticate.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return string|null
+     */
+    protected function redirectTo($request)
+    {
+        if (!$request->expectsJson()) {
+            $routeWithLocale =
+                route_with_locale('login') .
+                '?' .
+                http_build_query([
+                    'next' => $request->fullUrl(),
+                ]);
+            return $request->isPanneau() ? route('panneau.auth.login') : $routeWithLocale;
+        }
+    }
+}

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

@@ -3,7 +3,7 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Contracts\Resources\HasBlocks;
+use Folklore\Contracts\Resources\HasBlocks;
 use Folklore\Http\Resources\LocalizedResource;
 use App\Contracts\Resources\Blocks\Text as TextBlock;
 

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

@@ -2,6 +2,8 @@
 
 namespace App\Http\Resources;
 
+use Folklore\Http\Resources\Collection;
+
 class BlocksCollection extends Collection
 {
     public $collects = BlockResource::class;

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

@@ -3,10 +3,10 @@
 namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use App\Http\Resources\Medias\ImageResource;
 use App\Contracts\Resources\Page;
-use App\Contracts\Resources\HasBlocks;
 use App\Contracts\Resources\Pages\Home as HomePage;
+use Folklore\Http\Resources\MediaResource;
+use Folklore\Contracts\Resources\HasBlocks;
 
 class PageResource extends JsonResource
 {
@@ -19,6 +19,8 @@ class PageResource extends JsonResource
     public function toArray($request)
     {
         $locale = $request->locale();
+        $image = $this->image();
+        $parent = $this->parent();
         return [
             'id' => $this->id(),
             'type' => $this->type(),
@@ -26,10 +28,10 @@ class PageResource extends JsonResource
             'title' => $this->title($locale),
             'description' => $this->description($locale),
             'slug' => $this->slug($locale),
-            'image' => !is_null($image) ? new ImageResource($image) : null,
+            'image' => !is_null($image) ? new MediaResource($image) : null,
             'parent' =>
                 !is_null($parent) && $parent instanceof Page
-                    ? new ParentPageResource($parent)
+                    ? new PageResource($parent)
                     : null,
 
             $this->mergeWhen($this->resource instanceof HasBlocks, function () {

package/lib/generators/laravel-panneau/templates/app/Models/Block.php

@@ -2,12 +2,22 @@
 
 namespace App\Models;
 
+use App\Contracts\Resources\Block as BlockContract;
+use App\Resources\Block as BlockResource;
 use Folklore\Models\Block as BaseBlock;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Block extends BaseBlock
 {
+    use HasFactory;
+
     protected $typeResources = [
         'text' => \App\Resources\Blocks\TextBlock::class,
         'image' => \App\Resources\Blocks\ImageBlock::class,
     ];
+
+    public function toResource(): BlockContract
+    {
+        return $this->toTypedResource() ?? new BlockResource($this);
+    }
 }

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

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Folklore\Models\Media as BaseMedia;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class Media extends BaseMedia
+{
+    use HasFactory;
+}

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

@@ -2,11 +2,21 @@
 
 namespace App\Models;
 
+use App\Contracts\Resources\Page as PageContract;
+use App\Resources\Page as PageResource;
 use Folklore\Models\Page as BasePage;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Page extends BasePage
 {
-    protected $typeResources = [
-        'text' => \App\Resources\Pages\HomePage::class,
+    use HasFactory;
+
+    protected $typedResources = [
+        'home' => \App\Resources\Pages\HomePage::class,
     ];
+
+    public function toResource(): PageContract
+    {
+        return $this->toTypedResource() ?? new PageResource($this);
+    }
 }

package/lib/generators/laravel-panneau/templates/app/Panneau/PanneauServiceProvider.php

@@ -10,6 +10,11 @@ use Panneau\Support\LocalizedField;
 use Folklore\Panneau\Fields\PageSlug as PageSlugField;
 use Panneau\Support\Facade as Panneau;
 
+use Illuminate\Http\Request;
+use Laravel\Fortify\Fortify;
+use Illuminate\Support\Facades\Hash;
+use App\Models\User;
+
 class PanneauServiceProvider extends BaseServiceProvider
 {
     /**
@@ -31,6 +36,7 @@ class PanneauServiceProvider extends BaseServiceProvider
     {
         $this->bootFields();
         $this->bootViews();
+        $this->bootAuth();
     }
 
     protected function bootFields()
@@ -71,4 +77,14 @@ class PanneauServiceProvider extends BaseServiceProvider
             $view->composer('errors::*', \App\Panneau\Composers\AppComposer::class);
         });
     }
+
+    protected function bootAuth()
+    {
+        Fortify::authenticateUsing(function (Request $request) {
+            $user = User::where('email', $request->email)->first();
+            if (!is_null($user) && Hash::check($request->password, $user->password)) {
+                return $user;
+            }
+        });
+    }
 }

package/lib/generators/laravel-panneau/templates/app/Panneau/Resources/Users.php

@@ -51,7 +51,8 @@ class Users extends Resource
                     ],
                 ])
                 ->withoutReset()
-                ->withDefaultValue('guest'),
+                ->withDefaultValue('admin')
+                ->isRequired(),
         ];
     }
 }

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

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Resources;
+
+use Folklore\Resources\Block as BaseBlock;
+
+class Block extends BaseBlock
+{
+
+}

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

@@ -2,7 +2,7 @@
 
 namespace App\Resources\Blocks;
 
-use Folklore\Resources\Block;
+use App\Resources\Block;
 use App\Contracts\Resources\Blocks\Text as TextBlockContract;
 use Folklore\Contracts\Resources\Image as ImageContract;
 use Folklore\Resources\Image;

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

@@ -2,7 +2,7 @@
 
 namespace App\Resources\Blocks;
 
-use Folklore\Resources\Block;
+use App\Resources\Block;
 use App\Contracts\Resources\Blocks\Text as TextBlockContract;
 
 class TextBlock extends Block implements TextBlockContract

package/lib/generators/laravel-panneau/templates/routes.php

@@ -10,7 +10,9 @@ Panneau::router()->group(function () {
         return app('tus-server')->serve();
     })->where('any', '.*');
 
-    Panneau::router()->auth();
+    Route::middleware(['web'])->group(function () {
+        Panneau::router()->auth();
+    });
 
     Route::namespace('\App\Panneau\Http\Controllers')
         ->middleware(['web', 'auth', 'can:view,' . \Panneau\Panneau::class])

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

@@ -297,7 +297,7 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     if (this.options.panneau) {
       this.composeWith('folklore:laravel-panneau', {
         'project-name': this.options['project-name'],
-        'skip-install': skipInstall,
+        'skip-install': true,
         quiet: true
       });
     } // if (this.options.auth) {
@@ -305,7 +305,7 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
     //         'project-name': this.options['project-name'],
     //         'js-path': jsSrcPath,
     //         'styles-path': stylesSrcPath,
-    //         'skip-install': skipInstall,
+    //         'skip-install': true,
     //         'install-npm': true,
     //         quiet: true,
     //     });
@@ -373,7 +373,7 @@ module.exports = class LaravelProjectGenerator extends _generator.default {
           },
           extra: {
             laravel: {
-              'dont-discover': ['laravel/telescope']
+              'dont-discover': ['laravel/telescope', 'folklore/laravel-folklore']
             }
           }
         });

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/CreateNewUser.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use App\Contracts\Repositories\Users;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Laravel\Fortify\Contracts\CreatesNewUsers;
+
+class CreateNewUser implements CreatesNewUsers
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and create a newly registered user.
+     *
+     * @param  array  $input
+     * @return \App\Models\User
+     */
+    public function create(array $input)
+    {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique(User::class),
+            ],
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        return resolve(Users::class)->create([
+            'name' => $input['name'],
+            'email' => $input['email'],
+            'password' => Hash::make($input['password']),
+        ]);
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/ResetUserPassword.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\ResetsUserPasswords;
+use App\Contracts\Repositories\Users;
+
+class ResetUserPassword implements ResetsUserPasswords
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and reset the user's forgotten password.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    public function reset($user, array $input)
+    {
+        Validator::make($input, [
+            'password' => $this->passwordRules(),
+        ])->validate();
+
+        resolve(Users::class)->update($user->id(), [
+            'password' => Hash::make($input['password']),
+        ]);
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/UpdateUserPassword.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Laravel\Fortify\Contracts\UpdatesUserPasswords;
+use App\Contracts\Repositories\Users;
+
+class UpdateUserPassword implements UpdatesUserPasswords
+{
+    use PasswordValidationRules;
+
+    /**
+     * Validate and update the user's password.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    public function update($user, array $input)
+    {
+        Validator::make($input, [
+            'current_password' => ['required', 'string', 'current_password:web'],
+            'password' => $this->passwordRules(),
+        ], [
+            'current_password.current_password' => __('The provided password does not match your current password.'),
+        ])->validateWithBag('updatePassword');
+
+        resolve(Users::class)->update($user->id(), [
+            'password' => Hash::make($input['password']),
+        ]);
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
+use App\Contracts\Repositories\Users;
+
+class UpdateUserProfileInformation implements UpdatesUserProfileInformation
+{
+    /**
+     * Validate and update the given user's profile information.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    public function update($user, array $input)
+    {
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                Rule::unique('users')->ignore($user->id()),
+            ],
+        ])->validateWithBag('updateProfileInformation');
+
+        if ($input['email'] !== $user->email() && $user instanceof MustVerifyEmail) {
+            $this->updateVerifiedUser($user, $input);
+        } else {
+            resolve(Users::class)->update($user->id(), [
+                'name' => $input['name'],
+                'email' => $input['email'],
+            ]);
+        }
+    }
+
+    /**
+     * Update the given verified user's profile information.
+     *
+     * @param  mixed  $user
+     * @param  array  $input
+     * @return void
+     */
+    protected function updateVerifiedUser($user, array $input)
+    {
+        $user = resolve(Users::class)->update($user->id(), [
+            'name' => $input['name'],
+            'email' => $input['email'],
+            'email_verified_at' => null,
+        ]);
+
+        $user->sendEmailVerificationNotification();
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Providers/TelescopeServiceProvider.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Gate;
+use Laravel\Telescope\IncomingEntry;
+use Laravel\Telescope\Telescope;
+use Laravel\Telescope\TelescopeApplicationServiceProvider;
+
+class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        // Telescope::night();
+
+        $this->hideSensitiveRequestDetails();
+
+        Telescope::filter(function (IncomingEntry $entry) {
+            if ($this->app->environment('local')) {
+                return true;
+            }
+
+            return $entry->isReportableException() ||
+                $entry->isFailedRequest() ||
+                $entry->isFailedJob() ||
+                $entry->isScheduledTask() ||
+                $entry->hasMonitoredTag();
+        });
+    }
+
+    /**
+     * Prevent sensitive request details from being logged by Telescope.
+     *
+     * @return void
+     */
+    protected function hideSensitiveRequestDetails()
+    {
+        if ($this->app->environment('local')) {
+            return;
+        }
+
+        Telescope::hideRequestParameters(['_token']);
+
+        Telescope::hideRequestHeaders(['cookie', 'x-csrf-token', 'x-xsrf-token']);
+    }
+
+    /**
+     * Register the Telescope gate.
+     *
+     * This gate determines who can access Telescope in non-local environments.
+     *
+     * @return void
+     */
+    protected function gate()
+    {
+        Gate::define('viewTelescope', function ($user) {
+            return in_array($user->email, [
+                //
+            ]);
+        });
+    }
+}

package/lib/generators/laravel-project/templates/laravel/config/app.php

@@ -185,6 +185,7 @@ return [
         /*
          * Package Service Providers...
          */
+        Folklore\ServiceProvider::class,
 
         /*
          * Application Service Providers...

package/lib/generators/laravel-project/templates/laravel/routes/web.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\HomeController;
 
 //Redirect to current langage home
@@ -8,5 +9,7 @@ Route::get('/', [HomeController::class, 'redirect'])->name('home');
 Route::groupWithLocales(function () {
     Route::getTrans('/', [HomeController::class, 'index'])->nameWithLocale('home');
     Route::getTrans('/test', [HomeController::class, 'index'])->nameWithLocale('test');
-    Route::getTrans('/test/{with_param}', [HomeController::class, 'index'])->nameWithLocale('test_with_param');
+    Route::getTrans('/test/{with_param}', [HomeController::class, 'index'])->nameWithLocale(
+        'test_with_param'
+    );
 });

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

@@ -1,11 +1,11 @@
 "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 }; }
@@ -217,7 +217,12 @@ module.exports = class LernaRepositoryGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['lerna@latest', 'glob@latest', 'mkdirp@latest', '@babel/runtime@latest']);
+        this.addDevDependencies({
+          lerna: 'latest',
+          glob: 'latest',
+          mkdirp: 'latest',
+          '@babel/runtime': 'latest'
+        });
       },
 
       bootstrap() {

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

@@ -240,8 +240,12 @@ module.exports = class NpmPackageGenerator extends _generator.default {
           return;
         }
 
-        this.addDependencies(['@babel/runtime@latest']);
-        this.addDevDependencies(['jest@latest']);
+        this.addDependencies({
+          '@babel/runtime': 'latest'
+        });
+        this.addDevDependencies({
+          jest: 'latest'
+        });
       }
 
     };

package/lib/generators/prettier/index.js

@@ -31,7 +31,11 @@ module.exports = class PrettierGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['prettier@^2.0.0', '@prettier/plugin-php@^0.18.0', '@trivago/prettier-plugin-sort-imports@^3.0.0']);
+        this.addDevDependencies({
+          prettier: 'latest',
+          '@prettier/plugin-php': 'latest',
+          '@trivago/prettier-plugin-sort-imports': 'latest'
+        });
       }
 
     };

package/lib/generators/react-app/index.js

@@ -108,8 +108,28 @@ module.exports = class ReactAppGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDependencies(['react@^18.0.0', 'react-dom@^18.0.0', 'prop-types@^15.0.0', 'react-intl@^6.0.0', 'react-router@^6.0.0', 'react-router-dom@^6.0.0', 'react-helmet@^6.0.0', 'classnames@^2.0.0', '@folklore/routes@^0.1.0', '@folklore/fonts@^0.0.1', '@folklore/forms@^0.0.1', '@folklore/fetch@^0.1.0', '@folklore/hooks@^0.0.1', '@folklore/tracking@^0.0.1', // Polyfills
-        'intl@^1.0.0', '@formatjs/intl-locale@^3.0.0', '@formatjs/intl-pluralrules@^5.0.0', 'intersection-observer@^0.12.0', 'resize-observer-polyfill@1.0.0']);
+        this.addDependencies({
+          react: '^18.0.0',
+          'react-dom': '^18.0.0',
+          'prop-types': '^15.0.0',
+          'react-intl': '^6.0.0',
+          'react-router': '^6.0.0',
+          'react-router-dom': '^6.0.0',
+          'react-helmet': '^6.0.0',
+          classnames: 'latest',
+          '@folklore/routes': '^0.1.1',
+          '@folklore/fonts': '^0.0.11',
+          '@folklore/forms': '^0.0.19',
+          '@folklore/fetch': '^0.1.15',
+          '@folklore/hooks': '^0.0.27',
+          '@folklore/tracking': '^0.0.14',
+          // Polyfills
+          intl: 'latest',
+          '@formatjs/intl-locale': 'latest',
+          '@formatjs/intl-pluralrules': 'latest',
+          'intersection-observer': 'latest',
+          'resize-observer-polyfill': 'latest'
+        });
       }
 
     };

package/lib/generators/react-app/templates/src/components/Container.jsx

@@ -8,21 +8,23 @@ import { BrowserRouter } from 'react-router-dom';
 import App from './App';
 
 const propTypes = {
-    locale: PropTypes.string,
-    messages: PropTypes.oneOfType([
-        PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
-        PropTypes.objectOf(PropTypes.string),
-    ]),
+    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 = {
-    locale: 'fr',
-    messages: {},
+    intl: null,
     routes: {},
 };
 
-function Container({ locale, messages, routes }) {
+function Container({ intl, routes }) {
+    const { locale = null, messages = null } = intl || {};
     return (
         <IntlProvider locale={locale} messages={messages[locale] || messages}>
             <BrowserRouter>

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

@@ -1,13 +1,13 @@
 "use strict";
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
-var _path = _interopRequireDefault(require("path"));
-
 var _chalk = _interopRequireDefault(require("chalk"));
 
 var _changeCase = require("change-case");
 
+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 }; }
@@ -192,7 +192,16 @@ module.exports = class ReactPackageGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['domready@latest', 'jquery@latest', 'enzyme@latest', 'react-test-renderer@latest', '@storybook/react@latest', '@storybook/addon-actions@latest', 'extract-text-webpack-plugin@latest', 'html-webpack-plugin@latest']);
+        this.addDevDependencies({
+          domready: 'latest',
+          jquery: 'latest',
+          enzyme: 'latest',
+          'react-test-renderer': 'latest',
+          '@storybook/react': 'latest',
+          '@storybook/addon-actions': 'latest',
+          'extract-text-webpack-plugin': 'latest',
+          'html-webpack-plugin': 'latest'
+        });
       }
 
     };

package/lib/generators/rollup/index.js

@@ -37,7 +37,14 @@ module.exports = class RollupGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['@rollup/plugin-babel', '@rollup/plugin-commonjs', '@rollup/plugin-json', '@rollup/plugin-node-resolve', '@rollup/plugin-replace', 'rollup']);
+        this.addDevDependencies({
+          '@rollup/plugin-babel': 'latest',
+          '@rollup/plugin-commonjs': 'latest',
+          '@rollup/plugin-json': 'latest',
+          '@rollup/plugin-node-resolve': 'latest',
+          '@rollup/plugin-replace': 'latest',
+          rollup: '^2.79.1'
+        });
       }
 
     };

package/lib/generators/server/index.js

@@ -60,10 +60,17 @@ module.exports = class ServerGenerator extends _generator.default {
         const {
           'socket-io': socketIo
         } = this.options;
-        this.addDependencies(['commander', 'debug', 'ejs', 'express']);
+        this.addDependencies({
+          commander: 'latest',
+          debug: 'latest',
+          ejs: 'latest',
+          express: 'latest'
+        });
 
         if (socketIo) {
-          this.addDependencies(['socket.io']);
+          this.addDependencies({
+            'socket.io': 'latest'
+          });
         }
       }
 

package/lib/generators/storybook/index.js

@@ -79,7 +79,15 @@ module.exports = class StorybookGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['@storybook/addon-actions@latest', '@storybook/addon-info@latest', '@storybook/addon-storyshots@latest', '@storybook/addons@latest', '@storybook/react@latest', '@storybook/storybook-deployer@latest', 'glob-loader@latest']);
+        this.addDevDependencies({
+          '@storybook/addon-actions': 'latest',
+          '@storybook/addon-info': 'latest',
+          '@storybook/addon-storyshots': 'latest',
+          '@storybook/addons': 'latest',
+          '@storybook/react': 'latest',
+          '@storybook/storybook-deployer': 'latest',
+          'glob-loader': 'latest'
+        });
       }
 
     };

package/lib/generators/stylelint/index.js

@@ -12,7 +12,7 @@ module.exports = class StylelintGenerator extends _generator.default {
     this.option('camel-case', {
       type: Boolean,
       required: false,
-      defaults: false
+      defaults: true
     });
   }
 
@@ -37,7 +37,12 @@ module.exports = class StylelintGenerator extends _generator.default {
       },
 
       dependencies() {
-        this.addDevDependencies(['stylelint@^14.0.0', 'stylelint-config-standard-scss@^5.0.0', 'stylelint-config-idiomatic-order@^8.0.0', 'stylelint-config-prettier@^9.0.0']);
+        this.addDevDependencies({
+          stylelint: '^14.0.0',
+          'stylelint-config-standard-scss': 'latest',
+          'stylelint-config-idiomatic-order': 'latest',
+          'stylelint-config-prettier': 'latest'
+        });
       }
 
     };

package/lib/generators/test/index.js

@@ -67,7 +67,16 @@ module.exports = class TestGenerator extends _generator.default {
           return;
         }
 
-        this.addDevDependencies(['babel-jest@latest', 'enzyme@latest', 'enzyme-adapter-react-16@latest', 'eslint-plugin-jest@latest', 'jest@latest', 'jsdom@latest', 'react-test-renderer@latest', 'sinon@latest']);
+        this.addDevDependencies({
+          'babel-jest': 'latest',
+          enzyme: 'latest',
+          'enzyme-adapter-react-16': 'latest',
+          'eslint-plugin-jest': 'latest',
+          jest: 'latest',
+          jsdom: 'latest',
+          'react-test-renderer': 'latest',
+          sinon: 'latest'
+        });
       }
 
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.7",
+    "version": "3.0.9",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -37,8 +37,8 @@
         "is-utf8": "^0.2.1",
         "lodash": "^4.17.21",
         "password-generator": "^2.3.2",
-        "yeoman-generator": "^5.6.1",
+        "yeoman-generator": "^5.7.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "bc3878a65d256dd8742a6deea2699252d4a4dfb0"
+    "gitHead": "88e0fd31cded9ff974e5b50f4c76464ef26efb12"
 }