@w5s/mrm-preset 1.0.0-alpha.1 → 1.0.0-alpha.5

package/CHANGELOG.md

@@ -3,6 +3,67 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-alpha.5](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.4...@w5s/mrm-preset@1.0.0-alpha.5) (2022-02-18)
+
+
+### Bug Fixes
+
+* change bootstrap behavior ([497c83a](https://github.com/w5s/project-config/commit/497c83a4082f7fd4e3b8b6913802ebcb21caa65a))
+* remove lint-staged + cspell integration ([6747c83](https://github.com/w5s/project-config/commit/6747c83ec997034d25d136bc5aa008ed108ceb96))
+* use UNLICENSED for default license ([608ee8f](https://github.com/w5s/project-config/commit/608ee8f0bf57fec94636587b116d5bda0fb4ee3f))
+
+
+### Features
+
+* add gitignore for yarn v2 ([06c547a](https://github.com/w5s/project-config/commit/06c547a6b7813f935678c29b410aee62da5b3866))
+* add support for yarn berry ([2b77669](https://github.com/w5s/project-config/commit/2b77669a29316825a38470c80a48aff8ab068f7f))
+
+
+
+
+
+# [1.0.0-alpha.4](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.3...@w5s/mrm-preset@1.0.0-alpha.4) (2022-02-16)
+
+
+### Bug Fixes
+
+* correct eslint vscode settings ([a32e0fb](https://github.com/w5s/project-config/commit/a32e0fb739cbe349565b26ea412cdf37e3d56bdb))
+* correct mrm preset url ([ad6f030](https://github.com/w5s/project-config/commit/ad6f03091e0a294c043974b564e24c79023e659b))
+* correct typo ([2218859](https://github.com/w5s/project-config/commit/221885997fec37149f7e349b00a58fbcb3bfb8db))
+* rollback to eslint.validate vscode setting ([769a2e1](https://github.com/w5s/project-config/commit/769a2e100083aca4f5e9037fa539fcf1f6002d65))
+
+
+### Features
+
+* improve typescript eslint configuration ([efc6f1c](https://github.com/w5s/project-config/commit/efc6f1cef876e8fc5d4d1d1b94ca90a6805fbbbf))
+
+
+
+
+
+# [1.0.0-alpha.3](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.2...@w5s/mrm-preset@1.0.0-alpha.3) (2022-02-15)
+
+
+### Features
+
+* use airbnb-base as default presets ([e499fc1](https://github.com/w5s/project-config/commit/e499fc115023571e749072db33d774b443b68bb7))
+
+
+
+
+
+# [1.0.0-alpha.2](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.1...@w5s/mrm-preset@1.0.0-alpha.2) (2022-02-15)
+
+
+### Features
+
+* enable source.fixAll for vscode ([d484156](https://github.com/w5s/project-config/commit/d484156c063f2bf9f5cb3212878aa07bb4f8fd6f))
+* improve arrow-body-style configuration ([a4ee8a9](https://github.com/w5s/project-config/commit/a4ee8a9f3912285b45287afc4ccae2fa57431c6a))
+
+
+
+
+
 # 1.0.0-alpha.1 (2022-02-12)
 
 

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Julien Polo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/bootstrap/index.js

@@ -1,8 +1,11 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
 const path = require('path');
-const { packageJson, file } = require('mrm-core');
+const { packageJson, file, yaml } = require('mrm-core');
+// @ts-ignore
+const execCommand = require('mrm-core/src/util/execCommand');
 const npm = require('../core/npm');
 const pkg = require('../core/pkg');
+const { gitIgnoreTemplate } = require('../core/git');
 
 /**
  * @param {{
@@ -14,56 +17,63 @@ const pkg = require('../core/pkg');
  * @returns {void}
  */
 function task({ mrmPreset, mrmTask, packageArchetype, packageManager }) {
+  const isYarn = file('package-lock.json').exists()
+    ? false
+    : file('yarn.lock').exists()
+    ? true
+    : packageManager === 'yarn';
+  const isYarnBerry = false;
   /**
    * setup package.json from following object
    */
 
-  const packageFile = packageJson({
+  packageJson({
     name: path.basename(process.cwd()),
     version: '1.0.0-alpha.0',
     private: true,
-    license: 'PRIVATE',
+    license: 'UNLICENSED',
     description: '',
-  });
-
-  packageFile.merge({
-    scripts: {
-      configure: `npm run mrm -- ${mrmTask}`,
-      mrm: `mrm --preset ${mrmPreset}`,
-    },
-  });
-  pkg.value(packageFile, {
-    path: 'packageManager',
+  }).save();
+  gitIgnoreTemplate(['macOS', 'NodeJS', 'VisualStudioCode']);
+  if (isYarn && isYarnBerry) {
+    execCommand(undefined, 'yarn', ['set', 'version', 'berry']);
+    yaml('.yarnrc.yml').set('nodeLinker', 'node-modules').save();
+    execCommand(undefined, 'yarn', ['install']);
+  }
+  npm.dependency({
+    dev: true,
+    name: ['mrm', mrmPreset],
+    yarn: isYarn,
     state: 'present',
-    update: packageManager,
-    default: () => {
-      if (file('yarn.lock').exists()) {
-        return 'yarn';
-      }
-
-      // return 'npm';
-      return undefined;
-    },
   });
-  pkg.value(packageFile, {
-    path: 'mrmConfig.packageArchetype',
-    state: 'present',
-    update: packageArchetype,
-    default: () => {
-      if (file('lerna.json').exists() || Boolean(packageFile.get('workspaces'))) {
-        return 'workspace';
-      }
 
-      return 'library';
-    },
+  pkg.withPackageJson((packageFile) => {
+    // Add MRM default scripts
+    pkg.script(packageFile, {
+      name: 'configure',
+      state: 'default',
+      script: `${packageManager} run mrm -- ${mrmTask}`,
+    });
+    pkg.script(packageFile, {
+      name: 'mrm',
+      state: 'default',
+      script: `${packageManager} --preset ${mrmPreset}`,
+    });
   });
-  packageFile.save();
 
-  npm.dependency({
-    dev: true,
-    name: ['mrm', mrmPreset],
-    yarn: packageManager === 'yarn',
-    state: 'present',
+  pkg.withPackageJson((packageFile) => {
+    pkg.value(packageFile, {
+      path: 'mrmConfig.packageArchetype',
+      state: 'present',
+      update: packageArchetype,
+      default: () => {
+        if (file('lerna.json').exists() || Boolean(packageFile.get('workspaces'))) {
+          return 'workspace';
+        }
+
+        return 'library';
+      },
+    });
   });
 }
 

package/ci/gitlab.js

@@ -21,9 +21,7 @@ function task() {
       /**
        * @param {string|{local: string}} include
        */
-      (include) => {
-        return (typeof include === 'string' ? include : include.local) === includePath;
-      }
+      (include) => (typeof include === 'string' ? include : include.local) === includePath
     );
   const addInclude = (/** @type {string} */ includePath) =>
     gitlabCIConfig.set('include', gitlabCIConfig.get('include', []).concat([{ local: includePath }]));

package/contributing/templates/CODE_OF_CONDUCT.md

@@ -6,7 +6,7 @@
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
+identity and expression, level of experience, education, socioeconomic status,
 nationality, personal appearance, race, caste, color, religion, or sexual identity
 and orientation.
 
@@ -119,11 +119,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 2.0, available at
 [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-Community Impact Guidelines were inspired by 
+Community Impact Guidelines were inspired by
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
 at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
@@ -131,4 +131,3 @@ at [https://www.contributor-covenant.org/translations][translations].
 [Mozilla CoC]: https://github.com/mozilla/diversity
 [FAQ]: https://www.contributor-covenant.org/faq
 [translations]: https://www.contributor-covenant.org/translations
-

package/core/block.js

@@ -20,13 +20,10 @@ const { file } = require('mrm-core');
 function block({
   markerBegin = 'BEGIN',
   markerEnd = 'END',
-  marker = (mark) => {
-    return `# ${mark} generated by mrm`;
-  },
+  marker = (mark) => `# ${mark} generated by mrm`,
   path,
   block: blockName,
-  // @ts-ignore
-  insertBefore = 'begin',
+  // insertBefore = 'begin',
   insertAfter,
 }) {
   const EOL = '\n';

package/{gitignore/template.js → core/git.ignore.js}

@@ -11,6 +11,7 @@ module.exports = {
   yarn-debug.log*
   yarn-error.log*
   lerna-debug.log*
+  .pnpm-debug.log*
 
   # Diagnostic reports (https://nodejs.org/api/report.html)
   report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
@@ -47,8 +48,8 @@ module.exports = {
   node_modules/
   jspm_packages/
 
-  # TypeScript v1 declaration files
-  typings/
+  # Snowpack dependency directory (https://snowpack.dev/)
+  web_modules/
 
   # TypeScript cache
   *.tsbuildinfo
@@ -59,6 +60,9 @@ module.exports = {
   # Optional eslint cache
   .eslintcache
 
+  # Optional stylelint cache
+  .stylelintcache
+
   # Microbundle cache
   .rpt2_cache/
   .rts2_cache_cjs/
@@ -74,15 +78,20 @@ module.exports = {
   # Yarn Integrity file
   .yarn-integrity
 
-  # dotenv environment variables file
+  # dotenv environment variable files
   .env
-  .env.test
+  .env.development.local
+  .env.test.local
+  .env.production.local
+  .env.local
 
   # parcel-bundler cache (https://parceljs.org/)
   .cache
+  .parcel-cache
 
   # Next.js build output
   .next
+  out
 
   # Nuxt.js build / generate output
   .nuxt
@@ -92,11 +101,18 @@ module.exports = {
   .cache/
   # Comment in the public line in if your project uses Gatsby and not Next.js
   # https://nextjs.org/blog/next-9-1#public-directory-support
-  public/
+  # public
 
   # vuepress build output
   .vuepress/dist
 
+  # vuepress v2.x temp and cache directory
+  .temp
+  .cache
+
+  # Docusaurus cache and generated files
+  .docusaurus
+
   # Serverless directories
   .serverless/
 
@@ -107,7 +123,17 @@ module.exports = {
   .dynamodb/
 
   # TernJS port file
-  .tern-port`,
+  .tern-port
+
+  # Stores VSCode versions used for testing VSCode extensions
+  .vscode-test
+
+  # yarn v2
+  .yarn/cache
+  .yarn/unplugged
+  .yarn/build-state.yml
+  .yarn/install-state.gz
+  .pnp.*`,
   VisualStudioCode: `
   .vscode/*
   !.vscode/settings.json

package/core/git.js

@@ -15,19 +15,13 @@ function remoteSync() {
            * 1. filter github URL
            * @param {string} returnValue
            */
-          (returnValue) => {
-            return returnValue.replace(/^git@github.com:/, 'https://github.com/');
-          },
+          (returnValue) => returnValue.replace(/^git@github.com:/, 'https://github.com/'),
           /**
            * 2. filter gitlab URL
            * @param {string} returnValue
            */
-          (returnValue) => {
-            return returnValue.replace(/^git@gitlab.com:/, 'https://gitlab.com/');
-          },
-        ].reduce((returnValue, filter) => {
-          return filter(returnValue);
-        }, remoteURL)
+          (returnValue) => returnValue.replace(/^git@gitlab.com:/, 'https://gitlab.com/'),
+        ].reduce((returnValue, filter) => filter(returnValue), remoteURL)
       : remoteURL;
   } catch (error) {
     // ignore error
@@ -48,9 +42,7 @@ exports.hasGit = hasGit;
 function trimStartLine(content) {
   return content
     .split(/\n/)
-    .map((line) => {
-      return line.replace(/^\s+/, '');
-    })
+    .map((line) => line.replace(/^\s+/, ''))
     .filter((_) => _.length > 0)
     .join('\n');
 }
@@ -64,10 +56,25 @@ function gitIgnore(section, sectionContent) {
 
   return block({
     block: Array.isArray(sectionContent) ? sectionContent.join(EOL) : trimStartLine(sectionContent),
-    marker: (mark) => {
-      return `# ${mark} ### ${section} ###`;
-    },
+    marker: (mark) => `# ${mark} ### ${section} ###`,
     path: '.gitignore',
   });
 }
 exports.gitIgnore = gitIgnore;
+
+/**
+ * @param {string[]} flags
+ */
+function gitIgnoreTemplate(flags) {
+  // eslint-disable-next-line global-require, import/no-dynamic-require
+  const templateMap = require('./git.ignore');
+
+  flags.forEach((flag) => {
+    // @ts-ignore
+    if (templateMap[flag]) {
+      // @ts-ignore
+      gitIgnore(flag, templateMap[flag]);
+    }
+  });
+}
+exports.gitIgnoreTemplate = gitIgnoreTemplate;

package/core/githooks.js

@@ -44,7 +44,8 @@ function husky({ state }) {
  * }} options
  */
 function gitHook({ name, state, content }) {
-  const hasHusky = Boolean(packageJson().get('devDependencies.husky'));
+  const packageFileDefault = packageJson();
+  const hasHusky = pkg.hasDependency(packageFileDefault, 'husky', 'dev');
   const hasGitHook = hasHusky && state === 'present';
   const hookDirectory = '.husky';
   const hookFileName = path.join(hookDirectory, name);

package/core/jest.js

@@ -13,8 +13,8 @@ const project = require('./project');
 function jest({ state }) {
   const packageFileDefault = packageJson();
   const hasJest = state === 'present';
-  const hasTypescript = Boolean(packageFileDefault.get('devDependencies.typescript'));
-  const hasWorkspaces = Boolean(packageFileDefault.get('workspaces'));
+  const hasTypescript = pkg.hasDependency(packageFileDefault, 'typescript', 'dev');
+  const hasWorkspaces = pkg.hasWorkspaces(packageFileDefault);
 
   pkg.withPackageJson((packageFile) => {
     if (hasJest) {

package/core/npm.js

@@ -1,3 +1,5 @@
+/* eslint-disable default-param-last */
+/* eslint-disable no-use-before-define */
 /* eslint-disable import/no-extraneous-dependencies */
 /* cSpell: disable */
 // @ts-check
@@ -72,9 +74,7 @@ function install(deps, options = {}, exec) {
   }
 
   log.info(`Installing ${listify(newDeps)}...`);
-  const versionedDeps = newDeps.map((dep) => {
-    return getVersionedDep(dep, versions);
-  });
+  const versionedDeps = newDeps.map((dep) => getVersionedDep(dep, versions));
 
   // eslint-disable-next-line consistent-return
   return run(versionedDeps, { dev }, exec);
@@ -96,9 +96,7 @@ function uninstall(deps, options = {}, exec) {
   const installed = getOwnDependencies({ dev });
 
   // @ts-ignore
-  const newDeps = deps.filter((dep) => {
-    return installed[dep];
-  });
+  const newDeps = deps.filter((dep) => installed[dep]);
 
   if (newDeps.length === 0) {
     return;
@@ -136,7 +134,7 @@ function runNpm(deps, options = {}, exec) {
 function runYarn(deps, options = {}, exec) {
   const add = options.dev ? ['add', '--dev'] : ['add'];
   const remove = ['remove'];
-  const args = (options.remove ? remove : add).concat(isUsingWorkspaces() ? ['-W'] : []).concat(deps);
+  const args = (options.remove ? remove : add).concat(isUsingWorkspaces() && !isYarnBerry() ? ['-W'] : []).concat(deps);
 
   return execCommand(exec, 'yarn', args, {
     cwd: options.cwd,
@@ -250,6 +248,10 @@ function isUsingWorkspaces() {
   return Boolean(packageJson().get('workspaces'));
 }
 
+function isYarnBerry() {
+  return fs.existsSync('.yarnrc.yml');
+}
+
 /**
  * @param {{
  *   name: string|string[]|Record<string, string>,

package/core/pkg.js

@@ -58,6 +58,34 @@ function manager(packageFile) {
   return defaultManager;
 }
 
+/**
+ *
+ * @param {import('mrm-core').PackageJson} packageFile
+ */
+function hasWorkspaces(packageFile) {
+  return Boolean(packageFile.get('workspaces'));
+}
+
+/**
+ *
+ * @param {import('mrm-core').PackageJson} packageFile
+ * @param {string} packageName
+ * @param {'normal'|'dev'|'peer'=} dependencyType
+ */
+function hasDependency(packageFile, packageName, dependencyType) {
+  return Boolean(
+    packageFile.get(
+      `${
+        dependencyType == null || dependencyType === 'normal'
+          ? 'dependencies'
+          : dependencyType === 'dev'
+          ? 'devDependencies'
+          : 'peerDependencies'
+      }.${packageName}`
+    )
+  );
+}
+
 /**
  *
  * @param {import('mrm-core').PackageJson} packageFile
@@ -78,12 +106,13 @@ function engineMinVersion(packageFile, engineVersionMap) {
   };
 
   packageFile.merge({
-    engines: Object.keys(engineVersionMap).reduce((acc, engineName) => {
-      return {
+    engines: Object.keys(engineVersionMap).reduce(
+      (acc, engineName) => ({
         ...acc,
         [engineName]: engineConstraint(engineName),
-      };
-    }, {}),
+      }),
+      {}
+    ),
   });
 }
 
@@ -93,5 +122,7 @@ module.exports = {
   script,
   manager,
   engineMinVersion,
+  hasDependency,
+  hasWorkspaces,
   withPackageJson,
 };

package/core/semanticRelease.js

@@ -34,7 +34,7 @@ function semanticRelease({ state, update, preset }) {
     });
   });
 }
-semanticRelease.command = function () {
+semanticRelease.command = function command() {
   return 'semantic-release';
 };
 

package/core/typedoc.js

@@ -23,7 +23,7 @@ const jsonFile = require('./jsonFile');
  */
 function typedoc({ state, update }) {
   const packageFileDefault = packageJson();
-  const hasWorkspaces = Boolean(packageFileDefault.get('workspaces'));
+  const hasWorkspaces = pkg.hasWorkspaces(packageFileDefault);
   const hasTypedoc = state === 'present';
 
   pkg.withPackageJson((packageFile) => {

package/core/vscode.js

@@ -31,16 +31,10 @@ function vscodeTask(newTask) {
    * @type {Array<any>}
    */
   const tasks = vscodeTaskFile.get('tasks', []);
-  if (
-    tasks.find((task) => {
-      return task.script === newTask.script;
-    })
-  ) {
+  if (tasks.find((task) => task.script === newTask.script)) {
     vscodeTaskFile.set(
       'tasks',
-      tasks.map((task) => {
-        return task.script === newTask.script ? newTask : task;
-      })
+      tasks.map((task) => (task.script === newTask.script ? newTask : task))
     );
   } else {
     vscodeTaskFile.set('tasks', [newTask].concat(tasks));

package/cspell/index.js

@@ -1,9 +1,6 @@
 const { cspell } = require('../core/cspell');
-const { lintStaged } = require('../core/lintStaged');
-const { hasGit } = require('../core/git');
 
 function task() {
-  const gitSupported = hasGit();
   cspell({
     state: 'present',
     update: (_) => ({
@@ -23,14 +20,6 @@ function task() {
       ),
     }),
   });
-
-  lintStaged({
-    state: gitSupported ? 'present' : 'absent',
-    update: (config) => ({
-      ...config,
-      '*.*': ['cspell --no-must-find-files'],
-    }),
-  });
 }
 
 task.description = 'Adds CSpell support';

package/eslint/index.js

@@ -15,7 +15,8 @@ function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended'
    * }} config
    */
   function task({ eslintPreset, eslintRules }) {
-    const hasTypescript = packageJson().get('devDependencies.typescript');
+    const packageFileDefault = packageJson();
+    const hasTypescript = pkg.hasDependency(packageFileDefault, 'typescript', 'dev');
     const hasJSX = true;
     const hasJSON = true;
 
@@ -87,23 +88,21 @@ function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended'
     // VSCode support
     vscodeSettings({
       state: 'present',
-      update: (settings) => {
-        return {
-          ...settings,
-          'editor.codeActionsOnSave': settings['editor.codeActionsOnSave'] || {
-            'source.fixAll.eslint': true,
-          },
-          'eslint.validate': extList.map(
-            (ext) =>
-              ({
-                jsx: 'javascriptreact',
-                js: 'javascript',
-                tsx: 'typescriptreact',
-                ts: 'typescript',
-              }[ext] || ext)
-          ),
-        };
-      },
+      update: (settings) => ({
+        ...settings,
+        'editor.codeActionsOnSave': settings['editor.codeActionsOnSave'] || {
+          'source.fixAll': true,
+        },
+        'eslint.validate': extList.map(
+          (ext) =>
+            ({
+              jsx: 'javascriptreact',
+              js: 'javascript',
+              tsx: 'typescriptreact',
+              ts: 'typescript',
+            }[ext] || ext)
+        ),
+      }),
     });
   }
 

package/githooks/index.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { packageJson, template } = require('mrm-core');
 const project = require('../core/project');
+const pkg = require('../core/pkg');
 const { hasGit } = require('../core/git');
 const { gitHook, husky } = require('../core/githooks');
 const { lintStaged } = require('../core/lintStaged');
@@ -10,9 +11,9 @@ function createGitHooks() {
   function task() {
     const gitSupported = hasGit();
     const packageFile = packageJson();
-    const hasESLint = Boolean(packageFile.get('devDependencies.eslint'));
-    const hasJest = Boolean(packageFile.get('devDependencies.jest'));
-    const hasTsc = Boolean(packageFile.get('devDependencies.typescript'));
+    const hasESLint = pkg.hasDependency(packageFile, 'eslint', 'dev');
+    const hasJest = pkg.hasDependency(packageFile, 'jest', 'dev');
+    const hasTsc = pkg.hasDependency(packageFile, 'typescript', 'dev');
 
     husky({
       state: gitSupported ? 'present' : 'absent',

package/gitignore/index.js

@@ -1,25 +1,6 @@
-const { gitIgnore } = require('../core/git');
+const { gitIgnoreTemplate } = require('../core/git');
 
-/**
- *
- * @param {string} templatePath
- * @param {Array<string>} flags
- */
-function createGitIgnore(templatePath, flags) {
-  function task() {
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    const templateMap = require(templatePath);
-
-    flags.forEach((flag) => {
-      if (templateMap[flag]) {
-        gitIgnore(flag, templateMap[flag]);
-      }
-    });
-  }
-
-  task.description = 'Adds Gitignore file';
-
-  return task;
+function task() {
+  gitIgnoreTemplate(['macOS', 'NodeJS', 'VisualStudioCode']);
 }
-
-module.exports = createGitIgnore(require.resolve('./template'), ['macOS', 'NodeJS', 'VisualStudioCode']);
+task.description = 'Adds Gitignore file';

package/lang/index.js

@@ -4,7 +4,6 @@ const npm = require('../core/npm');
 const { gitIgnore } = require('../core/git');
 const project = require('../core/project');
 const { eslintIgnore } = require('../core/eslint');
-const { useWorkspaces } = require('../core/workspace');
 const { typedoc } = require('../core/typedoc');
 const pkg = require('../core/pkg');
 
@@ -27,8 +26,9 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
   }
   task.typescript = () => {
     const tsConfigPreset = tsConfigDefault;
-    const isApplication = packageJson().get('mrmConfig.packageArchetype') === 'application';
-    const hasWorkspaces = useWorkspaces();
+    const packageFile = packageJson();
+    const isApplication = packageFile.get('mrmConfig.packageArchetype') === 'application';
+    const hasWorkspaces = pkg.hasWorkspaces(packageFile);
     const tsConfigSettingsName = 'tsconfig.settings.json';
     const tsConfigSettings = json(tsConfigSettingsName);
     const tsConfig = json('tsconfig.json');
@@ -77,9 +77,9 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
       }
     }
     // Application setup
-    pkg.withPackageJson((packageFile) => {
+    pkg.withPackageJson((_packageFile) => {
       if (isApplication) {
-        pkg.script(packageFile, {
+        pkg.script(_packageFile, {
           name: project.develop,
           script:
             "NODE_ENV=development ts-node-dev --require='tsconfig-paths/register' -r dotenv/config -- ./src/index.ts dotenv_config_path=.env",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.5",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
     "config",
     "bootstrap"
   ],
-  "homepage": "https://github.com/w5s/project-config/blob/master/packages/mrm-preset#readme",
+  "homepage": "https://github.com/w5s/project-config/blob/main/packages/mrm-preset#readme",
   "bugs": {
     "url": "https://github.com/w5s/project-config.git/issues"
   },
@@ -44,5 +44,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "17d00b3e9ba103fd053aed2c06535d0b1526886a"
 }

package/project/index.js

@@ -29,16 +29,13 @@ function task() {
    *
    * @param {string} script
    */
-  const lernaRun = (script) => {
-    return `lerna run ${script}`;
-  };
+  const lernaRun = (script) => `lerna run ${script}`;
+
   /**
    *
    * @param {string} script
    */
-  const npmRunAll = (script) => {
-    return `npm-run-all -p "${script}:*"`;
-  };
+  const npmRunAll = (script) => `npm-run-all -p "${script}:*"`;
 
   // Detect git repository
   pkg.value(packageFile, {

package/renovate/index.js

@@ -34,9 +34,7 @@ function createRenovate({ renovatePresetApplication, renovatePresetLibrary }) {
             /**
              * @param {string} extension
              */
-            (extension) => {
-              return extension !== renovatePresetApplication && extension !== renovatePresetLibrary;
-            }
+            (extension) => extension !== renovatePresetApplication && extension !== renovatePresetLibrary
           )
         )
       );
@@ -56,6 +54,6 @@ function createRenovate({ renovatePresetApplication, renovatePresetLibrary }) {
 }
 
 module.exports = createRenovate({
-  renovatePresetApplication: '@w5s/renovate-config:application',
-  renovatePresetLibrary: '@w5s/renovate-config:library',
+  renovatePresetApplication: 'github>w5s/renovate-config:application',
+  renovatePresetLibrary: 'github>w5s/renovate-config:library',
 });

package/core/workspace.js

@@ -1,6 +0,0 @@
-const { packageJson } = require('mrm-core');
-
-function useWorkspaces() {
-  return packageJson().get('mrmConfig.packageArchetype') === 'workspace';
-}
-exports.useWorkspaces = useWorkspaces;