@w5s/mrm-preset 2.11.1 → 2.11.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,6 @@
1
-
2
- > @w5s/mrm-preset@2.11.0 build:tsc
3
- > tsc
4
-
1
+
2
+ 
3
+ > @w5s/mrm-preset@2.11.1 build:tsc
4
+ > tsc
5
+
6
+ ⠙⠙
@@ -1,4 +1,4 @@
1
1
 
2
- > @w5s/mrm-preset@2.11.0 lint:src
2
+ > @w5s/mrm-preset@2.11.1 lint:src
3
3
  > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
4
4
 
@@ -1,4 +1,4 @@
1
1
 
2
- > @w5s/mrm-preset@2.11.1 prepare:empty
2
+ > @w5s/mrm-preset@2.11.2 prepare:empty
3
3
  > :
4
4
 
@@ -1,5 +1,5 @@
1
1
 
2
- > @w5s/mrm-preset@2.11.0 test:script
2
+ > @w5s/mrm-preset@2.11.1 test:script
3
3
  > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
4
4
 
5
5
  mkdir: _tester: File exists
@@ -20,7 +20,7 @@ Installing @w5s/eslint-config...
20
20
  npm error code ERESOLVE
21
21
  npm error ERESOLVE could not resolve
22
22
  npm error
23
- npm error While resolving: @w5s/eslint-config@2.3.1
23
+ npm error While resolving: @w5s/eslint-config@2.4.0
24
24
  npm error Found: eslint@9.17.0
25
25
  npm error node_modules/eslint
26
26
  npm error peer eslint@"^6.0.0 || ^7.0.0 || >=8.0.0" from @eslint-community/eslint-utils@4.4.1
@@ -30,15 +30,15 @@ npm error dev eslint@"^9.17.0" from the root project
30
30
  npm error 2 more (@typescript-eslint/eslint-plugin, @typescript-eslint/parser)
31
31
  npm error
32
32
  npm error Could not resolve dependency:
33
- npm error peerOptional eslint@"8.x" from @w5s/eslint-config@2.3.1
33
+ npm error peerOptional eslint@"8.x" from @w5s/eslint-config@2.4.0
34
34
  npm error node_modules/@w5s/eslint-config
35
- npm error dev @w5s/eslint-config@"2.3.1" from the root project
35
+ npm error dev @w5s/eslint-config@"2.4.0" from the root project
36
36
  npm error
37
37
  npm error Conflicting peer dependency: eslint@8.57.1
38
38
  npm error node_modules/eslint
39
- npm error peerOptional eslint@"8.x" from @w5s/eslint-config@2.3.1
39
+ npm error peerOptional eslint@"8.x" from @w5s/eslint-config@2.4.0
40
40
  npm error node_modules/@w5s/eslint-config
41
- npm error dev @w5s/eslint-config@"2.3.1" from the root project
41
+ npm error dev @w5s/eslint-config@"2.4.0" from the root project
42
42
  npm error
43
43
  npm error Fix the upstream dependency conflict, or retry
44
44
  npm error this command with --force or --legacy-peer-deps
@@ -46,8 +46,8 @@ npm error to accept an incorrect (and potentially broken) dependency resolution.
46
46
  npm error
47
47
  npm error
48
48
  npm error For a full report see:
49
- npm error /Users/julienpolo/.npm/_logs/2025-01-10T14_15_39_880Z-eresolve-report.txt
50
- npm error A complete log of this run can be found in: /Users/julienpolo/.npm/_logs/2025-01-10T14_15_39_880Z-debug-0.log
49
+ npm error /Users/julienpolo/.npm/_logs/2025-02-19T23_32_15_235Z-eresolve-report.txt
50
+ npm error A complete log of this run can be found in: /Users/julienpolo/.npm/_logs/2025-02-19T23_32_15_235Z-debug-0.log
51
51
  Running cspell...
52
52
  Running vitest...
53
53
  Running renovate...
package/CHANGELOG.md CHANGED
@@ -3,6 +3,14 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [2.11.2](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.11.1...@w5s/mrm-preset@2.11.2) (2025-02-19)
7
+
8
+ ### 🐛 Bug Fixes
9
+
10
+ - Fix githook installation ([ee6d054](https://github.com/w5s/project-config/commit/ee6d054))
11
+
12
+ **Note:** Version bump only for package @w5s/mrm-preset
13
+
6
14
  ## [2.11.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.11.0...@w5s/mrm-preset@2.11.1) (2025-01-10)
7
15
 
8
16
  **Note:** Version bump only for package @w5s/mrm-preset
@@ -12,9 +12,9 @@ const { gitIgnore } = require('../core/git.js');
12
12
  * packageArchetype: 'application'|'library'|'workspace',
13
13
  * packageManager: 'npm'|'yarn@classic'|'yarn@berry'
14
14
  * }} config
15
- * @returns {void}
15
+ * @returns {Promise<void>}
16
16
  */
