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

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 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)
 
 

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/{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

@@ -61,3 +61,20 @@ function gitIgnore(section, sectionContent) {
   });
 }
 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/npm.js

@@ -134,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,
@@ -248,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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cd7eb2b021bb3c9dbc91375cece5349173a7c81a"
+  "gitHead": "17d00b3e9ba103fd053aed2c06535d0b1526886a"
 }