@w5s/mrm-preset 1.2.1 → 1.4.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.0 build:tsc
+[tsc] > @w5s/mrm-preset@1.3.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.0 lint:src
+[src] > @w5s/mrm-preset@1.3.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 +1,6 @@
-[0] : exited with code 0
+[1] : exited with code 0
+[template] 
+[template] > @w5s/mrm-preset@1.4.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.0 test:script
+[script] > @w5s/mrm-preset@1.3.0 test:script
 [script] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
 [script] 
 [script] mkdir: _tester: File exists
@@ -8,16 +8,20 @@
 [script] Running alias configure...
 [script] Running gitignore...
 [script] Running project...
+[script] Update turbo.json
 [script] Running contributing...
 [script] Running licenses...
 [script] Running asdf...
 [script] Running release...
 [script] Running ci...
 [script] Running lang...
+[script] Update tsconfig.json
 [script] Running commitlint...
+[script] Update .vscode/extensions.json
 [script] Running editorconfig...
 [script] Running eslint...
 [script] Running cspell...
+[script] Update .cspell.json
 [script] Running vitest...
 [script] Running renovate...
 [script] Running githooks...

package/CHANGELOG.md

@@ -3,40 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.2.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.2.0...@w5s/mrm-preset@1.2.1) (2023-08-08)
-
+# [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)
 
-### 🐛 Bug Fixes
+### ✨ Features
 