17
- function task({ mrmPreset, mrmTask, packageManager }) {
17
+ async function task({ mrmPreset, mrmTask, packageManager }) {
18
18
  /**
19
19
  * setup package.json from following object
20
20
  */
@@ -28,7 +28,7 @@ function task({ mrmPreset, mrmTask, packageManager }) {
28
28
  }).save();
29
29
  gitIgnore(['macOS', 'NodeJS', 'VisualStudioCode']);
30
30
 
31
- npm.bootstrap(packageManager);
31
+ await npm.bootstrap(packageManager);
32
32
 
33
33
  // npm.dependency({
34
34
  // dev: true,
@@ -201,7 +201,7 @@ variables:
201
201
  # IMAGE_NAME: $CI_REGISTRY_IMAGE
202
202
 
203
203
  .autodevops_node_image:
204
- image: node:lts-alpine@sha256:f2dc6eea95f787e25f173ba9904c9d0647ab2506178c7b5b7c5a3d02bc4af145
204
+ image: node:lts-alpine@sha256:9bef0ef1e268f60627da9ba7d7605e8831d5b56ad07487d24d1aa386336d1944
205
205
 
206
206
  .autodevops_node_install:
207
207
  extends:
@@ -13,7 +13,7 @@
13
13
  when: always
14
14
  - when: never
15
15
  image:
16
- name: renovate/renovate@sha256:085ac6858ef95f8b7c60795f2bad96d4a2b6e464f16677b1055a499b74d59772
16
+ name: renovate/renovate@sha256:07e23101a1cf3e9c231358218d59df6740e0e6479d8e23bc9c0d0ac2720bef70
17
17
  entrypoint: ['']
18
18
  script:
19
19
  - >
package/core/npm.js CHANGED
@@ -1,4 +1,5 @@
1
1
  /* eslint-disable default-param-last */
2
+ const { yarnVersion, yarnConfig } = require('@w5s/dev');
2
3
 
3
4
  /* eslint-disable import/no-extraneous-dependencies */
4
5
  /* cSpell: disable */
@@ -257,19 +258,27 @@ function isYarnBerry() {
257
258
  /**
258
259
  * @param {'npm'|`yarn@${'classic'|'berry'}`} defaultPackageManager
259
260
  */
260
- function bootstrap(defaultPackageManager) {
261
+ async function bootstrap(defaultPackageManager) {
261
262
  const packageFile = json(`./package.json`);
262
263
  const isYarn = isUsingYarn() || defaultPackageManager.startsWith('yarn@');
264
+
263
265
  if (!packageFile.get('packageManager') && isYarn) {
264
- execCommand(undefined, 'yarn', ['set', 'version', 'berry']);
265
- yaml('.yarnrc.yml')
266
- .merge({
267
- nodeLinker: 'node-modules',
268
- })
269
- .save();
270
266
  // Downgrade
271
267
  if (defaultPackageManager.endsWith('@classic')) {
272
- execCommand(undefined, 'yarn', ['set', 'version', 'classic']);
268
+ await yarnVersion({
269
+ state: 'present',
270
+ update: () => 'classic',
271
+ });
272
+ } else {
273
+ await yarnVersion({
274
+ state: 'present',
275
+ update: () => 'berry',
276
+ });
277
+ await yarnConfig({
278
+ key: 'nodeLinker',
279
+ state: 'present',
280
+ update: () => 'node-modules',
281
+ });
273
282
  }
274
283
  }
275
284
 
package/githooks/index.js CHANGED
@@ -31,7 +31,7 @@ function task() {
31
31
  name: `${project.prepare}:githooks`,
32
32
  state: gitSupported ? 'present' : 'absent',
33
33
  // eslint-disable-next-line no-template-curly-in-string
34
- update: (_) => '[ -n "${CI:-}" ] || git config core.hooksPath .githooks',
34
+ update: (_) => 'if [ -z "${CI:-}" ]; then git config core.hooksPath .githooks; fi',
35
35
  });
36
36
  });
37
37
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@w5s/mrm-preset",
3
- "version": "2.11.1",
3
+ "version": "2.11.2",
4
4
  "description": "Mrm configuration presets",
5
5
  "keywords": [
6
6
  "mrm",
@@ -24,7 +24,7 @@
24
24
  "postpack": "npx clean-package restore"
25
25
  },
26
26
  "dependencies": {
27
- "@w5s/dev": "^2.4.0",
27
+ "@w5s/dev": "^2.5.0",
28
28
  "debug": "^4.3.3",
29
29
  "glob": "^11.0.0",
30
30
  "mrm-core": "^7.0.0",
@@ -38,5 +38,5 @@
38
38
  "access": "public"
39
39
  },
40
40
  "sideEffect": false,
41
- "gitHead": "e45ab63ec78541b376bcb56a4b3ab02e41f3960a"
41
+ "gitHead": "dec47d615efa7aadd8cd30f68e9911033ac365e2"
42
42
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@w5s/mrm-preset",
3
- "version": "2.11.1",
3
+ "version": "2.11.2",
4
4
  "description": "Mrm configuration presets",
5
5
  "keywords": [
6
6
  "mrm",
@@ -39,7 +39,7 @@
39
39
  "test:script": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
40
40
  },
41
41
  "dependencies": {
42
- "@w5s/dev": "^2.4.0",
42
+ "@w5s/dev": "^2.5.0",
43
43
  "debug": "^4.3.3",
44
44
  "glob": "^11.0.0",
45
45
  "mrm-core": "^7.0.0",
@@ -59,5 +59,5 @@
59
59
  "access": "public"
60
60
  },
61
61
  "sideEffect": false,
62
- "gitHead": "e45ab63ec78541b376bcb56a4b3ab02e41f3960a"
62
+ "gitHead": "dec47d615efa7aadd8cd30f68e9911033ac365e2"
63
63
  }
@@ -1,6 +0,0 @@
1
-
2
- ⠙⠹
3
- > @w5s/mrm-preset@2.11.0 format:src
4
- > eslint . --fix --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
5
-
6
- ⠙⠙