@w5s/mrm-preset 1.0.0-alpha.6 → 1.0.0-alpha.7

package/.turbo/turbo-build.log

@@ -0,0 +1 @@
+@w5s/mrm-preset:build: cache hit, replaying output 65d77d6fca114214

package/.turbo/turbo-docs.log

@@ -0,0 +1,43 @@
+@w5s/mrm-preset:docs: cache hit, replaying output f34cf75e082653a5
+@w5s/mrm-preset:docs: Starting markdown-magic [ '**/*.md', '!node_modules/**' ]
+@w5s/mrm-preset:docs: ℹ Notice:
+@w5s/mrm-preset:docs:   Missing transforms "BASIC_RULES","JSX_RULES" in _tester/node_modules/eslint-plugin-react/README.md
+@w5s/mrm-preset:docs: 
+@w5s/mrm-preset:docs: ✔ README.md Updated
+@w5s/mrm-preset:docs:  Transforms run
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=# W5s Mrm Preset _(${name})_ 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=> ${description}&unknownTxt=  
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[${license}][license-url] © ${author} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-url]: https://www.npmjs.com/package/${name} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
+@w5s/mrm-preset:docs: 
+@w5s/mrm-preset:docs: ✔ _tester/node_modules/@w5s/mrm-preset/README.md Updated
+@w5s/mrm-preset:docs:  Transforms run
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=# W5s Mrm Preset _(${name})_ 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=> ${description}&unknownTxt=  
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[${license}][license-url] © ${author} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-url]: https://www.npmjs.com/package/${name} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
+@w5s/mrm-preset:docs: 
+@w5s/mrm-preset:docs: ✔ _tester/node_modules/@w5s/eslint-config/README.md Updated
+@w5s/mrm-preset:docs:  Transforms run
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=# W5s ESLint configuration _(${name})_ 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=> ${description}&unknownTxt=  
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=```console\nnpm install --save-dev ${name}\n``` 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[${license}][license-url] © ${author} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-url]: https://www.npmjs.com/package/${name} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
+@w5s/mrm-preset:docs: 
+@w5s/mrm-preset:docs: ✔ _tester/node_modules/@w5s/ts-config/README.md Updated
+@w5s/mrm-preset:docs:  Transforms run
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=# W5s Typescript configuration _(${name})_ 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=> ${description}&unknownTxt=  
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=```console\nnpm install --save-dev ${name}\n``` 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[${license}][license-url] © ${author} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[package-url]: https://www.npmjs.com/package/${name} 
+@w5s/mrm-preset:docs:   ⁕ PKGJSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
+@w5s/mrm-preset:docs: 

package/.turbo/turbo-test.log

