@markuplint/file-resolver 4.6.1 → 4.7.1-alpha.0
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.
- package/CHANGELOG.md +8 -0
- package/lib/config-provider.js +10 -2
- package/package.json +11 -11
package/CHANGELOG.md
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
# Change Log
|
|
2
|
+
|
|
3
|
+
All notable changes to this project will be documented in this file.
|
|
4
|
+
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
|
+
|
|
6
|
+
## [4.7.1-alpha.0](https://github.com/markuplint/markuplint/compare/@markuplint/file-resolver@4.7.0...@markuplint/file-resolver@4.7.1-alpha.0) (2024-05-04)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @markuplint/file-resolver
|
package/lib/config-provider.js
CHANGED
|
@@ -115,8 +115,16 @@ export class ConfigProvider {
|
|
|
115
115
|
const isMatched = targetFile.matches(glob);
|
|
116
116
|
const config = overrides[glob];
|
|
117
117
|
if (isMatched && config) {
|
|
118
|
-
|
|
119
|
-
|
|
118
|
+
switch (configSet.config.overrideMode) {
|
|
119
|
+
case 'merge': {
|
|
120
|
+
configSet.config = mergeConfig(configSet.config, config);
|
|
121
|
+
break;
|
|
122
|
+
}
|
|
123
|
+
default: /* or "reset" */ {
|
|
124
|
+
configSet.config = config;
|
|
125
|
+
break;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
120
128
|
}
|
|
121
129
|
}
|
|
122
130
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@markuplint/file-resolver",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.7.1-alpha.0",
|
|
4
4
|
"description": "The file resolver of markuplint",
|
|
5
5
|
"repository": "git@github.com:markuplint/markuplint.git",
|
|
6
6
|
"author": "Yusuke Hirao <yusukehirao@me.com>",
|
|
@@ -24,17 +24,17 @@
|
|
|
24
24
|
"clean": "tsc --build --clean"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@types/node": "20.12.
|
|
27
|
+
"@types/node": "20.12.8"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@markuplint/html-parser": "4.
|
|
31
|
-
"@markuplint/ml-ast": "4.
|
|
32
|
-
"@markuplint/ml-config": "4.
|
|
33
|
-
"@markuplint/ml-core": "4.
|
|
34
|
-
"@markuplint/ml-spec": "4.
|
|
35
|
-
"@markuplint/parser-utils": "4.
|
|
36
|
-
"@markuplint/selector": "4.
|
|
37
|
-
"@markuplint/shared": "4.
|
|
30
|
+
"@markuplint/html-parser": "4.6.1-alpha.0",
|
|
31
|
+
"@markuplint/ml-ast": "4.3.1-alpha.0",
|
|
32
|
+
"@markuplint/ml-config": "4.6.1-alpha.0",
|
|
33
|
+
"@markuplint/ml-core": "4.7.1-alpha.0",
|
|
34
|
+
"@markuplint/ml-spec": "4.5.1-alpha.0",
|
|
35
|
+
"@markuplint/parser-utils": "4.6.1-alpha.0",
|
|
36
|
+
"@markuplint/selector": "4.6.1-alpha.0",
|
|
37
|
+
"@markuplint/shared": "4.3.1-alpha.0",
|
|
38
38
|
"cosmiconfig": "9.0.0",
|
|
39
39
|
"debug": "4.3.4",
|
|
40
40
|
"glob": "10.3.12",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"jsonc": "2.0.0",
|
|
43
43
|
"minimatch": "9.0.4"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "d091e2199e3dc6757c2c8edbf01fd19e8b072015"
|
|
46
46
|
}
|