@w5s/mrm-preset 1.1.1 → 1.2.1

package/.turbo/turbo-build.log

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

package/.turbo/turbo-lint.log

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

@@ -1,6 +1,6 @@
 [1] : exited with code 0
 [script] 
-[script] > @w5s/mrm-preset@1.1.0 test:script
+[script] > @w5s/mrm-preset@1.2.0 test:script
 [script] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
 [script] 
 [script] mkdir: _tester: File exists
@@ -8,43 +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] Installing @w5s/eslint-config...
-[script] npm ERR! code ERESOLVE
-[script] npm ERR! ERESOLVE unable to resolve dependency tree
-[script] npm ERR! 
-[script] npm ERR! While resolving: _tester@1.0.0-alpha.0
-[script] npm ERR! Found: prettier@3.0.0
-[script] npm ERR! node_modules/prettier
-[script] npm ERR!   dev prettier@"^3.0.0" from the root project
-[script] npm ERR! 
-[script] npm ERR! Could not resolve dependency:
-npm ERR! peer prettier@"2.x" from @w5s/eslint-config@1.1.1
-[script] npm ERR! node_modules/@w5s/eslint-config
-[script] npm ERR!   dev @w5s/eslint-config@"1.1.1" from the root project
-[script] npm ERR! 
-[script] npm ERR! Fix the upstream dependency conflict, or retry
-[script] npm ERR! this command with --force or --legacy-peer-deps
-[script] npm ERR! to accept an incorrect (and potentially broken) dependency resolution.
-[script] npm ERR! 
-[script] npm ERR! 
-[script] npm ERR! For a full report see:
-[script] npm ERR! /Users/julienpolo/Library/Caches/npm/_logs/2023-07-12T19_18_18_503Z-eresolve-report.txt
-[script] 
-[script] npm ERR! A complete log of this run can be found in:
-npm ERR!     /Users/julienpolo/Library/Caches/npm/_logs/2023-07-12T19_18_18_503Z-debug-0.log
 [script] Running cspell...
-[script] Update .cspell.json
 [script] Running vitest...
 [script] Running renovate...
 [script] Running githooks...

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 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)
+
+
+### 🐛 Bug Fixes
+
+- 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

package/asdf/index.js

@@ -0,0 +1,16 @@
+const { asdfConfig } = require('../core/asdf.js');
+
+function task() {
+  asdfConfig({
+    state: 'present',
+    update: (config) => ({
+      nodejs: '18.17.0',
+      ...config,
+    }),
+  });
+}
+
+task.description = 'Configure ASDF';
+task.parameters = {};
+
+module.exports = task;

package/ci/github.js