-- Fix doc configuration in mrm ([fe81b1a](https://github.com/w5s/project-config/commit/fe81b1a))
+- 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
 
+- Simplify editorconfig configuration ([7b1a5fd](https://github.com/w5s/project-config/commit/7b1a5fd))
 
+**Note:** Version bump only for package @w5s/mrm-preset
 
-# [1.2.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.1.1...@w5s/mrm-preset@1.2.0) (2023-08-01)
-
+## [1.2.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.2.0...@w5s/mrm-preset@1.2.1) (2023-08-08)
 
-### ✨ Features
+### 🐛 Bug Fixes
 
-- Add support for asdf ([a67f3b5](https://github.com/w5s/project-config/commit/a67f3b5)) - Add support for turbo caching in github actions ([d61aca7](https://github.com/w5s/project-config/commit/d61aca7))
+- Fix doc configuration in mrm ([fe81b1a](https://github.com/w5s/project-config/commit/fe81b1a))
 
 **Note:** Version bump only for package @w5s/mrm-preset
 
+# [1.2.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.1.1...@w5s/mrm-preset@1.2.0) (2023-08-01)
 
+### ✨ Features
 
+- Add support for asdf ([a67f3b5](https://github.com/w5s/project-config/commit/a67f3b5)) - Add support for turbo caching in github actions ([d61aca7](https://github.com/w5s/project-config/commit/d61aca7))
 
+**Note:** Version bump only for package @w5s/mrm-preset
 
 ## [1.1.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.1.0...@w5s/mrm-preset@1.1.1) (2023-07-12)
 
 **Note:** Version bump only for package @w5s/mrm-preset
 
-
-
-
-
 # [1.1.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.4...@w5s/mrm-preset@1.1.0) (2023-07-04)
 
 ### ✨ 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

@@ -0,0 +1,62 @@
+# BEGIN MANAGED BLOCK
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+continuation_indent_size = 4
+curly_bracket_next_line = false
+end_of_line = lf
+indent_brace_style = Stroustrup
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+spaces_around_brackets = outside
+spaces_around_operators = true
+trim_trailing_whitespace = true
+
+[*.{json,json5,webmanifest}]
+indent_size = 2
+indent_style = space
+insert_final_newline = ignore
+
+[*.{yml,yaml}]
+indent_size = 2
+indent_style = space
+
+[*.{bat,reg,ps1,vbs,cs,cmd,fs,ahk}]
+end_of_line = crlf
+
+[*.{sh,zsh}]
+end_of_line = lf
+
+[*.{css,sass,scss,less,pcss}]
+indent_size = 2
+indent_style = space
+max_line_length = 120
+quote_type = single
+
+[*.{js,jsx,jsm,ts,tsx,cjs,cjs,cjsx,cts,ctsx,mjs,mts,mtsx,js.hbs}]
+indent_size = 2
+indent_style = space
+max_line_length = 120
+quote_type = single
+
+[*.{htm,html,svg,vue}]
+indent_size = 2
+indent_style = space
+
+[*.{md,mdwn,mdown,markdown,mdx,apib}]
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = false
+
+[*.{py,robot}]
+indent_size = 4
+indent_style = space
+
+[{Makefile,**.mk,**.make}]
+indent_style = tab
+
+# END MANAGED BLOCK

package/editorconfig/index.js

@@ -1,119 +1,22 @@
-const { ini } = require('mrm-core');
-const createDebug = require('debug');
+const { readFileSync } = require('node:fs');
+const { blockSync } = require('@w5s/dev');
 const { vscodeRecommendedExtension } = require('../core/vscode.js');
 
-/**
- *
- * @param {Record<string, Partial<{
- *   charset: string,
- *   continuation_indent_size: number,
- *   curly_bracket_next_line: boolean,
- *   end_of_line: 'lf'|'crlf',
- *   indent_brace_style: 'Stroustrup',
- *   indent_size: number,
- *   indent_style: 'tab'|'space',
- *   insert_final_newline: boolean|'ignore',
- *   max_line_length: number,
- *   quote_type: 'single'|'double',
- *   root: boolean,
- *   spaces_around_brackets: 'outside',
- *   spaces_around_operators: boolean,
- *   trim_trailing_whitespace: boolean,
- * }>>} defaults
- */
-function createEditorConfig(defaults) {
-  const debug = createDebug('mrm-editorconfig');
+function task() {
+  const templateContent = readFileSync(require.resolve('./_editorconfig'), 'utf8');
 
-  /**
-   * @param {string} section
-   * @param {defaults} existing
-   */
-  function mergeSection(section, existing = {}) {
-    return Object.assign(existing, defaults[section] || {});
-  }
+  blockSync({
+    block: templateContent,
+    path: '.editorconfig',
+    insertPosition: ['after', 'EndOfFile'],
+  });
 
-  function task() {
-    const editorConfigFile = ini('.editorconfig', 'http://editorconfig.org');
-
-    Object.keys(defaults).forEach((name) => {
-      const values = mergeSection(name, editorConfigFile.get(name));
-      debug('section %s: %o', name, values);
-      editorConfigFile.set(name, values);
-    });
-
-    editorConfigFile.save();
-
-    vscodeRecommendedExtension({
-      name: 'editorconfig.editorconfig',
-      state: 'present',
-    });
-  }
-
-  task.description = 'Adds EditorConfig file';
-
-  return task;
+  vscodeRecommendedExtension({
+    name: 'editorconfig.editorconfig',
+    state: 'present',
+  });
 }
 
-module.exports = createEditorConfig({
-  '*': {
-    // eslint-disable-next-line unicorn/text-encoding-identifier-case
-    charset: 'utf-8',
-    continuation_indent_size: 4,
-    curly_bracket_next_line: false,
-    end_of_line: 'lf',
-    indent_brace_style: 'Stroustrup',
-    indent_size: 2,
-    indent_style: 'space',
-    insert_final_newline: true,
-    spaces_around_brackets: 'outside',
-    spaces_around_operators: true,
-    trim_trailing_whitespace: true,
-  },
-  '*.{json,json5,webmanifest}': {
-    indent_size: 2,
-    indent_style: 'space',
-    insert_final_newline: 'ignore',
-  },
-  '*.{yml,yaml}': {
-    indent_size: 2,
-    indent_style: 'space',
-  },
-  '*.{bat,reg,ps1,vbs,cs,cmd,fs,ahk}': {
-    end_of_line: 'crlf',
-  },
-  '*.{sh,zsh}': {
-    end_of_line: 'lf',
-  },
-  '*.{css,sass,scss,less,pcss}': {
-    indent_size: 2,
-    indent_style: 'space',
-    max_line_length: 120,
-    quote_type: 'single',
-  },
-  '*.{js,jsx,jsm,ts,tsx,cjs,cjs,cjsx,cts,ctsx,mjs,mts,mtsx,js.hbs}': {
-    indent_size: 2,
-    indent_style: 'space',
-    max_line_length: 120,
-    quote_type: 'single',
-  },
-  '*.{htm,html,svg,vue}': {
-    indent_size: 2,
-    indent_style: 'space',
-  },
-  '*.{md,mdwn,mdown,markdown,mdx,apib}': {
-    indent_size: 4,
-    indent_style: 'space',
-    insert_final_newline: true,
-    trim_trailing_whitespace: false,
-  },
-  '*.{py,robot}': {
-    indent_size: 4,
-    indent_style: 'space',
-  },
-  Makefile: {
-    indent_style: 'tab',
-  },
-  _global: {
-    root: true,
-  },
-});
+task.description = 'Adds EditorConfig file';
+
+module.exports = task;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -24,6 +24,7 @@
     "postpack": "npx clean-package restore"
   },
   "dependencies": {
+    "@w5s/dev": "^1.5.1",
     "debug": "^4.3.3",
     "glob": "^10.0.0",
     "mrm-core": "^7.0.0",
@@ -36,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16aaafb3d78f8485ca110ee2842005e6b938111b"
+  "gitHead": "7ab5287bc67b525c4bcfe83456c642c5226d900f"
 }

package/package.json.backup

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -32,11 +32,13 @@
     "postpack": "npx clean-package restore",
     "prepack": "npx clean-package",
     "prepare": "concurrently \"npm:prepare:*\" \":\"",
+    "prepare:template": "cp ../../.editorconfig editorconfig/_editorconfig",
     "spellcheck": "cspell --no-progress '**'",
     "test": "concurrently \"npm:test:*\" \":\"",
     "test:script": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
   },
   "dependencies": {
+    "@w5s/dev": "^1.5.1",
     "debug": "^4.3.3",
     "glob": "^10.0.0",
     "mrm-core": "^7.0.0",
@@ -44,8 +46,8 @@
     "sync-directory": "^6.0.0"
   },
   "devDependencies": {
-    "@types/debug": "4.1.8",
-    "mrm": "4.1.17",
+    "@types/debug": "4.1.9",
+    "mrm": "4.1.22",
     "mrm-preset-default": "4.1.11"
   },
   "clean-package": "../../clean-package.config.cjs",
@@ -55,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16aaafb3d78f8485ca110ee2842005e6b938111b"
+  "gitHead": "7ab5287bc67b525c4bcfe83456c642c5226d900f"
 }

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;