generator-folklore 2.2.55 → 3.0.0

package/lib/generators/stylelint/index.js

@@ -44,14 +44,12 @@ module.exports = class StylelintGenerator extends _generator.default {
     };
   }
 
-  install() {
+  async install() {
     if (this.options['skip-install']) {
       return;
     }
 
-    this.npmInstall(['stylelint', 'stylelint-config-property-sort-order-smacss', 'stylelint-config-recommended', 'stylelint-config-sass-guidelines', 'stylelint-scss'], {
-      'save-dev': true
-    });
+    await this.addDevDependencies(['stylelint', 'stylelint-config-standard-scss', 'stylelint-config-idiomatic-order', 'stylelint-config-prettier']);
   }
 
 };

package/lib/generators/stylelint/templates/stylelintrc

@@ -1,8 +1,12 @@
 {
-    "extends": ["stylelint-config-sass-guidelines", "stylelint-config-property-sort-order-smacss"],
+    "extends": [
+        "stylelint-config-standard-scss",
+        "stylelint-config-idiomatic-order",
+        "stylelint-config-prettier"
+    ],
     "rules": {
         "indentation": 4,
-        "order/properties-alphabetical-order": null,<% if (camelCase) {%>
+        "alpha-value-notation": "number",<% if (camelCase) {%>
         "selector-class-pattern": [
             "^[a-z][a-z0-9A-Z]+$",
             {

package/lib/generators/test/index.js

@@ -67,9 +67,7 @@ module.exports = class TestGenerator extends _generator.default {
           return;
         }
 
-        this.npmInstall(['babel-jest@latest', 'enzyme@latest', 'enzyme-adapter-react-16@latest', 'eslint-plugin-jest@latest', 'jest@latest', 'jsdom@latest', 'react-test-renderer@latest', 'sinon@latest'], {
-          'save-dev': true
-        });
+        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": "2.2.55",
+    "version": "3.0.0",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -29,15 +29,15 @@
     },
     "homepage": "https://github.com/folkloreinc/folklore-js/tree/master/packages/generator-folklore#readme",
     "dependencies": {
-        "chalk": "^2.1.0",
-        "change-case": "^3.0.1",
-        "glob": "^7.1.2",
-        "immutable": "^3.8.1",
+        "chalk": "^4.0.0",
+        "change-case": "^4.1.2",
+        "glob": "^7.2.0",
+        "immutable": "^4.0.0",
         "is-utf8": "^0.2.1",
-        "lodash": "^4.17.4",
-        "password-generator": "^2.0.2",
-        "yeoman-generator": "^2.0.3",
+        "lodash": "^4.17.21",
+        "password-generator": "^2.3.2",
+        "yeoman-generator": "^5.6.1",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "9f8a1f532529131d760cadf521b80fd3d9590209"
+    "gitHead": "4ee114645b7773667513e04f1b67e881d720add8"
 }

package/lib/generators/build/templates/config.js

@@ -1,78 +0,0 @@
-/* eslint-disable no-console, global-require */
-/* eslint-disable import/no-extraneous-dependencies, import/no-dynamic-require, import/order */
-module.exports = {
-    /**
-     * Webpack
-     */
-    webpack: {
-        filename: <% if (hasHtml) { %>() => 'js/main-[hash:8].js'<% } else { %>() => 'js/main.js'<% } %>,
-        chunkFilename: () => 'js/[name]-[hash:8].chunk.js',
-        publicPath: '/',
-
-        cssRegex: /\.global\.css$/,
-        cssModuleRegex: /\.css$/,
-        sassRegex: /\.global\.(scss|sass)$/,
-        sassModuleRegex: /\.(scss|sass)$/,
-
-        cssFilename: <% if (hasHtml) { %>() => 'css/[name]-[contenthash:8].css'<% } else { %>() => 'css/[name].css'<% } %>,
-        cssChunkFilename: () => 'css/[name]-[contenthash:8].chunk.css',
-        cssLocalIdent: '[name]-[local]',
-
-        imageFilename: () => 'img/[name]-[hash:8].[ext]',
-        imagePublicPath: '/',
-
-        mediaFilename: () => 'medias/[name]-[hash:8].[ext]',
-        mediaPublicPath: '/',
-
-        fontFilename: () => 'fonts/[name]-[hash:8].[ext]',
-    },
-<% if (hasServer) { %>
-    /**
-     * Webpack Dev Server
-     */
-    webpackDevServer: {
-<% if (hasServerProxy) {
-%>        browserHost: '<%= serverBrowserHost %>',
-        proxy: '<%= serverProxyHost %>',
-        https: false,<% } %>
-    },<% } %>
-
-    /**
-     * PostCSS
-     */
-    postcss: {
-        ident: 'postcss',
-        plugins: [
-            require('postcss-flexbugs-fixes'),
-            require('postcss-preset-env')({
-                autoprefixer: {
-                    flexbox: 'no-2009',
-                },
-                stage: 3,
-            }),
-        ],
-    },
-
-<% if (hasImagemin) {
-%>    /**
-     * Imagemin
-     */
-    imagemin: {
-        files: [<% (imageminFiles || []).forEach((file) => {
-%>            '<%= file %>',
-<% }) %>        ],
-        output: '<%= imageminOutputPath %>',
-
-        pngquant: {
-            quality: '65-80',
-        },
-
-        svgo: {
-            plugins: [
-                {
-                    removeViewBox: false,
-                },
-            ],
-        },
-    },<% } %>
-};

package/lib/generators/build/templates/env.js

@@ -1,90 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies, global-require */
-const fs = require('fs');
-const path = require('path');
-const paths = require('./paths');
-
-// Make sure that including paths.js after env.js will read .env variables.
-delete require.cache[require.resolve('./paths')];
-
-const { NODE_ENV } = process.env;
-if (!NODE_ENV) {
-    throw new Error('The NODE_ENV environment variable is required but was not specified.');
-}
-
-// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
-const dotenvFiles = [
-    `${paths.dotenv}.${NODE_ENV}.local`,
-    `${paths.dotenv}.${NODE_ENV}`,
-    // Don't include `.env.local` for `test` environment
-    // since normally you expect tests to produce the same
-    // results for everyone
-    NODE_ENV !== 'test' && `${paths.dotenv}.local`,
-    paths.dotenv,
-].filter(Boolean);
-
-// Load environment variables from .env* files. Suppress warnings using silent
-// if this file is missing. dotenv will never modify any environment variables
-// that have already been set.  Variable expansion is supported in .env files.
-// https://github.com/motdotla/dotenv
-// https://github.com/motdotla/dotenv-expand
-dotenvFiles.forEach((dotenvFile) => {
-    if (fs.existsSync(dotenvFile)) {
-        require('dotenv-expand')(
-            require('dotenv').config({
-                path: dotenvFile,
-            }),
-        );
-    }
-});
-
-// We support resolving modules according to `NODE_PATH`.
-// This lets you use absolute paths in imports inside large monorepos:
-// https://github.com/facebook/create-react-app/issues/253.
-// It works similar to `NODE_PATH` in Node itself:
-// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
-// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
-// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
-// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
-// We also resolve them to make sure all tools using them work consistently.
-const appDirectory = fs.realpathSync(process.cwd());
-process.env.NODE_PATH = (process.env.NODE_PATH || '')
-    .split(path.delimiter)
-    .filter(folder => folder && !path.isAbsolute(folder))
-    .map(folder => path.resolve(appDirectory, folder))
-    .join(path.delimiter);
-
-// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
-// injected into the application via DefinePlugin in Webpack configuration.
-const REACT_APP = /^REACT_APP_/i;
-
-function getClientEnvironment(publicUrl) {
-    const raw = Object.keys(process.env)
-        .filter(key => REACT_APP.test(key))
-        .reduce(
-            (env, key) => ({
-                ...env,
-                [key]: process.env[key],
-            }),
-            {
-                // Useful for determining whether we’re running in production mode.
-                // Most importantly, it switches React into the correct mode.
-                NODE_ENV: process.env.NODE_ENV || 'development',
-                // Useful for resolving the correct path to static assets in `public`.
-                // For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
-                // This should only be used as an escape hatch. Normally you would put
-                // images into the `src` and `import` them in code to get their paths.
-                PUBLIC_URL: publicUrl,
-            },
-        );
-    // Stringify all values so we can feed into Webpack DefinePlugin
-    const stringified = {
-        'process.env': Object.keys(raw).reduce((env, key) => ({
-            ...env,
-            [key]: JSON.stringify(raw[key]),
-        }), {}),
-    };
-
-    return { raw, stringified };
-}
-
-module.exports = getClientEnvironment;

package/lib/generators/build/templates/paths.js

@@ -1,92 +0,0 @@
-/* eslint-disable no-console, global-require */
-/* eslint-disable import/no-extraneous-dependencies, import/no-dynamic-require, import/order */
-const path = require('path');
-const fs = require('fs');
-const url = require('url');
-
-// Make sure any symlinks in the project folder are resolved:
-// https://github.com/facebook/create-react-app/issues/637
-const appDirectory = fs.realpathSync(process.cwd());
-const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
-
-const envPublicUrl = process.env.PUBLIC_URL;
-
-function ensureSlash(inputPath, needsSlash) {
-    const hasSlash = inputPath.endsWith('/');
-    if (hasSlash && !needsSlash) {
-        return inputPath.substr(0, inputPath.length - 1);
-    }
-    if (!hasSlash && needsSlash) {
-        return `${inputPath}/`;
-    }
-    return inputPath;
-}
-
-const getPublicUrl = appPackageJson => envPublicUrl || require(appPackageJson).homepage;
-
-// We use `PUBLIC_URL` environment variable or "homepage" field to infer
-// "public path" at which the app is served.
-// Webpack needs to know it to put the right <script> hrefs into HTML even in
-// single-page apps that may serve index.html for nested URLs like /todos/42.
-// We can't use a relative path in HTML because we don't want to load something
-// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
-function getServedPath(appPackageJson) {
-    const publicUrl = getPublicUrl(appPackageJson);
-    const servedUrl = envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
-    return ensureSlash(servedUrl, true);
-}
-
-const moduleFileExtensions = [
-    'web.mjs',
-    'mjs',
-    'web.js',
-    'js',
-    'web.ts',
-    'ts',
-    'web.tsx',
-    'tsx',
-    'json',
-    'web.jsx',
-    'jsx',
-];
-
-// Resolve file paths in the same order as webpack
-const resolveModule = (resolveFn, filePath) => {
-    if (fs.existsSync(resolveFn(filePath))) {
-        return resolveFn(filePath);
-    }
-    const extension = moduleFileExtensions.find(ext => fs.existsSync(resolveFn(`${filePath}.${ext}`)));
-
-    if (extension) {
-        return resolveFn(`${filePath}.${extension}`);
-    }
-
-    return resolveFn(`${filePath}.js`);
-};
-
-// config after eject: we're in ./config/
-module.exports = {
-    dotenv: resolveApp('.env'),
-    appPath: resolveApp('.'),
-    appBuild: resolveApp('<%= buildPath %>'),
-    appPublic: resolveApp('<%= publicPath %>'),
-    appIndexJs: resolveModule(resolveApp, '<%= entryPath %>'),<% if (htmlPath !== null) { %>
-    appHtml: resolveApp('<%= htmlPath %>'),<% } %>
-    appPackageJson: resolveApp('package.json'),
-    appNodeModules: resolveApp('node_modules'),
-    appSrc: resolveApp('<%= srcPath %>'),
-    testsSetup: resolveModule(resolveApp, 'tests/setupTests'),
-    publicUrl: getPublicUrl(resolveApp('package.json')),
-    servedPath: getServedPath(resolveApp('package.json')),
-    copyPaths: [<% (copyPaths || []).forEach((dir) => { %>
-        resolveApp('<%= dir %>'),<% }) %>
-    ],
-    emptyPaths: [<% (emptyPaths || []).forEach((dir) => {%>
-        resolveApp('<%= dir %>'),<% }) %>
-    ],
-    watchPaths: [<% (watchPaths || []).forEach((dir) => { %>
-        resolveApp('<%= dir %>'),<% }) %>
-    ],
-};
-
-module.exports.moduleFileExtensions = moduleFileExtensions;

package/lib/generators/build/templates/polyfills.js

@@ -1,25 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies, global-require */
-if (typeof Promise === 'undefined') {
-    // Rejection tracking prevents a common issue where React gets into an
-    // inconsistent state due to an error, but it gets swallowed by a Promise,
-    // and the user has no idea what causes React's erratic future behavior.
-    require('promise/lib/rejection-tracking').enable();
-    window.Promise = require('promise/lib/es6-extensions.js');
-}
-
-// fetch() polyfill for making API calls.
-require('whatwg-fetch');
-
-require('core-js/es6/map');
-require('core-js/es6/set');
-require('raf/polyfill');
-
-// Object.assign() is commonly used with React.
-// It will use the native implementation if it's present and isn't buggy.
-Object.assign = require('object-assign');
-
-// In tests, polyfill requestAnimationFrame since jsdom doesn't provide it yet.
-// We don't polyfill it in the browser--this is user's responsibility.
-if (process.env.NODE_ENV === 'test') {
-    require('raf').polyfill(global);
-}

package/lib/generators/build/templates/postcss.config.js

@@ -1,12 +0,0 @@
-const config = require('./config');
-
-module.exports = ({ options }) =>
-    Object.assign(
-        {},
-        config.postcss,
-        (
-            typeof options.env !== 'undefined' &&
-            typeof config.postcss.env !== 'undefined' &&
-            typeof config.postcss.env[options.env] !== 'undefined'
-        ) ? config.postcss.env[options.env] : null,
-    );

package/lib/generators/build/templates/scripts/build.js

@@ -1,158 +0,0 @@
-/* eslint-disable no-console, global-require */
-/* eslint-disable import/no-extraneous-dependencies, import/no-dynamic-require, import/order */
-const program = require('commander');
-
-program
-    .version('0.1.0')
-    .option(
-        '-c, --config [value]',
-        'Webpack configuration',
-        (val, configs) => (configs === null ? [val] : [...configs, val]),
-        null,
-    )
-    .parse(process.argv);
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'production';
-process.env.NODE_ENV = 'production';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', (err) => {
-    throw err;
-});
-
-// Ensure environment variables are read.
-require('../env');
-
-const path = require('path');
-const chalk = require('chalk');
-const glob = require('glob');
-const fs = require('fs-extra');
-const webpack = require('webpack');
-const defaultWebpackConfig = require('../webpack.config.prod');
-const paths = require('../paths');
-const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
-const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
-const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
-const printBuildError = require('react-dev-utils/printBuildError');
-
-const { measureFileSizesBeforeBuild, printFileSizesAfterBuild } = FileSizeReporter;
-const useYarn = fs.existsSync(paths.yarnLockFile);
-
-// These sizes are pretty large. We'll warn for bundles exceeding them.
-const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-
-const webpackConfigs = program.config !== null
-    ? program.config.map(configPath => require(path.join(process.env.PWD, configPath)))
-    : [defaultWebpackConfig];
-
-// Warn and crash if required files are missing
-const entries = webpackConfigs.reduce(
-    (allEntries, webpackConfig) => [...allEntries, ...webpackConfig.entry],
-    [],
-);
-if (!checkRequiredFiles(entries)) {
-    process.exit(1);
-}
-
-// Create the production build and print the deployment instructions.
-function build(webpackConfig, previousFileSizes) {
-    console.log('Creating an optimized production build...');
-    const compiler = webpack(webpackConfig);
-    return new Promise((resolve, reject) => {
-        compiler.run((err, stats) => {
-            if (err) {
-                return reject(err);
-            }
-            const messages = formatWebpackMessages(stats.toJson({}, true));
-            if (messages.errors.length) {
-                // Only keep the first error. Others are often indicative
-                // of the same problem, but confuse the reader with noise.
-                if (messages.errors.length > 1) {
-                    messages.errors.length = 1;
-                }
-                return reject(new Error(messages.errors.join('\n\n')));
-            }
-            if (
-                process.env.CI &&
-                (typeof process.env.CI !== 'string' || process.env.CI.toLowerCase() !== 'false') &&
-                messages.warnings.length
-            ) {
-                console.log(chalk.yellow('\nTreating warnings as errors because process.env.CI = true.\n' +
-                            'Most CI servers set it automatically.\n'));
-                return reject(new Error(messages.warnings.join('\n\n')));
-            }
-            return resolve({
-                webpackConfig,
-                buildPath: webpackConfig.output.path,
-                stats,
-                previousFileSizes,
-                warnings: messages.warnings,
-            });
-        });
-    });
-}
-
-// First, read the current file sizes in build directory.
-// This lets us display how much they changed later.
-Promise.all(webpackConfigs.map(conf => measureFileSizesBeforeBuild(conf.output.path)))
-    .then((previousSizes) => {
-        // Merge with the public folder
-        paths.emptyPaths.forEach((dir) => {
-            glob.sync(dir).forEach((file) => {
-                fs.removeSync(file);
-            });
-        });
-
-        // prettier-ignore
-        return webpackConfigs.reduce(
-            (lastPromise, webpackConfig, index) => lastPromise.then(responses => (
-                build(webpackConfig, previousSizes[index]).then(response => [
-                    ...responses,
-                    response,
-                ])
-            )),
-            Promise.resolve([]),
-        );
-    })
-    .then(
-        (builds) => {
-            builds.forEach(({
-                webpackConfig, stats, buildPath, previousFileSizes, warnings,
-            }) => {
-                if (warnings.length) {
-                    console.log(chalk.yellow('Compiled with warnings.\n'));
-                    console.log(warnings.join('\n\n'));
-                    console.log(`\nSearch for the ${chalk.underline(chalk.yellow('keywords'))} to learn more about each warning.`);
-                    console.log(`To ignore, add ${chalk.cyan('// eslint-disable-next-line')} to the line before.\n`);
-                } else {
-                    console.log(chalk.green('Compiled successfully.\n'));
-                }
-
-                console.log('File sizes after gzip:\n');
-                console.log(buildPath);
-                printFileSizesAfterBuild(
-                    stats,
-                    previousFileSizes,
-                    buildPath,
-                    WARN_AFTER_BUNDLE_GZIP_SIZE,
-                    WARN_AFTER_CHUNK_GZIP_SIZE,
-                );
-
-                const appPackage = require(paths.appPackageJson);
-                const { publicUrl } = paths;
-                const { publicPath } = webpackConfig.output;
-                const buildFolder = path.relative(process.cwd(), buildPath);
-                printHostingInstructions(appPackage, publicUrl, publicPath, buildFolder, useYarn);
-            });
-        },
-        (err) => {
-            console.log(chalk.red('Failed to compile.\n'));
-            printBuildError(err);
-            process.exit(1);
-        },
-    );

package/lib/generators/build/templates/scripts/imagemin.js

@@ -1,59 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable import/no-extraneous-dependencies */
-const imagemin = require('imagemin');
-const imageminMozjpeg = require('imagemin-mozjpeg');
-const imageminPngquant = require('imagemin-pngquant');
-const imageminSvgo = require('imagemin-svgo');
-const glob = require('glob');
-const path = require('path');
-const fs = require('fs');
-const chalk = require('chalk');
-const prettyBytes = require('pretty-bytes');
-const imageminConfig = require('./config').imagemin;
-
-function minifyImage(srcPath, output) {
-    const stats = fs.statSync(srcPath);
-    const originalSize = stats.size;
-
-    imagemin([srcPath], output, {
-        plugins: [
-            imageminMozjpeg(),
-            imageminPngquant(imageminConfig.pngquant),
-            imageminSvgo(imageminConfig.svgo),
-        ],
-    }).then((files) => {
-        let saved;
-        let optimizedSize;
-        let percent;
-        let savedMsg;
-        let msg;
-        const fl = files.length;
-        for (let i = 0; i < fl; i += 1) {
-            optimizedSize = files[i].data.length;
-            saved = originalSize - optimizedSize;
-            percent = originalSize > 0 ? (saved / originalSize) * 100 : 0;
-            savedMsg = `saved ${prettyBytes(saved)} - ${percent.toFixed(1).replace(/\.0$/, '')}%`;
-            msg = saved > 0 ? savedMsg : 'already optimized';
-            // eslint-disable-next-line no-console
-            console.log(`${chalk.green('✔')} ${srcPath} ${chalk.yellow('>')} ${files[i].path} - ${msg}`);
-        }
-    });
-}
-
-const processFile = fileGlob => (
-    (er, files) => {
-        const basePath = fileGlob.substr(0, fileGlob.indexOf('*'));
-        let srcPath;
-        let relativePath;
-        const fl = files.length;
-        for (let i = 0; i < fl; i += 1) {
-            srcPath = files[i];
-            relativePath = srcPath.replace(basePath, '');
-            minifyImage(srcPath, path.join(imageminConfig.output, path.dirname(relativePath)));
-        }
-    }
-);
-
-for (let i = 0, fl = imageminConfig.files.length; i < fl; i += 1) {
-    glob(imageminConfig.files[i], {}, processFile(imageminConfig.files[i]));
-}

package/lib/generators/build/templates/scripts/modernizr.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-/* eslint-disable import/no-extraneous-dependencies */
-const program = require('commander');
-const modernizr = require('customizr');
-const config = require('./config').modernizr || {};
-
-program
-    .option('-d, --dist', 'Production build')
-    .parse(process.argv);
-
-let settings = {
-    ...config,
-};
-if (program.dist) {
-    settings.dest = '<%= outputPath %>';
-    settings.uglify = true;
-    settings.cache = false;
-}
-
-modernizr(settings, () => {
-
-});