@sprucelabs/spruce-cli 21.0.2 → 21.0.4
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 +16 -0
- package/build/features/node/NodeFeature.d.ts +0 -1
- package/build/features/skill/SkillFeature.d.ts +0 -1
- package/build/features/universalDevDependencies.js +0 -1
- package/build/features/universalDevDependencies.js.map +1 -1
- package/build/features/universalScripts.d.ts +0 -1
- package/build/features/universalScripts.js +0 -1
- package/build/features/universalScripts.js.map +1 -1
- package/build/services/LintService.d.ts +1 -0
- package/build/services/LintService.js +4 -1
- package/build/services/LintService.js.map +1 -1
- package/build/writers/AbstractWriter.js +3 -1
- package/build/writers/AbstractWriter.js.map +1 -1
- package/eslint.config.mjs +1 -0
- package/package.json +35 -32
- package/src/features/universalDevDependencies.ts +0 -1
- package/src/features/universalScripts.ts +0 -2
- package/src/services/LintService.ts +7 -3
- package/src/writers/AbstractWriter.ts +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
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
|
+
## [21.0.4](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.3...v21.0.4) (2024-04-24)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [21.0.3](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.2...v21.0.3) (2024-04-23)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
6
22
|
## [21.0.2](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.1...v21.0.2) (2024-04-23)
|
|
7
23
|
|
|
8
24
|
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
@@ -8,7 +8,6 @@ const universalDevDependencies = [
|
|
|
8
8
|
{ name: 'eslint-config-spruce', isDev: true },
|
|
9
9
|
{ name: 'prettier', isDev: true },
|
|
10
10
|
{ name: 'chokidar-cli', isDev: true },
|
|
11
|
-
{ name: 'concurrently', isDev: true },
|
|
12
11
|
{ name: 'tsc-watch', isDev: true },
|
|
13
12
|
{ name: 'ts-node', isDev: true },
|
|
14
13
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"universalDevDependencies.js","sourceRoot":"","sources":["../../src/features/universalDevDependencies.ts"],"names":[],"mappings":";;AAAA,MAAM,wBAAwB,GAAG;IAC7B,EAAE,IAAI,EAAE,kCAAkC,EAAE,KAAK,EAAE,IAAI,EAAE;IACzD,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE;IACnC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;IAC/B,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,IAAI,EAAE;IAC7C,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE;IACjC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE;IACrC,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"universalDevDependencies.js","sourceRoot":"","sources":["../../src/features/universalDevDependencies.ts"],"names":[],"mappings":";;AAAA,MAAM,wBAAwB,GAAG;IAC7B,EAAE,IAAI,EAAE,kCAAkC,EAAE,KAAK,EAAE,IAAI,EAAE;IACzD,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE;IACnC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE;IAC/B,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,IAAI,EAAE;IAC7C,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE;IACjC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE;IACrC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE;IAClC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE;CACnC,CAAA;AAED,kBAAe,wBAAwB,CAAA"}
|
|
@@ -19,7 +19,6 @@ const universalScripts = {
|
|
|
19
19
|
'resolve-paths.lint': 'yarn run build.resolve-paths ; yarn run lint',
|
|
20
20
|
test: 'jest',
|
|
21
21
|
'watch.build.dev': "tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
|
|
22
|
-
'watch.lint': "concurrently 'yarn run lint' \"chokidar 'src/**/*' -c 'yarn run lint.tsc'\"",
|
|
23
22
|
'watch.rebuild': 'yarn run clean.all && yarn install && yarn run watch.build.dev',
|
|
24
23
|
'watch.tsc': 'tsc -w',
|
|
25
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"universalScripts.js","sourceRoot":"","sources":["../../src/features/universalScripts.ts"],"names":[],"mappings":";;AAAA,MAAM,gBAAgB,GAAG;IACrB,UAAU,EACN,qEAAqE;IACzE,WAAW,EAAE,8DAA8D;IAC3E,kBAAkB,EACd,gEAAgE;IACpE,qBAAqB,EACjB,oEAAoE;IACxE,WAAW,EAAE,kCAAkC;IAC/C,KAAK,EAAE,sBAAsB;IAC7B,WAAW,EAAE,qDAAqD;IAClE,aAAa,EAAE,eAAe;IAC9B,oBAAoB,EAAE,kDAAkD;IACxE,UAAU,EAAE,gCAAgC;IAC5C,IAAI,EAAE,0BAA0B;IAChC,UAAU,EAAE,mBAAmB;IAC/B,kBAAkB,EACd,2DAA2D;IAC/D,OAAO,EAAE,0DAA0D;IACnE,qBAAqB,EAAE,qCAAqC;IAC5D,oBAAoB,EAAE,8CAA8C;IACpE,IAAI,EAAE,MAAM;IACZ,iBAAiB,EACb,2EAA2E;IAC/E,
|
|
1
|
+
{"version":3,"file":"universalScripts.js","sourceRoot":"","sources":["../../src/features/universalScripts.ts"],"names":[],"mappings":";;AAAA,MAAM,gBAAgB,GAAG;IACrB,UAAU,EACN,qEAAqE;IACzE,WAAW,EAAE,8DAA8D;IAC3E,kBAAkB,EACd,gEAAgE;IACpE,qBAAqB,EACjB,oEAAoE;IACxE,WAAW,EAAE,kCAAkC;IAC/C,KAAK,EAAE,sBAAsB;IAC7B,WAAW,EAAE,qDAAqD;IAClE,aAAa,EAAE,eAAe;IAC9B,oBAAoB,EAAE,kDAAkD;IACxE,UAAU,EAAE,gCAAgC;IAC5C,IAAI,EAAE,0BAA0B;IAChC,UAAU,EAAE,mBAAmB;IAC/B,kBAAkB,EACd,2DAA2D;IAC/D,OAAO,EAAE,0DAA0D;IACnE,qBAAqB,EAAE,qCAAqC;IAC5D,oBAAoB,EAAE,8CAA8C;IACpE,IAAI,EAAE,MAAM;IACZ,iBAAiB,EACb,2EAA2E;IAC/E,eAAe,EACX,gEAAgE;IACpE,WAAW,EAAE,QAAQ;CACxB,CAAA;AAED,kBAAe,gBAAgB,CAAA"}
|
|
@@ -6,6 +6,7 @@ export default class LintService {
|
|
|
6
6
|
private static isLintingEnabled;
|
|
7
7
|
static disableLinting(): void;
|
|
8
8
|
static enableLinting(): void;
|
|
9
|
+
static shouldIgnorePattern(pattern: string): boolean;
|
|
9
10
|
constructor(cwd: string, commandServiceFactory: () => CommandService);
|
|
10
11
|
fix: (pattern: string) => Promise<string[]>;
|
|
11
12
|
}
|
|
@@ -23,6 +23,9 @@ class LintService {
|
|
|
23
23
|
static enableLinting() {
|
|
24
24
|
this.isLintingEnabled = true;
|
|
25
25
|
}
|
|
26
|
+
static shouldIgnorePattern(pattern) {
|
|
27
|
+
return !!LintService.ignorePatterns.find((p) => p.includes(pattern) || pattern.includes(p));
|
|
28
|
+
}
|
|
26
29
|
constructor(cwd, commandServiceFactory) {
|
|
27
30
|
this.cwd = cwd;
|
|
28
31
|
this.getCommand = commandServiceFactory;
|
|
@@ -35,7 +38,7 @@ class LintService {
|
|
|
35
38
|
});
|
|
36
39
|
}
|
|
37
40
|
if (!LintService.isLintingEnabled ||
|
|
38
|
-
|
|
41
|
+
LintService.shouldIgnorePattern(pattern)) {
|
|
39
42
|
return [];
|
|
40
43
|
}
|
|
41
44
|
// let fixedFiles: any = {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LintService.js","sourceRoot":"","sources":["../../src/services/LintService.ts"],"names":[],"mappings":";;;;;AAAA,+CAAgD;AAChD,kCAAkC;AAClC,4BAA4B;AAC5B,wEAA+C;AAG/C,MAAqB,WAAW;IACrB,GAAG,CAAQ;IACV,UAAU,CAAsB;IACjC,MAAM,CAAC,cAAc,GAAa;QACrC,eAAe;QACf,KAAK;QACL,KAAK;QACL,YAAY;KACf,CAAA;IAEO,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAE/B,MAAM,CAAC,cAAc;QACxB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;IACjC,CAAC;IAEM,MAAM,CAAC,aAAa;QACvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAChC,CAAC;IAED,YACI,GAAW,EACX,qBAA2C;QAE3C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,UAAU,GAAG,qBAAqB,CAAA;IAC3C,CAAC;IAEM,GAAG,GAAG,KAAK,EAAE,OAAe,EAAqB,EAAE;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,oBAAW,CAAC;gBAClB,IAAI,EAAE,oBAAoB;gBAC1B,UAAU,EAAE,CAAC,SAAS,CAAC;aAC1B,CAAC,CAAA;QACN,CAAC;QAED,IACI,CAAC,WAAW,CAAC,gBAAgB;YAC7B,
|
|
1
|
+
{"version":3,"file":"LintService.js","sourceRoot":"","sources":["../../src/services/LintService.ts"],"names":[],"mappings":";;;;;AAAA,+CAAgD;AAChD,kCAAkC;AAClC,4BAA4B;AAC5B,wEAA+C;AAG/C,MAAqB,WAAW;IACrB,GAAG,CAAQ;IACV,UAAU,CAAsB;IACjC,MAAM,CAAC,cAAc,GAAa;QACrC,eAAe;QACf,KAAK;QACL,KAAK;QACL,YAAY;KACf,CAAA;IAEO,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAE/B,MAAM,CAAC,cAAc;QACxB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;IACjC,CAAC;IAEM,MAAM,CAAC,aAAa;QACvB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAChC,CAAC;IAEM,MAAM,CAAC,mBAAmB,CAAC,OAAe;QAC7C,OAAO,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CACpD,CAAA;IACL,CAAC;IAED,YACI,GAAW,EACX,qBAA2C;QAE3C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,UAAU,GAAG,qBAAqB,CAAA;IAC3C,CAAC;IAEM,GAAG,GAAG,KAAK,EAAE,OAAe,EAAqB,EAAE;QACtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,MAAM,IAAI,oBAAW,CAAC;gBAClB,IAAI,EAAE,oBAAoB;gBAC1B,UAAU,EAAE,CAAC,SAAS,CAAC;aAC1B,CAAC,CAAA;QACN,CAAC;QAED,IACI,CAAC,WAAW,CAAC,gBAAgB;YAC7B,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAC1C,CAAC;YACC,OAAO,EAAE,CAAA;QACb,CAAC;QAED,2BAA2B;QAC3B,MAAM,UAAU,GAAa,EAAE,CAAA;QAE/B,IAAI,CAAC;YACD,oEAAoE;YACpE,8CAA8C;YAC9C,MAAM,MAAM,GAAG,6GAA6G,IAAI,CAAC,GAAG,2DAA2D,OAAO,wCAAwC,CAAA;YAE9O,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE;gBACpC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;aACvB,CAAC,CAAA;YAEF,qBAAqB;QACzB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,IAAI,qBAAW,CAAC;gBAClB,IAAI,EAAE,aAAa;gBACnB,OAAO;gBACP,aAAa,EAAE,GAAG;aACrB,CAAC,CAAA;QACN,CAAC;QAED,oBAAoB;QACpB,4CAA4C;QAC5C,mCAAmC;QACnC,uEAAuE;QACvE,kDAAkD;QAClD,yEAAyE;QACzE,sCAAsC;QACtC,uCAAuC;QACvC,2BAA2B;QAC3B,wDAAwD;QACxD,yCAAyC;QACzC,8CAA8C;QAC9C,mDAAmD;QACnD,qCAAqC;QACrC,iBAAiB;QACjB,YAAY;QACZ,QAAQ;QACR,IAAI;QAEJ,OAAO,UAAU,CAAA;IACrB,CAAC,CAAA;;AA1FL,8BA2FC"}
|
|
@@ -7,6 +7,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
9
9
|
const constants_1 = require("../constants");
|
|
10
|
+
const LintService_1 = __importDefault(require("../services/LintService"));
|
|
10
11
|
class AbstractWriter {
|
|
11
12
|
templates;
|
|
12
13
|
ui;
|
|
@@ -27,7 +28,8 @@ class AbstractWriter {
|
|
|
27
28
|
this.settings = options.settings;
|
|
28
29
|
}
|
|
29
30
|
async lint(file) {
|
|
30
|
-
|
|
31
|
+
const shouldLint = !LintService_1.default.shouldIgnorePattern(file);
|
|
32
|
+
if (this.isLintEnabled && shouldLint) {
|
|
31
33
|
this.ui.startLoading(`Linting ${path_1.default.basename(file)}...`);
|
|
32
34
|
await this.linter?.fix(file).catch(() => { });
|
|
33
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractWriter.js","sourceRoot":"","sources":["../../src/writers/AbstractWriter.ts"],"names":[],"mappings":";;;;;AAAA,4CAAmB;AACnB,gDAA2B;AAC3B,uEAA0E;AAE1E,4CAIqB;
|
|
1
|
+
{"version":3,"file":"AbstractWriter.js","sourceRoot":"","sources":["../../src/writers/AbstractWriter.ts"],"names":[],"mappings":"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"}
|
package/eslint.config.mjs
CHANGED
package/package.json
CHANGED
|
@@ -13,11 +13,12 @@
|
|
|
13
13
|
"inquirer-file-tree-selection-prompt",
|
|
14
14
|
"ora",
|
|
15
15
|
"terminal-image",
|
|
16
|
-
"terminal-kit"
|
|
16
|
+
"terminal-kit",
|
|
17
|
+
"open"
|
|
17
18
|
]
|
|
18
19
|
},
|
|
19
20
|
"license": "MIT",
|
|
20
|
-
"version": "21.0.
|
|
21
|
+
"version": "21.0.4",
|
|
21
22
|
"bin": {
|
|
22
23
|
"spruce": "./build/index.js"
|
|
23
24
|
},
|
|
@@ -73,20 +74,20 @@
|
|
|
73
74
|
},
|
|
74
75
|
"dependencies": {
|
|
75
76
|
"@jest/reporters": "^29.7.0",
|
|
76
|
-
"@sprucelabs/error": "^6.0.
|
|
77
|
-
"@sprucelabs/globby": "^2.0.
|
|
78
|
-
"@sprucelabs/heartwood-view-controllers": "^110.0.
|
|
79
|
-
"@sprucelabs/jest-json-reporter": "^8.0.
|
|
80
|
-
"@sprucelabs/mercury-client": "^42.0.
|
|
81
|
-
"@sprucelabs/mercury-event-emitter": "^42.0.
|
|
82
|
-
"@sprucelabs/mercury-types": "^47.0.
|
|
83
|
-
"@sprucelabs/schema": "^30.0.
|
|
84
|
-
"@sprucelabs/spruce-core-schemas": "^40.0.
|
|
85
|
-
"@sprucelabs/spruce-event-utils": "^40.0.
|
|
86
|
-
"@sprucelabs/spruce-skill-utils": "^31.0.
|
|
87
|
-
"@sprucelabs/spruce-templates": "^21.0.
|
|
88
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
89
|
-
"@typescript-eslint/parser": "^
|
|
77
|
+
"@sprucelabs/error": "^6.0.11",
|
|
78
|
+
"@sprucelabs/globby": "^2.0.10",
|
|
79
|
+
"@sprucelabs/heartwood-view-controllers": "^110.0.4",
|
|
80
|
+
"@sprucelabs/jest-json-reporter": "^8.0.12",
|
|
81
|
+
"@sprucelabs/mercury-client": "^42.0.11",
|
|
82
|
+
"@sprucelabs/mercury-event-emitter": "^42.0.11",
|
|
83
|
+
"@sprucelabs/mercury-types": "^47.0.11",
|
|
84
|
+
"@sprucelabs/schema": "^30.0.15",
|
|
85
|
+
"@sprucelabs/spruce-core-schemas": "^40.0.11",
|
|
86
|
+
"@sprucelabs/spruce-event-utils": "^40.0.11",
|
|
87
|
+
"@sprucelabs/spruce-skill-utils": "^31.0.15",
|
|
88
|
+
"@sprucelabs/spruce-templates": "^21.0.4",
|
|
89
|
+
"@typescript-eslint/eslint-plugin": "^7.7.1",
|
|
90
|
+
"@typescript-eslint/parser": "^7.7.1",
|
|
90
91
|
"cfonts": "^3.2.0",
|
|
91
92
|
"chalk": "4.1.2",
|
|
92
93
|
"chokidar": "^3.6.0",
|
|
@@ -111,20 +112,20 @@
|
|
|
111
112
|
"uuid": "^9.0.1"
|
|
112
113
|
},
|
|
113
114
|
"devDependencies": {
|
|
114
|
-
"@sprucelabs/data-stores": "^27.0.
|
|
115
|
+
"@sprucelabs/data-stores": "^27.0.14",
|
|
115
116
|
"@sprucelabs/jest-sheets-reporter": "^3.0.26",
|
|
116
|
-
"@sprucelabs/mercury-core-events": "^24.0.
|
|
117
|
-
"@sprucelabs/resolve-path-aliases": "^2.0.
|
|
118
|
-
"@sprucelabs/spruce-conversation-plugin": "^62.0.
|
|
119
|
-
"@sprucelabs/spruce-deploy-plugin": "^62.0.
|
|
120
|
-
"@sprucelabs/spruce-store-plugin": "^62.0.
|
|
121
|
-
"@sprucelabs/spruce-test-fixtures": "^62.0.
|
|
122
|
-
"@sprucelabs/test": "^9.0.
|
|
123
|
-
"@sprucelabs/test-utils": "^5.0.
|
|
117
|
+
"@sprucelabs/mercury-core-events": "^24.0.6",
|
|
118
|
+
"@sprucelabs/resolve-path-aliases": "^2.0.13",
|
|
119
|
+
"@sprucelabs/spruce-conversation-plugin": "^62.0.2",
|
|
120
|
+
"@sprucelabs/spruce-deploy-plugin": "^62.0.2",
|
|
121
|
+
"@sprucelabs/spruce-store-plugin": "^62.0.2",
|
|
122
|
+
"@sprucelabs/spruce-test-fixtures": "^62.0.2",
|
|
123
|
+
"@sprucelabs/test": "^9.0.9",
|
|
124
|
+
"@sprucelabs/test-utils": "^5.0.10",
|
|
124
125
|
"@types/blessed": "^0.1.25",
|
|
125
|
-
"@types/eslint": "^8.56.
|
|
126
|
+
"@types/eslint": "^8.56.10",
|
|
126
127
|
"@types/fs-extra": "^11.0.4",
|
|
127
|
-
"@types/inquirer": "^
|
|
128
|
+
"@types/inquirer": "^9.0.7",
|
|
128
129
|
"@types/lodash": "^4.17.0",
|
|
129
130
|
"@types/md5": "^2.3.5",
|
|
130
131
|
"@types/node": "^20.12.7",
|
|
@@ -140,14 +141,14 @@
|
|
|
140
141
|
"concurrently": "^8.2.2",
|
|
141
142
|
"conventional-changelog-sprucelabs": "^2.0.1",
|
|
142
143
|
"dotenv": "^16.4.5",
|
|
143
|
-
"eslint": "^9.
|
|
144
|
-
"eslint-config-spruce": "^11.2.
|
|
144
|
+
"eslint": "^9.1.1",
|
|
145
|
+
"eslint-config-spruce": "^11.2.14",
|
|
145
146
|
"find-process": "^1.4.7",
|
|
146
147
|
"jest": "^29.7.0",
|
|
147
148
|
"jest-circus": "^29.7.0",
|
|
148
149
|
"jest-junit": "^16.0.0",
|
|
149
150
|
"jest-reporters": "^0.0.2",
|
|
150
|
-
"prettier": "^3.
|
|
151
|
+
"prettier": "^3.2.5",
|
|
151
152
|
"ps-node": "^0.1.6",
|
|
152
153
|
"ts-jest": "^29.1.2",
|
|
153
154
|
"ts-node": "^10.9.2",
|
|
@@ -585,8 +586,10 @@
|
|
|
585
586
|
"inquirer-file-tree-selection-prompt",
|
|
586
587
|
"ora",
|
|
587
588
|
"terminal-image",
|
|
588
|
-
"terminal-kit"
|
|
589
|
+
"terminal-kit",
|
|
590
|
+
"inquirer",
|
|
591
|
+
"open"
|
|
589
592
|
]
|
|
590
593
|
},
|
|
591
|
-
"gitHead": "
|
|
594
|
+
"gitHead": "c9a2d609d5bf990a184909bdb281cb2fd6800edf"
|
|
592
595
|
}
|
|
@@ -6,7 +6,6 @@ const universalDevDependencies = [
|
|
|
6
6
|
{ name: 'eslint-config-spruce', isDev: true },
|
|
7
7
|
{ name: 'prettier', isDev: true },
|
|
8
8
|
{ name: 'chokidar-cli', isDev: true },
|
|
9
|
-
{ name: 'concurrently', isDev: true },
|
|
10
9
|
{ name: 'tsc-watch', isDev: true },
|
|
11
10
|
{ name: 'ts-node', isDev: true },
|
|
12
11
|
]
|
|
@@ -22,8 +22,6 @@ const universalScripts = {
|
|
|
22
22
|
test: 'jest',
|
|
23
23
|
'watch.build.dev':
|
|
24
24
|
"tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
|
|
25
|
-
'watch.lint':
|
|
26
|
-
"concurrently 'yarn run lint' \"chokidar 'src/**/*' -c 'yarn run lint.tsc'\"",
|
|
27
25
|
'watch.rebuild':
|
|
28
26
|
'yarn run clean.all && yarn install && yarn run watch.build.dev',
|
|
29
27
|
'watch.tsc': 'tsc -w',
|
|
@@ -24,6 +24,12 @@ export default class LintService {
|
|
|
24
24
|
this.isLintingEnabled = true
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
+
public static shouldIgnorePattern(pattern: string) {
|
|
28
|
+
return !!LintService.ignorePatterns.find(
|
|
29
|
+
(p) => p.includes(pattern) || pattern.includes(p)
|
|
30
|
+
)
|
|
31
|
+
}
|
|
32
|
+
|
|
27
33
|
public constructor(
|
|
28
34
|
cwd: string,
|
|
29
35
|
commandServiceFactory: () => CommandService
|
|
@@ -42,9 +48,7 @@ export default class LintService {
|
|
|
42
48
|
|
|
43
49
|
if (
|
|
44
50
|
!LintService.isLintingEnabled ||
|
|
45
|
-
|
|
46
|
-
(p) => p.includes(pattern) || pattern.includes(p)
|
|
47
|
-
)
|
|
51
|
+
LintService.shouldIgnorePattern(pattern)
|
|
48
52
|
) {
|
|
49
53
|
return []
|
|
50
54
|
}
|
|
@@ -33,7 +33,8 @@ export default abstract class AbstractWriter {
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
protected async lint(file: string) {
|
|
36
|
-
|
|
36
|
+
const shouldLint = !LintService.shouldIgnorePattern(file)
|
|
37
|
+
if (this.isLintEnabled && shouldLint) {
|
|
37
38
|
this.ui.startLoading(`Linting ${pathUtil.basename(file)}...`)
|
|
38
39
|
await this.linter?.fix(file).catch(() => {})
|
|
39
40
|
}
|