@w5s/mrm-preset 1.3.0 → 2.0.0

package/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "import/no-unresolved": "off"
+  }
+}

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
 [1] : exited with code 0
 [tsc] 
-[tsc] > @w5s/mrm-preset@1.2.1 build:tsc
+[tsc] > @w5s/mrm-preset@1.4.0 build:tsc
 [tsc] > tsc --noEmit --skipLibCheck
 [tsc] 
 [tsc] npm run build:tsc exited with code 0

package/.turbo/turbo-format.log

@@ -0,0 +1,22 @@
+[1] : exited with code 0
+[src] 
+[src] > @w5s/mrm-preset@1.3.0 format:src
+[src] > eslint . --fix --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
+[src] 
+[src] 
+[src] /Users/julienpolo/Code/w5s/project-config/packages/mrm-preset/core/git.js
+[src]   2:31  error  Unable to resolve path to module '@w5s/dev'  import/no-unresolved
+[src] 
+[src] /Users/julienpolo/Code/w5s/project-config/packages/mrm-preset/core/githooks.js
+[src]   4:31  error  Unable to resolve path to module '@w5s/dev'  import/no-unresolved
+[src] 
+[src] /Users/julienpolo/Code/w5s/project-config/packages/mrm-preset/editorconfig/index.js
+[src]   2:31  error  Unable to resolve path to module '@w5s/dev'  import/no-unresolved
+[src] 
+[src] ✖ 3 problems (3 errors, 0 warnings)
+[src] 
+[src] npm ERR! Lifecycle script `format:src` failed with error: 
+[src] npm ERR! Error: command failed 
+[src] npm ERR!   in workspace: @w5s/mrm-preset@1.3.0 
+[src] npm ERR!   at location: /Users/julienpolo/Code/w5s/project-config/packages/mrm-preset 
+[src] npm run format:src exited with code 1

package/.turbo/turbo-lint.log

@@ -1,6 +1,6 @@
 [1] : exited with code 0
 [src] 
-[src] > @w5s/mrm-preset@1.2.1 lint:src
+[src] > @w5s/mrm-preset@1.4.0 lint:src
 [src] > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
 [src] 
 [src] npm run lint:src exited with code 0

package/.turbo/turbo-prepare.log

@@ -1,6 +1,6 @@
 [1] : exited with code 0
 [template] 
-[template] > @w5s/mrm-preset@1.3.0 prepare:template
+[template] > @w5s/mrm-preset@2.0.0 prepare:template
 [template] > cp ../../.editorconfig editorconfig/_editorconfig
 [template] 
 [template] npm run prepare:template exited with code 0

package/.turbo/turbo-test.log

@@ -1,6 +1,6 @@
 [1] : exited with code 0
 [script] 