@@ -33,11 +33,11 @@ function task() {
           'runs-on': 'ubuntu-latest',
           steps: [
             { uses: 'actions/checkout@v3' },
+            { uses: 'dtinth/setup-github-actions-caching-for-turbo@v1' },
             {
-              name: 'Use Node.js',
               uses: 'actions/setup-node@v3',
               with: {
-                'node-version': 'lts/*',
+                'node-version-file': '.tool-versions',
                 cache: packageManager,
               },
             },

package/config.json

@@ -5,6 +5,7 @@
       "project",
       "contributing",
       "licenses",
+      "asdf",
       "release",
       "ci",
       "lang",

package/core/asdf.js

@@ -0,0 +1,41 @@
+const { file } = require('mrm-core');
+
+/**
+ * @typedef {{ [tool: string]: string }} ASDFConfig
+ */
+/**
+ * @param {{
+ *   state: 'present'|'absent',
+ *   update?: (config: ASDFConfig) => ASDFConfig
+ * }} options
+ */
+function asdfConfig({ state, update }) {
+  const hasASDF = state === 'present';
+  const toolVersionsFile = file('.tool-versions');
+
+  if (hasASDF) {
+    const eol = '\n';
+    const content = toolVersionsFile.get();
+    const parsed = Object.fromEntries(
+      content
+        .split(eol)
+        .map((_) => _.split(/\s+/, 2))
+        .filter((_) => _[0] !== '')
+    );
+
+    // @ts-ignore
+    const updated = update ? update(parsed) : parsed;
+
+    const formatted = Object.keys(updated)
+      .map((tool) => `${tool} ${updated[tool]}`)
+      .join(eol);
+
+    toolVersionsFile.save(formatted);
+  } else {
+    toolVersionsFile.delete();
+  }
+}
+
+module.exports = {
+  asdfConfig,
+};

package/core/githubCI.js

@@ -1,6 +1,6 @@
-const { yaml } = require('mrm-core');
 const path = require('node:path');
 const fs = require('node:fs');
+const { yaml } = require('mrm-core');
 
 const FILE_PATH = '.github/workflows';
 

package/core/pkg.js

@@ -5,11 +5,11 @@
  * @typedef {string|boolean|number|null|Array<unknown>|Record<string, unknown>} JsonValue
  */
 
+const path = require('node:path');
 // @ts-ignore
 const { intersect } = require('semver-intersect');
 const { packageJson, file, json } = require('mrm-core');
 const glob = require('glob');
-const path = require('node:path');
 const jsonFile = require('./jsonFile.js');
 
 /**

package/core/vitest.js

@@ -1,5 +1,5 @@
-const { file, packageJson } = require('mrm-core');
 const fs = require('node:fs');
+const { file, packageJson } = require('mrm-core');
 const pkg = require('./pkg.js');
 const npm = require('./npm.js');
 const project = require('./project.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -21,18 +21,7 @@
   "type": "commonjs",
   "main": "config.json",
   "scripts": {
-    "build": "concurrently \"npm:build:*\" \":\"",
-    "build:tsc": "tsc --noEmit --skipLibCheck",
-    "clean": "concurrently \"npm:clean:*\" \":\"",
-    "docs": "node ../../markdown.mjs",
-    "format": "concurrently \"npm:format:*\" \":\"",
-    "format:src": "eslint . --fix --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml",
-    "lint": "concurrently \"npm:lint:*\" \":\"",
-    "lint:src": "eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml",
-    "prepare": "concurrently \"npm:prepare:*\" \":\"",
-    "spellcheck": "cspell --no-progress '**'",
-    "test": "concurrently \"npm:test:*\" \":\"",
-    "test:script": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
+    "postpack": "npx clean-package restore"
   },
   "dependencies": {
     "debug": "^4.3.3",
@@ -41,16 +30,11 @@
     "semver-intersect": "^1.4.0",
     "sync-directory": "^6.0.0"
   },
-  "devDependencies": {
-    "@types/debug": "4.1.8",
-    "mrm": "4.1.17",
-    "mrm-preset-default": "4.1.11"
-  },
   "engines": {
     "node": ">=16.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "80e6661d57dd6ed7a832f7e34fe3eab7adcddb88"
+  "gitHead": "16aaafb3d78f8485ca110ee2842005e6b938111b"
 }

package/package.json.backup

@@ -0,0 +1,59 @@
+{
+  "name": "@w5s/mrm-preset",
+  "version": "1.2.1",
+  "description": "Mrm configuration presets",
+  "keywords": [
+    "mrm",
+    "config",
+    "bootstrap"
+  ],
+  "homepage": "https://github.com/w5s/project-config/blob/main/packages/mrm-preset#readme",
+  "bugs": {
+    "url": "https://github.com/w5s/project-config.git/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:w5s/project-config.git",
+    "directory": "packages/mrm-preset"
+  },
+  "license": "MIT",
+  "author": "Julien Polo <julien.polo@gmail.com>",
+  "type": "commonjs",
+  "main": "config.json",
+  "scripts": {
+    "build": "concurrently \"npm:build:*\" \":\"",
+    "build:tsc": "tsc --noEmit --skipLibCheck",
+    "clean": "concurrently \"npm:clean:*\" \":\"",
+    "docs": "node ../../markdown.mjs",
+    "format": "concurrently \"npm:format:*\" \":\"",
+    "format:src": "eslint . --fix --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml",
+    "lint": "concurrently \"npm:lint:*\" \":\"",
+    "lint:src": "eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml",
+    "postpack": "npx clean-package restore",
+    "prepack": "npx clean-package",
+    "prepare": "concurrently \"npm:prepare:*\" \":\"",
+    "spellcheck": "cspell --no-progress '**'",
+    "test": "concurrently \"npm:test:*\" \":\"",
+    "test:script": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
+  },
+  "dependencies": {
+    "debug": "^4.3.3",
+    "glob": "^10.0.0",
+    "mrm-core": "^7.0.0",
+    "semver-intersect": "^1.4.0",
+    "sync-directory": "^6.0.0"
+  },
+  "devDependencies": {
+    "@types/debug": "4.1.8",
+    "mrm": "4.1.17",
+    "mrm-preset-default": "4.1.11"
+  },
+  "clean-package": "../../clean-package.config.cjs",
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "16aaafb3d78f8485ca110ee2842005e6b938111b"
+}

package/project/index.js

@@ -254,6 +254,7 @@ function task() {
     update: (_) => ({
       ..._,
       pipeline: {
+        ..._.pipeline,
         [project.build]: {
           dependsOn: [`^${project.build}`, `//#${project.build}:root`],
           outputs: ['lib/**', 'dist/**', '.next/**'],
@@ -272,7 +273,11 @@ function task() {
           dependsOn: [`//#${project.format}:root`],
         },
         [`//#${project.format}:root`]: {},
-        [project.docs]: {},
+        [project.docs]: {
+          dependsOn: [`//#${project.docs}:root`],
+          cache: false,
+        },
+        [`//#${project.docs}:root`]: {},
         [project.spellcheck]: {
           dependsOn: [`//#${project.spellcheck}:root`],
         },