@w5s/mrm-preset 2.1.1 → 2.2.0

package/.turbo/turbo-build.log

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

package/.turbo/turbo-format.log

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

package/.turbo/turbo-lint.log

@@ -1,6 +1,6 @@
 [1] : exited with code 0
 [src] 
-[src] > @w5s/mrm-preset@2.0.0 lint:src
+[src] > @w5s/mrm-preset@2.1.1 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-test.log

@@ -1,6 +1,6 @@
 [1] : exited with code 0
 [script] 
-[script] > @w5s/mrm-preset@2.1.0 test:script
+[script] > @w5s/mrm-preset@2.1.1 test:script
 [script] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
 [script] 
 [script] mkdir: _tester: File exists
@@ -8,20 +8,16 @@
 [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,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.2.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.1.1...@w5s/mrm-preset@2.2.0) (2023-10-15)
+
+### ✨ Features
+
+- Improve editorconfig file ([443848c](https://github.com/w5s/project-config/commit/443848c))
+- Improve gitignore generation ([f180f40](https://github.com/w5s/project-config/commit/f180f40))
+
+### 🐛 Bug Fixes
+
+- Move editorconfig managed to beginning of file ([174d200](https://github.com/w5s/project-config/commit/174d200))
+- Remove trailing new end line ([68edf14](https://github.com/w5s/project-config/commit/68edf14))
+- Use checkout@v4 action ([e6ab4a7](https://github.com/w5s/project-config/commit/e6ab4a7))
+
+**Note:** Version bump only for package @w5s/mrm-preset
+
 ## [2.1.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.1.0...@w5s/mrm-preset@2.1.1) (2023-10-15)
 
 **Note:** Version bump only for package @w5s/mrm-preset

package/bootstrap/index.js

@@ -2,7 +2,7 @@ const path = require('node:path');
 const { packageJson } = require('mrm-core');
 const npm = require('../core/npm.js');
 const pkg = require('../core/pkg.js');
-const { gitIgnoreTemplate } = require('../core/git.js');
+const { gitIgnore } = require('../core/git.js');
 
 /**
  * @param {{
@@ -25,7 +25,7 @@ function task({ mrmPreset, mrmTask, packageManager }) {
     license: 'UNLICENSED',
     description: '',
   }).save();
-  gitIgnoreTemplate(['macOS', 'NodeJS', 'VisualStudioCode']);
+  gitIgnore(['macOS', 'NodeJS', 'VisualStudioCode']);
 
   npm.bootstrap(packageManager);
 

package/ci/github.js

@@ -32,7 +32,7 @@ function task() {
         build: {
           'runs-on': 'ubuntu-latest',
           steps: [
-            { uses: 'actions/checkout@v3' },
+            { uses: 'actions/checkout@v4' },
             { uses: 'dtinth/setup-github-actions-caching-for-turbo@v1' },
             {
               uses: 'actions/setup-node@v3',

package/core/git.js

@@ -33,31 +33,36 @@ function trimStartLine(content) {
     .join('\n');
 }
 
-/**
- * @param {string} section
- * @param {string|Array<string>} sectionContent
- */
-function gitIgnore(section, sectionContent) {
-  const EOL = '\n';
+const header = `
+#==================================================================================================
+#                                         ┓ ┏┏━┏┓
+#                                         ┃┃┃┗┓┗┓
+#                                         ┗┻┛┗┛┗┛
+#
+#                                 W5s default gitignore
+#
+#                 ⚠️ THIS IS A GENERATED FILE, SEE THE END OF FILE FOR EDITION
+#
+#==================================================================================================
+`.slice(1, -1);
 
-  return blockSync({
-    block: Array.isArray(sectionContent) ? sectionContent.join(EOL) : trimStartLine(sectionContent),
-    marker: (mark) => `# ${mark.toUpperCase()} ### ${section} ###`,
-    path: '.gitignore',
-  });
-}
-exports.gitIgnore = gitIgnore;
+const footer = `
+#==================================================================================================
+#                             ⬇ Add Project specific rules below ⬇
+#==================================================================================================
+`.slice(1, -1);
 
 /**
  * @param {string[]} flags
  */
-function gitIgnoreTemplate(flags) {
-  flags.forEach((flag) => {
-    // @ts-ignore
-    if (templateMap[flag]) {
-      // @ts-ignore
-      gitIgnore(flag, templateMap[flag]);
-    }
+function gitIgnore(flags) {
+  // @ts-ignore
+  const templateContent = [header, ...flags.map((flag) => trimStartLine(templateMap[flag] ?? '')), footer].join('\n');
+
+  blockSync({
+    block: templateContent,
+    path: '.gitignore',
+    insertPosition: ['before', 'BeginningOfFile'],
   });
 }
-exports.gitIgnoreTemplate = gitIgnoreTemplate;
+exports.gitIgnore = gitIgnore;

package/editorconfig/_editorconfig

@@ -1,3 +1,15 @@
+#==================================================================================================
+#                                         ┓ ┏┏━┏┓
+#                                         ┃┃┃┗┓┗┓
+#                                         ┗┻┛┗┛┗┛
+#
+#                                 W5s default editorconfig
+#
+#                 ⚠️ THIS IS A GENERATED FILE, SEE THE END OF FILE FOR EDITION
+#
+# Generated from https://github.com/w5s/project-config/blob/main/packages/mrm-preset/editorconfig/_editorconfig
+#==================================================================================================
+
 # http://editorconfig.org
 root = true
 
@@ -57,3 +69,7 @@ indent_style = space
 
 [{Makefile,**.mk,**.make}]
 indent_style = tab
+
+#==================================================================================================
+#                             ⬇ Add Project specific rules below ⬇
+#==================================================================================================

package/editorconfig/index.js

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

package/eslint/index.js

@@ -1,7 +1,6 @@
 const { packageJson } = require('mrm-core');
 const pkg = require('../core/pkg.js');
 const npm = require('../core/npm.js');
-const { gitIgnore } = require('../core/git.js');
 const { eslintConfig } = require('../core/eslint.js');
 const project = require('../core/project.js');
 const { vscodeSettings, vscodeRecommendedExtension } = require('../core/vscode.js');
@@ -21,9 +20,6 @@ function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended'
     const hasJSON = true;
     const hasYAML = true;
 
-    // Should be added first
-    gitIgnore('ESLint', ['.eslintcache']);
-
     // Dependencies
     npm.dependency({
       dev: true,

package/gitignore/index.js

@@ -1,7 +1,7 @@
-const { gitIgnoreTemplate } = require('../core/git.js');
+const { gitIgnore } = require('../core/git.js');
 
 function task() {
-  gitIgnoreTemplate(['macOS', 'NodeJS', 'VisualStudioCode']);
+  gitIgnore(['macOS', 'NodeJS', 'VisualStudioCode']);
 }
 task.description = 'Adds Gitignore file';
 

package/lang/index.js

@@ -1,7 +1,6 @@
 const path = require('node:path');
 const { json, file, template, packageJson } = require('mrm-core');
 const npm = require('../core/npm.js');
-const { gitIgnore } = require('../core/git.js');
 const project = require('../core/project.js');
 // const { typedoc } = require('../core/typedoc.js');
 const pkg = require('../core/pkg.js');
@@ -32,9 +31,6 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
     const tsConfigSettings = json(tsConfigSettingsName);
     const tsConfig = json('tsconfig.json');
 
-    // Should be run first
-    gitIgnore('Typescript', ['lib/', 'dist/', '*.tsbuildinfo', 'typings/']);
-
     // const excludeList = ['**/*.test.*', '**/*.spec.*', '**/__tests__/**'];
     if (hasWorkspaces) {
       tsConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e7a31018a843da7bbcc5ddac2a32a7fd2630c951"
+  "gitHead": "b6025c8720d5f700b477d5d144dc6865a29f9f15"
 }

package/package.json.backup

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -56,5 +56,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e7a31018a843da7bbcc5ddac2a32a7fd2630c951"
+  "gitHead": "b6025c8720d5f700b477d5d144dc6865a29f9f15"
 }