@@ -0,0 +1,20 @@
+@w5s/mrm-preset:test: cache hit, replaying output 6b4f5273625c6ddf
+@w5s/mrm-preset:test: mkdir: _tester: File exists
+@w5s/mrm-preset:test: Running bootstrap...
+@w5s/mrm-preset:test: Running alias configure...
+@w5s/mrm-preset:test: Running gitignore...
+@w5s/mrm-preset:test: Running project...
+@w5s/mrm-preset:test: Update package.json
+@w5s/mrm-preset:test: Running contributing...
+@w5s/mrm-preset:test: Running release...
+@w5s/mrm-preset:test: Running ci...
+@w5s/mrm-preset:test: Running lang...
+@w5s/mrm-preset:test: Running commitlint...
+@w5s/mrm-preset:test: Running editorconfig...
+@w5s/mrm-preset:test: Running eslint...
+@w5s/mrm-preset:test: Running cspell...
+@w5s/mrm-preset:test: Running jest...
+@w5s/mrm-preset:test: Update package.json
+@w5s/mrm-preset:test: Running renovate...
+@w5s/mrm-preset:test: Running githooks...
+@w5s/mrm-preset:test: Running postconfigure...

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 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.7](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.6...@w5s/mrm-preset@1.0.0-alpha.7) (2022-03-01)
+
+
+### Bug Fixes
+
+* correct bootstrap step ([da7f539](https://github.com/w5s/project-config/commit/da7f539560ba143f830c9ea824b0d79c6a50522c))
+* correct is-ci script that fails in some yarn berry ([4e4707d](https://github.com/w5s/project-config/commit/4e4707d7e8c0cd2c88e1dc6bc94705317dcf9e98))
+* improve yarn check ([3af241a](https://github.com/w5s/project-config/commit/3af241af004d747518733983260eb295aa75e5cb))
+
+
+
+
+
 # [1.0.0-alpha.6](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.5...@w5s/mrm-preset@1.0.0-alpha.6) (2022-02-23)
 
 

package/README.md

@@ -19,7 +19,7 @@ Initialize your project using this command :
 
 ```bash
 # from the root of your project
-npm exec -p mrm -p @w5s/mrm-preset -- mrm bootstrap --preset @w5s/mrm-preset
+npm exec --package=@w5s/mrm-preset -- mrm bootstrap --preset @w5s/mrm-preset
 ```
 
 This will install in `package.json` the npm scripts

package/bootstrap/index.js

@@ -1,8 +1,6 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
 const path = require('path');
-const { packageJson, file, yaml } = require('mrm-core');
-// @ts-ignore
-const execCommand = require('mrm-core/src/util/execCommand');
+const { packageJson, file } = require('mrm-core');
 const npm = require('../core/npm');
 const pkg = require('../core/pkg');
 const { gitIgnoreTemplate } = require('../core/git');
@@ -12,17 +10,11 @@ const { gitIgnoreTemplate } = require('../core/git');
  *   mrmPreset: string,
  *   mrmTask: string,
  *   packageArchetype: 'application'|'library'|'workspace',
- *   packageManager: 'npm'|'yarn'
+ *   packageManager: 'npm'|'yarn@classic'|'yarn@berry'
  * }} config
  * @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
    */
@@ -35,29 +27,28 @@ function task({ mrmPreset, mrmTask, packageArchetype, packageManager }) {
     description: '',
   }).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.bootstrap(packageManager);
+
   npm.dependency({
     dev: true,
     name: ['mrm', mrmPreset],
-    yarn: isYarn,
     state: 'present',
   });
 
   pkg.withPackageJson((packageFile) => {
+    const currentPackageManager = pkg.manager(packageFile);
+
     // Add MRM default scripts
     pkg.script(packageFile, {
       name: 'configure',
       state: 'default',
-      script: `${packageManager} run mrm -- ${mrmTask}`,
+      script: currentPackageManager === 'npm' ? `npm run mrm -- ${mrmTask}` : `yarn mrm ${mrmTask}`,
     });
     pkg.script(packageFile, {
       name: 'mrm',
       state: 'default',
-      script: `${packageManager} --preset ${mrmPreset}`,
+      script: `${currentPackageManager} --preset ${mrmPreset}`,
     });
   });
 
@@ -97,8 +88,8 @@ task.parameters = {
     type: 'input',
   },
   packageManager: {
-    default: 'yarn',
-    choices: ['yarn', 'npm'],
+    default: 'yarn@berry',
+    choices: ['yarn@berry', 'yarn@classic', 'npm'],
     message: 'Which default package manager ?',
     name: 'packageManager',
     type: 'input',

package/core/npm.js

@@ -18,11 +18,10 @@ const log = require('mrm-core/src/util/log');
 // @ts-ignore
 const execCommand = require('mrm-core/src/util/execCommand');
 // @ts-ignore
-const json = require('mrm-core/src/formats/json');
-// @ts-ignore
 const packageJson = require('mrm-core/src/files/packageJson');
 // @ts-ignore
 const MrmError = require('mrm-core/src/error');
+const { yaml, json } = require('mrm-core');
 
 /**
  * @typedef Options
@@ -249,7 +248,38 @@ function isUsingWorkspaces() {
 }
 
 function isYarnBerry() {
-  return fs.existsSync('.yarnrc.yml');
+  const yamlRC = yaml('.yarnrc.yml');
+  return yamlRC.exists() && (yamlRC.get('yarnPath') || '').indexOf('.yarn/releases/yarn-1.') < 0;
+}
+
+/**
+ * @param {'npm'|`yarn@${'classic'|'berry'}`} defaultPackageManager
+ */
+function bootstrap(defaultPackageManager) {
+  const packageFile = json(`./package.json`);
+  const isYarn = isUsingYarn() || defaultPackageManager.startsWith('yarn@');
+  if (!packageFile.get('packageManager')) {
+    if (isYarn) {
+      execCommand(undefined, 'yarn', ['set', 'version', 'berry']);
+      yaml('.yarnrc.yml')
+        .merge({
+          nodeLinker: 'node-modules',
+        })
+        .save();
+      // Downgrade
+      if (defaultPackageManager.endsWith('@classic')) {
+        execCommand(undefined, 'yarn', ['set', 'version', 'classic']);
+      }
+    }
+  }
+
+  // lock files
+  if (isYarn && !fs.existsSync('yarn.lock')) {
+    execCommand(undefined, 'yarn', ['install']);
+  }
+  if (!isYarn && !fs.existsSync('package-lock.json')) {
+    execCommand(undefined, 'npm', ['install']);
+  }
 }
 
 /**
@@ -269,5 +299,6 @@ function dependency({ name, state, ...options }) {
 }
 
 module.exports = {
+  bootstrap,
   dependency,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.7",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -26,7 +26,7 @@
     "docs": "md-magic --path '**/*.md' --ignore='node_modules'",
     "format": "eslint . --fix",
     "lint": "eslint .",
-    "test": "mkdir _tester; cd _tester; ../node_modules/.bin/mrm bootstrap --dir ..; ../node_modules/.bin/mrm configure --dir .."
+    "test": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
   },
   "dependencies": {
     "debug": "^4.3.3",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0bf05f35388f1ddb53438a017186cf64d2ce99f2"
+  "gitHead": "791ae3e63ac1278f1299c4e8af2a88786b2b6683"
 }

package/project/index.js

@@ -29,7 +29,7 @@ function task() {
    *
    * @param {string} script
    */
-  const lernaRun = (script) => `lerna run ${script}`;
+  const turboRun = (script) => `turbo run ${script}`;
 
   /**
    *
@@ -67,12 +67,12 @@ function task() {
   });
   pkg.script(packageFile, {
     name: `${project.build}:packages`,
-    script: lernaRun(project.build),
+    script: turboRun(project.build),
     state: useWorkspace ? 'present' : 'absent',
   });
   pkg.script(packageFile, {
     name: project.clean,
-    script: useWorkspace ? lernaRun(project.clean) : pkg.emptyScript,
+    script: useWorkspace ? turboRun(project.clean) : pkg.emptyScript,
     state: useWorkspace ? 'present' : 'default',
   });
 
@@ -103,8 +103,18 @@ function task() {
   });
   pkg.script(packageFile, {
     name: project.test,
-    script: useWorkspace ? lernaRun(project.test) : pkg.emptyScript,
-    state: useWorkspace ? 'present' : 'default',
+    script: npmRunAll(project.test),
+    state: 'present',
+  });
+  pkg.script(packageFile, {
+    name: `${project.prepare}:empty`,
+    script: pkg.emptyScript,
+    state: 'default',
+  });
+  pkg.script(packageFile, {
+    name: `${project.prepare}:packages`,
+    script: turboRun(project.test),
+    state: useWorkspace ? 'present' : 'absent',
   });
   pkg.script(packageFile, {
     name: project.validate,
@@ -151,6 +161,25 @@ function task() {
   });
 
   // workspace
+  const turboConfig = json('turbo.json', {
+    $schema: 'https://turborepo.org/schema.json',
+    pipeline: {
+      [project.build]: {
+        dependsOn: ['^build'],
+        outputs: ['lib/**', 'dist/**', '.next/**'],
+      },
+      [project.test]: {},
+      [project.lint]: {},
+      [project.format]: {},
+      [project.clean]: {
+        cache: false,
+      },
+      [project.develop]: {
+        cache: false,
+      },
+    },
+    globalDependencies: ['tsconfig.settings.json'],
+  });
   const lernaConfig = json('lerna.json', {
     version: packageFile.get('version'),
   });
@@ -172,10 +201,12 @@ function task() {
       useWorkspaces: useWorkspace,
     });
     lernaConfig.save();
+    turboConfig.save();
     makeDirs('packages');
   } else {
     packageFile.unset('workspaces');
     lernaConfig.delete();
+    turboConfig.delete();
   }
 
   // Engine
@@ -200,7 +231,7 @@ function task() {
   });
   npm.dependency({
     dev: true,
-    name: ['lerna'],
+    name: ['lerna', 'turbo'],
     state: useWorkspace ? 'present' : 'absent',
   });
 

package/release/index.js

@@ -11,7 +11,7 @@ function task() {
     pkg.script(packageFile, {
       name: project.release,
       // eslint-disable-next-line no-template-curly-in-string
-      script: useWorkspace ? 'CI=$(is-ci) lerna publish ${CI:+"--yes"}' : semanticRelease.command(),
+      script: useWorkspace ? 'is-ci && lerna publish --yes || lerna publish' : semanticRelease.command(),
       state: 'present',
     });
   });