-[script] > @w5s/mrm-preset@1.2.1 test:script
+[script] > @w5s/mrm-preset@1.4.0 test:script
 [script] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
 [script] 
 [script] mkdir: _tester: File exists

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.4.0...@w5s/mrm-preset@2.0.0) (2023-10-13)
+
+### 🎫 Chores
+
+- Drop support for NodeJS 16 ([1e7b464](https://github.com/w5s/project-config/commit/1e7b464))
+
+### 💥 BREAKING CHANGES
+
+- NodeJS 16 or lower could not work with this configuration
+
+# [1.4.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.3.0...@w5s/mrm-preset@1.4.0) (2023-10-09)
+
+### ✨ Features
+
+- Ignore turbo files ([5de104f](https://github.com/w5s/project-config/commit/5de104f))
+
+**Note:** Version bump only for package @w5s/mrm-preset
+
 # [1.3.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.2.1...@w5s/mrm-preset@1.3.0) (2023-09-28)
 
 ### ✨ Features

package/core/git.ignore.js

@@ -133,7 +133,11 @@ module.exports = {
   .yarn/unplugged
   .yarn/build-state.yml
   .yarn/install-state.gz
-  .pnp.*`,
+  .pnp.*
+
+  # Turbo
+  .turbo
+  `,
   VisualStudioCode: `
   .vscode/*
   !.vscode/settings.json

package/core/git.js

@@ -1,5 +1,5 @@
 const { file, ini } = require('mrm-core');
-const block = require('./block.js');
+const { blockSync } = require('@w5s/dev');
 const templateMap = require('./git.ignore.js');
 /**
  *
@@ -40,9 +40,9 @@ function trimStartLine(content) {
 function gitIgnore(section, sectionContent) {
   const EOL = '\n';
 
-  return block({
+  return blockSync({
     block: Array.isArray(sectionContent) ? sectionContent.join(EOL) : trimStartLine(sectionContent),
-    marker: (mark) => `# ${mark} ### ${section} ###`,
+    marker: (mark) => `# ${mark.toUpperCase()} ### ${section} ###`,
     path: '.gitignore',
   });
 }

package/core/githooks.js

@@ -1,10 +1,10 @@
 const { execSync } = require('node:child_process');
 const path = require('node:path');
 const { file, makeDirs } = require('mrm-core');
+const { blockSync } = require('@w5s/dev');
 const project = require('./project.js');
 const npm = require('./npm.js');
 const pkg = require('./pkg.js');
-const block = require('./block.js');
 
 const hookDirectory = '.githooks';
 
@@ -48,10 +48,10 @@ function gitHook({ name, state, content }) {
       execSync(`npm exec -- husky add ${hookFileName} ""`, { stdio: 'inherit' });
     }
 
-    block({
+    blockSync({
       path: hookFileName,
       block: content,
-      insertAfter: 'end',
+      insertPosition: ['after', 'EndOfFile'],
     });
   } else {
     file(hookFileName).delete();

package/editorconfig/_editorconfig

@@ -1,3 +1,4 @@
+# BEGIN MANAGED BLOCK
 # http://editorconfig.org
 root = true
 
@@ -57,3 +58,5 @@ indent_style = space
 
 [{Makefile,**.mk,**.make}]
 indent_style = tab
+
+# END MANAGED BLOCK

package/editorconfig/index.js

@@ -1,14 +1,14 @@
 const { readFileSync } = require('node:fs');
-
+const { blockSync } = require('@w5s/dev');
 const { vscodeRecommendedExtension } = require('../core/vscode.js');
-const block = require('../core/block.js');
 
 function task() {
   const templateContent = readFileSync(require.resolve('./_editorconfig'), 'utf8');
 
-  block({
+  blockSync({
     block: templateContent,
     path: '.editorconfig',
+    insertPosition: ['after', 'EndOfFile'],
   });
 
   vscodeRecommendedExtension({

package/githooks/index.js

@@ -1,11 +1,11 @@
 const path = require('node:path');
 const { packageJson, template } = require('mrm-core');
+const { fileSync } = require('@w5s/dev');
 const project = require('../core/project.js');
 const pkg = require('../core/pkg.js');
 const { hasGit } = require('../core/git.js');
 const { gitHook, husky } = require('../core/githooks.js');
 const { lintStaged } = require('../core/lintStaged.js');
-const { file } = require('../core/file.js');
 
 function task() {
   const gitSupported = hasGit();
@@ -40,9 +40,9 @@ function task() {
     state: gitSupported ? 'present' : 'absent',
   });
 
-  file({
+  fileSync({
     path: 'CODEOWNERS',
-    state: gitSupported ? 'file' : 'absent',
+    state: gitSupported ? 'present' : 'absent',
     update: (content) =>
       content.length === 0
         ? template('', path.join(__dirname, 'templates', 'CODEOWNERS'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -24,6 +24,7 @@
     "postpack": "npx clean-package restore"
   },
   "dependencies": {
+    "@w5s/dev": "^2.0.0",
     "debug": "^4.3.3",
     "glob": "^10.0.0",
     "mrm-core": "^7.0.0",
@@ -31,10 +32,10 @@
     "sync-directory": "^6.0.0"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "40aa9e728c83ee50a5a381817c59df91458cf6a0"
+  "gitHead": "df3ad719f23deb6ab6a2c546664b0496fee3a039"
 }

package/package.json.backup

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -38,6 +38,7 @@
     "test:script": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
   },
   "dependencies": {
+    "@w5s/dev": "^2.0.0",
     "debug": "^4.3.3",
     "glob": "^10.0.0",
     "mrm-core": "^7.0.0",
@@ -51,10 +52,10 @@
   },
   "clean-package": "../../clean-package.config.cjs",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "40aa9e728c83ee50a5a381817c59df91458cf6a0"
+  "gitHead": "df3ad719f23deb6ab6a2c546664b0496fee3a039"
 }

package/core/block.js

@@ -1,74 +0,0 @@
-const { file } = require('mrm-core');
-
-/**
- * Replace a block in file that follows pattern :
- *
- * marker(markerBegin)
- * ...
- * marker(markerEnd)
- *
- * @param {{
- *   markerBegin?: string,
- *   markerEnd?: string,
- *   marker?: (mark: string) => string,
- *   path: string,
- *   block: string,
- *   insertBefore?: 'begin',
- *   insertAfter?: 'end'
- * }} options
- */
-function block({
-  markerBegin = 'BEGIN',
-  markerEnd = 'END',
-  marker = (mark) => `# ${mark} generated by mrm`,
-  path,
-  block: blockName,
-  // insertBefore = 'begin',
-  insertAfter,
-}) {
-  const EOL = '\n';
-  const beginBlock = marker(markerBegin);
-  const endBlock = marker(markerEnd);
-
-  /**
-   * @param {string} content
-   */
-  function findBlock(content) {
-    const startIndex = content.indexOf(beginBlock);
-    const endIndex = content.indexOf(endBlock) + endBlock.length;
-
-    return {
-      endIndex,
-      exists: startIndex >= 0 && endIndex >= 0,
-      startIndex,
-    };
-  }
-
-  /**
-   * @param {string} fullContent
-   * @param {string} blockContent
-   */
-  function apply(fullContent, blockContent) {
-    const found = findBlock(fullContent);
-    const replaceBlock = beginBlock + EOL + blockContent + EOL + endBlock;
-
-    if (found.exists) {
-      return fullContent.slice(0, Math.max(0, found.startIndex)) + replaceBlock + fullContent.slice(found.endIndex);
-    }
-
-    // insert
-    if (insertAfter === 'end') {
-      return fullContent + EOL + replaceBlock;
-    }
-
-    // if (insertBefore === 'begin') {
-    return replaceBlock + EOL + fullContent;
-    // }
-  }
-
-  const sourceFile = file(path);
-  const sourceContent = sourceFile.get();
-  sourceFile.save(apply(sourceContent, blockName));
-}
-
-module.exports = block;

package/core/file.js

@@ -1,29 +0,0 @@
-const { file: mrmFile } = require('mrm-core');
-
-/**
- *
- * @param {{
- *   path: string,
- *   state: 'file'|'absent',
- *   update?: (content: string) => string | undefined,
- * }} options
- */
-function file({ path, state, update }) {
-  const fileHandler = mrmFile(path);
-  if (state === 'file') {
-    if (update) {
-      const newContent = update(fileHandler.get());
-      if (newContent != null) {
-        fileHandler.save(newContent);
-      }
-    } else if (!fileHandler.exists()) {
-      fileHandler.save('');
-    }
-  } else {
-    fileHandler.delete();
-  }
-}
-
-module.exports = {
-  file,
-};