@w5s/mrm-preset 2.6.0 → 2.6.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.
Files changed (12) hide show
  1. package/.turbo/turbo-build.log +6 -6
  2. package/.turbo/turbo-lint.log +6 -6
  3. package/.turbo/turbo-test.log +75 -89
  4. package/CHANGELOG.md +13 -0
  5. package/ci/_gitlab/AutoDevopsInclude.gitlab-ci.yml +1 -1
  6. package/ci/_gitlab/Renovate.gitlab-ci.yml +1 -1
  7. package/ci/github.js +1 -1
  8. package/core/turbo.js +6 -5
  9. package/githooks/index.js +7 -0
  10. package/package.json +3 -3
  11. package/package.json.backup +3 -3
  12. package/project/index.js +3 -1
package/.turbo/turbo-build.log CHANGED
@@ -1,6 +1,6 @@
1
- [1] : exited with code 0
2
- [tsc]
3
- [tsc] > @w5s/mrm-preset@2.5.1 build:tsc
4
- [tsc] > tsc --noEmit --skipLibCheck
5
- [tsc]
6
- [tsc] npm run build:tsc exited with code 0
1
+ [1] : exited with code 0
2
+ [tsc]
3
+ [tsc] > @w5s/mrm-preset@2.6.1 build:tsc
4
+ [tsc] > tsc --noEmit --skipLibCheck
5
+ [tsc]
6
+ [tsc] npm run build:tsc exited with code 0
package/.turbo/turbo-lint.log CHANGED
@@ -1,6 +1,6 @@
1
- [1] : exited with code 0
2
- [src]
3
- [src] > @w5s/mrm-preset@2.5.1 lint:src
4
- [src] > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
5
- [src]
6
- [src] npm run lint:src exited with code 0
1
+ [1] : exited with code 0
2
+ [src]
3
+ [src] > @w5s/mrm-preset@2.6.1 lint:src
4
+ [src] > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
5
+ [src]
6
+ [src] npm run lint:src exited with code 0
package/.turbo/turbo-test.log CHANGED
@@ -1,89 +1,75 @@
1
- [1] : exited with code 0
2
- [script]
3
- [script] > @w5s/mrm-preset@2.5.1 test:script
4
- [script] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
5
- [script]
6
- [script] mkdir: _tester: File exists
7
- [script] Running bootstrap...
8
- [script] Running alias configure...
9
- [script] Running gitignore...
10
- [script] Running project...
11
- [script] Update turbo.json
12
- [script] Installing turbo...
13
- [script] npm WARN deprecated read-pkg-up@11.0.0: Renamed to read-package-up
14
- [script]
15
- [script] added 657 packages, and audited 863 packages in 9s
16
- [script]
17
- [script] 204 packages are looking for funding
18
- [script] run `npm fund` for details
19
- [script]
20
- [script] found 0 vulnerabilities
21
- [script] Running contributing...
22
- [script] Running licenses...
23
- [script] Running asdf...
24
- [script] Running release...
25
- [script] Running ci...
26
- [script] Running lang...
27
- [script] Running commitlint...
28
- [script] Running editorconfig...
29
- [script] Running eslint...
30
- [script] Installing @w5s/eslint-config...
31
- [script] npm WARN ERESOLVE overriding peer dependency
32
- [script] npm WARN ERESOLVE overriding peer dependency
33
- [script] npm ERR! code ERESOLVE
34
- [script] npm ERR! ERESOLVE could not resolve
35
- [script] npm ERR!
36
- [script] npm ERR! While resolving: @w5s/eslint-config@2.0.19
37
- npm ERR! Found: eslint@9.3.0
38
- [script] npm ERR! node_modules/eslint
39
- [script] npm ERR! peer eslint@"^8.56.0" from @typescript-eslint/parser@7.12.0
40
- [script] npm ERR! node_modules/@w5s/eslint-config/node_modules/@typescript-eslint/parser
41
- [script] npm ERR! @typescript-eslint/parser@"^7.0.0" from @w5s/eslint-config@2.0.19
42
- npm ERR! node_modules/@w5s/eslint-config
43
- [script] npm ERR! dev @w5s/eslint-config@"2.0.19" from the root project
44
- [script] npm ERR! peer @typescript-eslint/parser@"^7.0.0" from @typescript-eslint/eslint-plugin@7.12.0
45
- [script] npm ERR! node_modules/@w5s/eslint-config/node_modules/@typescript-eslint/eslint-plugin
46
- [script] npm ERR! @typescript-eslint/eslint-plugin@"^7.0.0" from @w5s/eslint-config@2.0.19
47
- npm ERR! node_modules/@w5s/eslint-config
48
- [script] npm ERR! dev @w5s/eslint-config@"2.0.19" from the root project
49
- [script] npm ERR!
50
- [script] npm ERR! Could not resolve dependency:
51
- npm ERR! peerOptional eslint@"8.x" from @w5s/eslint-config@2.0.19
52
- [script] npm ERR! node_modules/@w5s/eslint-config
53
- [script] npm ERR! dev @w5s/eslint-config@"2.0.19" from the root project
54
- [script] npm ERR!
55
- npm ERR! Conflicting peer dependency: eslint@8.57.0
56
- [script] npm ERR! node_modules/eslint
57
- [script] npm ERR! peerOptional eslint@"8.x" from @w5s/eslint-config@2.0.19
58
- [script] npm ERR! node_modules/@w5s/eslint-config
59
- npm ERR! dev @w5s/eslint-config@"2.0.19" from the root project
60
- [script] npm ERR!
61
- [script] npm ERR! Fix the upstream dependency conflict, or retry
62
- [script] npm ERR! this command with --force or --legacy-peer-deps
63
- npm ERR! to accept an incorrect (and potentially broken) dependency resolution.
64
- [script] npm ERR!
65
- npm ERR!
66
- [script] npm ERR! For a full report see:
67
- [script] npm ERR! /Users/julienpolo/.npm/_logs/2024-06-04T20_46_40_737Z-eresolve-report.txt
68
- [script]
69
- [script] npm ERR! A complete log of this run can be found in: /Users/julienpolo/.npm/_logs/2024-06-04T20_46_40_737Z-debug-0.log
70
- [script] Running cspell...
71
- [script] Running vitest...
72
- [script] Running renovate...
73
- [script] Running githooks...
74
- [script] Running post-configure...
75
- [script] Error: to format code
76
- [script]
77
- [script] > _tester@1.0.0-alpha.0 format
78
- [script] > concurrently "npm:format:*" ":"
79
- [script]
80
- [script] [1] : exited with code 0
81
- [script] [root]
82
- [script] [root] > _tester@1.0.0-alpha.0 format:root
83
- [script] [root] > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml --fix
84
- [script] [root]
85
- [script] [root] Invalid option '--ext' - perhaps you meant '-c'?
86
- [script] [root] You're using eslint.config.js, some command line flags are no longer available. Please see https://eslint.org/docs/latest/use/command-line-interface for details.
87
- [script] [root] npm run format:root exited with code 2
88
- [script]
89
- [script] npm run test:script exited with code 0
1
+ [1] : exited with code 0
2
+ [script]
3
+ [script] > @w5s/mrm-preset@2.6.1 test:script
4
+ [script] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
5
+ [script]
6
+ [script] mkdir: _tester: File exists
7
+ [script] Running bootstrap...
8
+ [script] Running alias configure...
9
+ [script] Running gitignore...
10
+ [script] Running project...
11
+ [script] Update turbo.json
12
+ [script] Running contributing...
13
+ [script] Running licenses...
14
+ [script] Running asdf...
15
+ [script] Running release...
16
+ [script] Running ci...
17
+ [script] Running lang...
18
+ [script] Running commitlint...
19
+ [script] Running editorconfig...
20
+ [script] Running eslint...
21
+ [script] Installing @w5s/eslint-config...
22
+ [script] npm warn ERESOLVE overriding peer dependency
23
+ [script] npm warn ERESOLVE overriding peer dependency
24
+ [script] npm error code ERESOLVE
25
+ [script] npm error ERESOLVE could not resolve
26
+ [script] npm error
27
+ [script] npm error While resolving: @w5s/eslint-config@2.0.20
28
+ [script] npm error Found: eslint@9.3.0
29
+ [script] npm error node_modules/eslint
30
+ [script] npm error peer eslint@"^8.56.0" from @typescript-eslint/eslint-plugin@7.13.1
31
+ [script] npm error node_modules/@w5s/eslint-config/node_modules/@typescript-eslint/eslint-plugin
32
+ [script] npm error @typescript-eslint/eslint-plugin@"^7.0.0" from @w5s/eslint-config@2.0.20
33
+ [script] npm error node_modules/@w5s/eslint-config
34
+ [script] npm error dev @w5s/eslint-config@"2.0.20" from the root project
35
+ [script] npm error
36
+ [script] npm error Could not resolve dependency:
37
+ [script] npm error peerOptional eslint@"8.x" from @w5s/eslint-config@2.0.20
38
+ [script] npm error node_modules/@w5s/eslint-config
39
+ [script] npm error dev @w5s/eslint-config@"2.0.20" from the root project
40
+ [script] npm error
41
+ [script] npm error Conflicting peer dependency: eslint@8.57.0
42
+ [script] npm error node_modules/eslint
43
+ [script] npm error peerOptional eslint@"8.x" from @w5s/eslint-config@2.0.20
44
+ [script] npm error node_modules/@w5s/eslint-config
45
+ [script] npm error dev @w5s/eslint-config@"2.0.20" from the root project
46
+ [script] npm error
47
+ [script] npm error Fix the upstream dependency conflict, or retry
48
+ [script] npm error this command with --force or --legacy-peer-deps
49
+ [script] npm error to accept an incorrect (and potentially broken) dependency resolution.
50
+ [script] npm error
51
+ [script] npm error
52
+ [script] npm error For a full report see:
53
+ [script] npm error /Users/julienpolo/.npm/_logs/2024-06-23T22_22_35_195Z-eresolve-report.txt
54
+ [script]
55
+ [script] npm error A complete log of this run can be found in: /Users/julienpolo/.npm/_logs/2024-06-23T22_22_35_195Z-debug-0.log
56
+ [script] Running cspell...
57
+ [script] Running vitest...
58
+ [script] Running renovate...
59
+ [script] Running githooks...
60
+ [script] Running post-configure...
61
+ [script] Error: to format code
62
+ [script]
63
+ [script] > _tester@1.0.0-alpha.0 format
64
+ [script] > concurrently "npm:format:*" ":"
65
+ [script]
66
+ [script] [1] : exited with code 0
67
+ [script] [root]
68
+ [script] [root] > _tester@1.0.0-alpha.0 format:root
69
+ [script] [root] > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml --fix
70
+ [script] [root]
71
+ [script] [root] Invalid option '--ext' - perhaps you meant '-c'?
72
+ [script] [root] You're using eslint.config.js, some command line flags are no longer available. Please see https://eslint.org/docs/latest/use/command-line-interface for details.
73
+ [script] [root] npm run format:root exited with code 2
74
+ [script]
75
+ [script] npm run test:script exited with code 0
package/CHANGELOG.md CHANGED
@@ -3,6 +3,19 @@
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.6.2](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.6.1...@w5s/mrm-preset@2.6.2) (2024-06-23)
7
+
8
+ ### 🐛 Bug Fixes
9
+
10
+ - Fix turbo configuration ([42746fa](https://github.com/w5s/project-config/commit/42746fa))
11
+ - Fix turbo configuration ([a79c41c](https://github.com/w5s/project-config/commit/a79c41c))
12
+
13
+ **Note:** Version bump only for package @w5s/mrm-preset
14
+
15
+ ## [2.6.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.6.0...@w5s/mrm-preset@2.6.1) (2024-06-04)
16
+
17
+ **Note:** Version bump only for package @w5s/mrm-preset
18
+
6
19
  # [2.6.0](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.5.1...@w5s/mrm-preset@2.6.0) (2024-06-04)
7
20
 
8
21
  ### ✨ Features
package/ci/_gitlab/AutoDevopsInclude.gitlab-ci.yml CHANGED
@@ -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:928b24aaadbd47c1a7722c563b471195ce54788bf8230ce807e1dd500aec0549
204
+ image: node:lts-alpine@sha256:804aa6a6476a7e2a5df8db28804aa6c1c97904eefb01deed5d6af24bb51d0c81
205
205
 
206
206
  .autodevops_node_install:
207
207
  extends:
package/ci/_gitlab/Renovate.gitlab-ci.yml CHANGED
@@ -13,7 +13,7 @@
13
13
  when: always
14
14
  - when: never
15
15
  image:
16
- name: renovate/renovate@sha256:8e9ea1ceada05790710e6ee16c79d52ae51d961213b178c2d15bb645b95a91b7
16
+ name: renovate/renovate@sha256:49779a4bef523ec804462ab66aaca78b5601cb084e5ab8cf06ac9c32114fc5af
17
17
  entrypoint: ['']
18
18
  script:
19
19
  - >
package/ci/github.js CHANGED
@@ -33,7 +33,7 @@ function task() {
33
33
  'runs-on': 'ubuntu-latest',
34
34
  steps: [
35
35
  { uses: 'actions/checkout@v4' },
36
- { uses: 'dtinth/setup-github-actions-caching-for-turbo@v1' },
36
+ { uses: 'rharkor/caching-for-turbo@v1.3' },
37
37
  {
38
38
  uses: 'actions/setup-node@v3',
39
39
  with: {
package/core/turbo.js CHANGED
@@ -4,7 +4,7 @@ const jsonFile = require('./jsonFile.js');
4
4
 
5
5
  /**
6
6
  * @typedef {{
7
- * $schema: string,
7
+ * $schema?: string,
8
8
  * tasks?: Record<string, unknown>,
9
9
  * globalEnv?: Array<string>,
10
10
  * globalDependencies?: Array<string>,
@@ -25,11 +25,12 @@ function turbo({ state, update }) {
25
25
  jsonFile.value(turboFile, {
26
26
  path: undefined,
27
27
  state,
28
- update,
29
- /** @type {TurboConfig} */
30
- default: {
28
+ update: (previousValue) => ({
31
29
  $schema: 'https://turborepo.org/schema.json',
32
- },
30
+ ...update(previousValue),
31
+ }),
32
+ /** @type {TurboConfig} */
33
+ default: {},
33
34
  });
34
35
 
35
36
  /**
package/githooks/index.js CHANGED
@@ -26,6 +26,13 @@ function task() {
26
26
  ],
27
27
  }),
28
28
  });
29
+ pkg.script(packageFile, {
30
+ name: `${project.prepare}:githooks`,
31
+ state: gitSupported ? 'present' : 'absent',
32
+ // eslint-disable-next-line no-template-curly-in-string
33
+ update: (_) => '[ -n "${CI:-}" ] || git config core.hooksPath .githooks',
34
+ });
35
+
29
36
  gitHook({
30
37
  name: 'pre-commit',
31
38
  content: `npm exec -- lint-staged`,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@w5s/mrm-preset",
3
- "version": "2.6.0",
3
+ "version": "2.6.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.2.1",
27
+ "@w5s/dev": "^2.2.2",
28
28
  "debug": "^4.3.3",
29
29
  "glob": "^10.0.0",
30
30
  "mrm-core": "^7.0.0",
@@ -37,5 +37,5 @@
37
37
  "publishConfig": {
38
38
  "access": "public"
39
39
  },
40
- "gitHead": "c8835aaa1ff5e3d0c10759b147d9d74bd9bc8a03"
40
+ "gitHead": "9e8b978821dc680b4718b0ec16cbeef794c65405"
41
41
  }
package/package.json.backup CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@w5s/mrm-preset",
3
- "version": "2.6.0",
3
+ "version": "2.6.2",
4
4
  "description": "Mrm configuration presets",
5
5
  "keywords": [
6
6
  "mrm",
@@ -37,7 +37,7 @@
37
37
  "test:script": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
38
38
  },
39
39
  "dependencies": {
40
- "@w5s/dev": "^2.2.1",
40
+ "@w5s/dev": "^2.2.2",
41
41
  "debug": "^4.3.3",
42
42
  "glob": "^10.0.0",
43
43
  "mrm-core": "^7.0.0",
@@ -56,5 +56,5 @@
56
56
  "publishConfig": {
57
57
  "access": "public"
58
58
  },
59
- "gitHead": "c8835aaa1ff5e3d0c10759b147d9d74bd9bc8a03"
59
+ "gitHead": "9e8b978821dc680b4718b0ec16cbeef794c65405"
60
60
  }
package/project/index.js CHANGED
@@ -253,7 +253,9 @@ function task() {
253
253
  state: 'present',
254
254
  update: (_) => ({
255
255
  ..._,
256
- globalEnv: Array.from(new Set([...(_.globalEnv ?? []), 'CI', 'DATABASE_URL', 'HOME', 'NODE_ENV'])).sort(),
256
+ globalEnv: Array.from(
257
+ new Set([...(_.globalEnv ?? []), 'ASDF_*', 'CI', 'CI_*', 'DATABASE_URL', 'NODE_ENV'])
258
+ ).sort(),
257
259
  globalDependencies: ['tsconfig.settings.json'],
258
260
  tasks: {
259
261
  ..._.tasks,