@w5s/mrm-preset 2.5.1 → 2.6.1

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 (13) hide show
  1. package/.turbo/turbo-build.log +6 -7
  2. package/.turbo/turbo-format.log +6 -0
  3. package/.turbo/turbo-lint.log +6 -7
  4. package/.turbo/turbo-spellcheck.log +1 -2
  5. package/.turbo/turbo-test.log +89 -30
  6. package/CHANGELOG.md +12 -0
  7. package/ci/_gitlab/AutoDevopsInclude.gitlab-ci.yml +1 -1
  8. package/ci/_gitlab/Renovate.gitlab-ci.yml +1 -1
  9. package/core/turbo.js +2 -1
  10. package/githooks/index.js +7 -0
  11. package/package.json +3 -3
  12. package/package.json.backup +3 -3
  13. package/project/index.js +4 -3
package/.turbo/turbo-build.log CHANGED
@@ -1,7 +1,6 @@
1
-
2
- [1] : exited with code 0
3
- [tsc]
4
- [tsc] > @w5s/mrm-preset@2.3.6 build:tsc
5
- [tsc] > tsc --noEmit --skipLibCheck
6
- [tsc]
7
- [tsc] npm run build:tsc exited with code 0
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
package/.turbo/turbo-format.log ADDED
@@ -0,0 +1,6 @@
1
+ [1] : exited with code 0
2
+ [src]
3
+ [src] > @w5s/mrm-preset@2.5.1 format:src
4
+ [src] > eslint . --fix --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
5
+ [src]
6
+ [src] npm run format:src exited with code 0
package/.turbo/turbo-lint.log CHANGED
@@ -1,7 +1,6 @@
1
-
2
- [1] : exited with code 0
3
- [src]
4
- [src] > @w5s/mrm-preset@2.3.6 lint:src
5
- [src] > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
6
- [src]
7
- [src] npm run lint:src exited with code 0
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
package/.turbo/turbo-spellcheck.log CHANGED
@@ -1,2 +1 @@
1
-
2
- CSpell: Files checked: 52, Issues found: 0 in 0 files
1
+ CSpell: Files checked: 52, Issues found: 0 in 0 files.
package/.turbo/turbo-test.log CHANGED
@@ -1,30 +1,89 @@
1
-
2
- [1] : exited with code 0
3
- [script]
4
- [script] > @w5s/mrm-preset@2.3.6 test:script
5
- [script] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
6
- [script]
7
- [script] mkdir: _tester: File exists
8
- [script] Running bootstrap...
9
- [script] Running alias configure...
10
- [script] Running gitignore...
11
- [script] Running project...
12
- [script] Update turbo.json
13
- [script] Running contributing...
14
- [script] Running licenses...
15
- [script] Running asdf...
16
- [script] Running release...
17
- [script] Running ci...
18
- [script] Running lang...
19
- [script] Update tsconfig.json
20
- [script] Running commitlint...
21
- [script] Update .vscode/extensions.json
22
- [script] Running editorconfig...
23
- [script] Running eslint...
24
- [script] Running cspell...
25
- [script] Update .cspell.json
26
- [script] Running vitest...
27
- [script] Running renovate...
28
- [script] Running githooks...
29
- [script] Running post-configure...
30
- [script] npm run test:script exited with code 0
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
package/CHANGELOG.md CHANGED
@@ -3,6 +3,18 @@
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.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.6.0...@w5s/mrm-preset@2.6.1) (2024-06-04)
7
+
8
+ **Note:** Version bump only for package @w5s/mrm-preset
9
+
10
+ # [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)
11
+
12
+ ### ✨ Features
13
+
14
+ - Upgrade to turbo v2 ([8864979](https://github.com/w5s/project-config/commit/8864979))
15
+
16
+ **Note:** Version bump only for package @w5s/mrm-preset
17
+
6
18
  ## [2.5.1](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@2.5.0...@w5s/mrm-preset@2.5.1) (2024-05-24)
7
19
 
8
20
  **Note:** Version bump only for package @w5s/mrm-preset
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:a7b980c958bfe4d84ee9263badd95a40c8bb50ad5afdb87902c187fefaef0e24
204
+ image: node:lts-alpine@sha256:4702a049d90065ae8c73be28a9c9e32f8ee33c10e81bb25ebc040feb0eb81636
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:1601c02bbb4d2bc40012cdadd8df42ea186123c4f9574a1d108a849e48cb856b
16
+ name: renovate/renovate@sha256:e680694925d60352213186a226cc1eccc637a86064c957e1cd4d925a0c4dd177
17
17
  entrypoint: ['']
18
18
  script:
19
19
  - >
package/core/turbo.js CHANGED
@@ -5,7 +5,8 @@ const jsonFile = require('./jsonFile.js');
5
5
  /**
6
6
  * @typedef {{
7
7
  * $schema: string,
8
- * pipeline?: Record<string, unknown>,
8
+ * tasks?: Record<string, unknown>,
9
+ * globalEnv?: Array<string>,
9
10
  * globalDependencies?: Array<string>,
10
11
  * }} TurboConfig
11
12
  */
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.5.1",
3
+ "version": "2.6.1",
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.0",
27
+ "@w5s/dev": "^2.2.1",
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": "82c472e8ba92e7e7b29be093654361b5e075b24f"
40
+ "gitHead": "f644cf82a94dfb6b59dbbcf7a722e40b94c485b2"
41
41
  }
package/package.json.backup CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@w5s/mrm-preset",
3
- "version": "2.5.1",
3
+ "version": "2.6.1",
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.0",
40
+ "@w5s/dev": "^2.2.1",
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": "82c472e8ba92e7e7b29be093654361b5e075b24f"
59
+ "gitHead": "f644cf82a94dfb6b59dbbcf7a722e40b94c485b2"
60
60
  }
package/project/index.js CHANGED
@@ -253,8 +253,10 @@ function task() {
253
253
  state: 'present',
254
254
  update: (_) => ({
255
255
  ..._,
256
- pipeline: {
257
- ..._.pipeline,
256
+ globalEnv: Array.from(new Set([...(_.globalEnv ?? []), 'CI', 'DATABASE_URL', 'HOME', 'NODE_ENV'])).sort(),
257
+ globalDependencies: ['tsconfig.settings.json'],
258
+ tasks: {
259
+ ..._.tasks,
258
260
  [project.build]: {
259
261
  dependsOn: [`^${project.build}`, `//#${project.build}:root`],
260
262
  outputs: ['lib/**', 'dist/**', '.next/**'],
@@ -293,7 +295,6 @@ function task() {
293
295
  cache: false,
294
296
  },
295
297
  },
296
- globalDependencies: ['tsconfig.settings.json'],
297
298
  }),
298
299
  });
299
300