@sprucelabs/spruce-cli 21.0.25 → 21.0.26
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/build/__tests__/behavioral/errors/KeepingErrorsInSync.test.d.ts +1 -1
- package/build/__tests__/behavioral/errors/KeepingErrorsInSync.test.js +5 -4
- package/build/__tests__/behavioral/errors/KeepingErrorsInSync.test.js.map +1 -1
- package/build/__tests__/behavioral/polish/SettingUpPolish.test.d.ts +4 -0
- package/build/__tests__/behavioral/polish/SettingUpPolish.test.js +32 -9
- package/build/__tests__/behavioral/polish/SettingUpPolish.test.js.map +1 -1
- package/build/__tests__/behavioral/upgrading/UpgradingToEslint9.test.d.ts +1 -0
- package/build/__tests__/behavioral/upgrading/UpgradingToEslint9.test.js +14 -0
- package/build/__tests__/behavioral/upgrading/UpgradingToEslint9.test.js.map +1 -1
- package/build/features/polish/actions/SetupAction.js +1 -1
- package/build/features/polish/actions/SetupAction.js.map +1 -1
- package/build/features/polish/writers/PolishWriter.js +2 -1
- package/build/features/polish/writers/PolishWriter.js.map +1 -1
- package/build/features/test/TestReporter.js +1 -1
- package/build/migration/EsLint9Migrator.js +6 -2
- package/build/migration/EsLint9Migrator.js.map +1 -1
- package/build/templateItemBuilders/SchemaTemplateItemBuilder.js +1 -1
- package/build/templateItemBuilders/SchemaTemplateItemBuilder.js.map +1 -1
- package/package.json +32 -32
- package/src/__tests__/behavioral/errors/KeepingErrorsInSync.test.ts +4 -4
- package/src/__tests__/behavioral/polish/SettingUpPolish.test.ts +41 -15
- package/src/__tests__/behavioral/upgrading/UpgradingToEslint9.test.ts +18 -0
- package/src/features/polish/actions/SetupAction.ts +1 -1
- package/src/features/polish/writers/PolishWriter.ts +2 -1
- package/src/features/test/TestReporter.ts +1 -1
- package/src/migration/EsLint9Migrator.ts +7 -2
- package/src/templateItemBuilders/SchemaTemplateItemBuilder.ts +1 -1
- package/build/.spruce/.gitignore +0 -1
- package/src/.spruce/.gitignore +0 -1
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
|
+
## [21.0.26](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.25...v21.0.26) (2024-07-31)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## [21.0.25](https://github.com/sprucelabsai-community/spruce-cli-workspace/compare/v21.0.24...v21.0.25) (2024-06-24)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @sprucelabs/spruce-cli
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import AbstractErrorTest from '../../../tests/AbstractErrorTest';
|
|
2
2
|
export default class KeepingErrorsInSyncTest extends AbstractErrorTest {
|
|
3
3
|
protected static hasSyncErrorAction(): Promise<void>;
|
|
4
|
-
protected static
|
|
4
|
+
protected static returnsErrorWhenSyncingSchemasFails(): Promise<void>;
|
|
5
5
|
protected static errorsStayInSyncWhenSchemasAreDeleted(): Promise<void>;
|
|
6
6
|
protected static canHandleNestedSchemasWithoutAddingThemToOptions(): Promise<void>;
|
|
7
7
|
protected static canCreateAndSyncErrorsWithNoCoreSchemasAndNoFields(): Promise<void>;
|
|
@@ -19,15 +19,16 @@ class KeepingErrorsInSyncTest extends AbstractErrorTest_1.default {
|
|
|
19
19
|
await this.Cli();
|
|
20
20
|
test_utils_1.assert.isFunction(this.Action('error', 'sync').execute);
|
|
21
21
|
}
|
|
22
|
-
static async
|
|
22
|
+
static async returnsErrorWhenSyncingSchemasFails() {
|
|
23
23
|
await this.installErrorFeature('errors');
|
|
24
24
|
const createAction = this.Action('error', 'create');
|
|
25
25
|
await createAction.execute({
|
|
26
26
|
nameReadable: 'Test error',
|
|
27
27
|
nameCamel: 'testError',
|
|
28
28
|
});
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
this.commandFaker.fakeCommand(/yarn/, 1);
|
|
30
|
+
this.commandFaker.fakeCommand(/node/, 1);
|
|
31
|
+
ImportService_1.default.disableCache();
|
|
31
32
|
ImportService_1.default.clearCache();
|
|
32
33
|
const results = await this.Action('error', 'sync').execute({});
|
|
33
34
|
test_utils_1.assert.isTruthy(results.errors);
|
|
@@ -146,7 +147,7 @@ __decorate([
|
|
|
146
147
|
], KeepingErrorsInSyncTest, "hasSyncErrorAction", null);
|
|
147
148
|
__decorate([
|
|
148
149
|
(0, test_utils_1.test)()
|
|
149
|
-
], KeepingErrorsInSyncTest, "
|
|
150
|
+
], KeepingErrorsInSyncTest, "returnsErrorWhenSyncingSchemasFails", null);
|
|
150
151
|
__decorate([
|
|
151
152
|
(0, test_utils_1.test)()
|
|
152
153
|
], KeepingErrorsInSyncTest, "errorsStayInSyncWhenSchemasAreDeleted", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KeepingErrorsInSync.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/errors/KeepingErrorsInSync.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uEAAyD;AACzD,uDAAqD;AACrD,oFAA2D;AAC3D,yFAAgE;AAChE,yFAA4D;AAE5D,MAAqB,uBAAwB,SAAQ,2BAAiB;IAE3C,AAAb,MAAM,CAAC,KAAK,CAAC,kBAAkB;QACrC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAA;QAChB,mBAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAA;IAC3D,CAAC;IAGsB,AAAb,MAAM,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"KeepingErrorsInSync.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/errors/KeepingErrorsInSync.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,10 @@ export default class SettingUpPolishTest extends AbstractCliTest {
|
|
|
5
5
|
protected static polishResultsAreExpected(): Promise<void>;
|
|
6
6
|
protected static createsExpectedScript(): Promise<void>;
|
|
7
7
|
protected static makeSureScriptHasSomethingAndIsValid(): Promise<void>;
|
|
8
|
+
protected static polishCreatesExpectedFileNameBasedOnSkillsNamespace(): Promise<void>;
|
|
9
|
+
private static assertPolishScriptWrittenToExpectedPlace;
|
|
8
10
|
private static generateExpectedFile;
|
|
11
|
+
private static installSkillAndSetupPolish;
|
|
9
12
|
private static setupPolish;
|
|
13
|
+
private static installSkill;
|
|
10
14
|
}
|
|
@@ -17,12 +17,11 @@ class SettingUpPolishTest extends AbstractCliTest_1.default {
|
|
|
17
17
|
test_utils_1.assert.isFunction(this.Action('polish', 'setup').execute);
|
|
18
18
|
}
|
|
19
19
|
static async setsUpExpectedScript() {
|
|
20
|
-
await this.
|
|
21
|
-
|
|
22
|
-
test_utils_1.assert.isTrue(spruce_skill_utils_1.diskUtil.doesFileExist(destination), `Did not find polish script at ${destination}!`);
|
|
20
|
+
await this.installSkillAndSetupPolish();
|
|
21
|
+
await this.assertPolishScriptWrittenToExpectedPlace();
|
|
23
22
|
}
|
|
24
23
|
static async polishResultsAreExpected() {
|
|
25
|
-
const results = await this.
|
|
24
|
+
const results = await this.installSkillAndSetupPolish();
|
|
26
25
|
const { filename, destination } = await this.generateExpectedFile();
|
|
27
26
|
test_utils_1.assert.isLength(results.files, 1);
|
|
28
27
|
test_utils_1.assert.isEqualDeep(results, {
|
|
@@ -37,29 +36,50 @@ class SettingUpPolishTest extends AbstractCliTest_1.default {
|
|
|
37
36
|
});
|
|
38
37
|
}
|
|
39
38
|
static async createsExpectedScript() {
|
|
40
|
-
await this.
|
|
39
|
+
await this.installSkillAndSetupPolish();
|
|
41
40
|
const pkg = this.Service('pkg');
|
|
42
41
|
const scripts = pkg.get('scripts');
|
|
43
42
|
test_utils_1.assert.isEqual(scripts.polish, 'heartwood-polish');
|
|
44
43
|
}
|
|
45
44
|
static async makeSureScriptHasSomethingAndIsValid() {
|
|
46
|
-
const results = await this.
|
|
45
|
+
const results = await this.installSkillAndSetupPolish();
|
|
47
46
|
const { destination } = await this.generateExpectedFile();
|
|
48
47
|
const contents = spruce_skill_utils_1.diskUtil.readFile(destination);
|
|
49
48
|
test_utils_1.assert.isNotEqual(contents, '');
|
|
50
49
|
await this.assertValidActionResponseFiles(results);
|
|
51
50
|
}
|
|
51
|
+
static async polishCreatesExpectedFileNameBasedOnSkillsNamespace() {
|
|
52
|
+
await this.installSkill();
|
|
53
|
+
const pkg = await this.Service('pkg');
|
|
54
|
+
const namespace = 'my-skill';
|
|
55
|
+
pkg.set({
|
|
56
|
+
path: ['skill', 'namespace'],
|
|
57
|
+
value: namespace,
|
|
58
|
+
});
|
|
59
|
+
await this.setupPolish();
|
|
60
|
+
await this.assertPolishScriptWrittenToExpectedPlace();
|
|
61
|
+
}
|
|
62
|
+
static async assertPolishScriptWrittenToExpectedPlace() {
|
|
63
|
+
const { destination } = await this.generateExpectedFile();
|
|
64
|
+
test_utils_1.assert.isTrue(spruce_skill_utils_1.diskUtil.doesFileExist(destination), `Did not find polish script at ${destination}!`);
|
|
65
|
+
}
|
|
52
66
|
static async generateExpectedFile() {
|
|
53
67
|
const store = this.Store('skill');
|
|
54
68
|
const namespace = await store.loadCurrentSkillsNamespace();
|
|
55
|
-
const filename = `${
|
|
69
|
+
const filename = `${spruce_skill_utils_1.namesUtil.toKebab(namespace)}.polish.ts`;
|
|
56
70
|
const destination = this.resolvePath('src', filename);
|
|
57
71
|
return { filename, destination };
|
|
58
72
|
}
|
|
73
|
+
static async installSkillAndSetupPolish() {
|
|
74
|
+
await this.installSkill();
|
|
75
|
+
const results = await this.setupPolish();
|
|
76
|
+
return results;
|
|
77
|
+
}
|
|
59
78
|
static async setupPolish() {
|
|
79
|
+
return await this.Action('polish', 'setup').execute({});
|
|
80
|
+
}
|
|
81
|
+
static async installSkill() {
|
|
60
82
|
await this.FeatureFixture().installCachedFeatures('polish');
|
|
61
|
-
const results = await this.Action('polish', 'setup').execute({});
|
|
62
|
-
return results;
|
|
63
83
|
}
|
|
64
84
|
}
|
|
65
85
|
exports.default = SettingUpPolishTest;
|
|
@@ -78,4 +98,7 @@ __decorate([
|
|
|
78
98
|
__decorate([
|
|
79
99
|
(0, test_utils_1.test)()
|
|
80
100
|
], SettingUpPolishTest, "makeSureScriptHasSomethingAndIsValid", null);
|
|
101
|
+
__decorate([
|
|
102
|
+
(0, test_utils_1.test)()
|
|
103
|
+
], SettingUpPolishTest, "polishCreatesExpectedFileNameBasedOnSkillsNamespace", null);
|
|
81
104
|
//# sourceMappingURL=SettingUpPolish.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingUpPolish.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/polish/SettingUpPolish.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"SettingUpPolish.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/polish/SettingUpPolish.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export default class UpgradingToEslint9Test extends AbstractCliTest {
|
|
|
11
11
|
protected static doesNotWriteTheFileIfItDoesNotExist(): Promise<void>;
|
|
12
12
|
protected static callsMigratorInMigrateCommand(): Promise<void>;
|
|
13
13
|
protected static doNotCopyEsLintConfigIfAlreadyExists(): Promise<void>;
|
|
14
|
+
protected static doNotCopyVsCodeSettingsIfLegacyEsLintConfigDoesNotExist(): Promise<void>;
|
|
14
15
|
private static copyLegacyModuleAndMigrate;
|
|
15
16
|
private static migrate;
|
|
16
17
|
private static copyOverLegacyModule;
|
|
@@ -23,6 +23,9 @@ class UpgradingToEslint9Test extends AbstractCliTest_1.default {
|
|
|
23
23
|
this.deletedFiles = [];
|
|
24
24
|
this.migrator = EsLint9Migrator_1.default.Migrator({ cwd: this.cwd });
|
|
25
25
|
delete EsLint9Migrator_1.default.Class;
|
|
26
|
+
EsLint9Migrator_1.default.disk = {
|
|
27
|
+
...spruce_skill_utils_1.diskUtil,
|
|
28
|
+
};
|
|
26
29
|
EsLint9Migrator_1.default.disk.deleteFile = (file) => {
|
|
27
30
|
this.deletedFiles.push(file);
|
|
28
31
|
};
|
|
@@ -80,6 +83,14 @@ class UpgradingToEslint9Test extends AbstractCliTest_1.default {
|
|
|
80
83
|
const actual = spruce_skill_utils_1.diskUtil.readFile(eslintrcPath);
|
|
81
84
|
test_utils_1.assert.isEqual(actual, 'old eslintrc');
|
|
82
85
|
}
|
|
86
|
+
static async doNotCopyVsCodeSettingsIfLegacyEsLintConfigDoesNotExist() {
|
|
87
|
+
EsLint9Migrator_1.default.disk = spruce_skill_utils_1.diskUtil;
|
|
88
|
+
await this.copyLegacyModuleAndMigrate();
|
|
89
|
+
EsLint9Migrator_1.default.disk.writeFile = () => test_utils_1.assert.fail('Should not write file');
|
|
90
|
+
await this.migrate();
|
|
91
|
+
this.migrator = EsLint9Migrator_1.default.Migrator({ cwd: this.cwd });
|
|
92
|
+
await this.migrate();
|
|
93
|
+
}
|
|
83
94
|
static async copyLegacyModuleAndMigrate() {
|
|
84
95
|
await this.copyOverLegacyModule();
|
|
85
96
|
await this.migrate();
|
|
@@ -121,6 +132,9 @@ __decorate([
|
|
|
121
132
|
__decorate([
|
|
122
133
|
(0, test_utils_1.test)()
|
|
123
134
|
], UpgradingToEslint9Test, "doNotCopyEsLintConfigIfAlreadyExists", null);
|
|
135
|
+
__decorate([
|
|
136
|
+
(0, test_utils_1.test)()
|
|
137
|
+
], UpgradingToEslint9Test, "doNotCopyVsCodeSettingsIfLegacyEsLintConfigDoesNotExist", null);
|
|
124
138
|
class MockMigrator {
|
|
125
139
|
static didMigrate = false;
|
|
126
140
|
static constructorOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpgradingToEslint9.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/upgrading/UpgradingToEslint9.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"UpgradingToEslint9.test.js","sourceRoot":"","sources":["../../../../src/__tests__/behavioral/upgrading/UpgradingToEslint9.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ class SetupAction extends AbstractAction_1.default {
|
|
|
17
17
|
async execute() {
|
|
18
18
|
const namespace = await this.Store('skill').loadCurrentSkillsNamespace();
|
|
19
19
|
const writer = this.Writer('polish');
|
|
20
|
-
const files = await writer.writePolishScript(spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, 'src'), namespace
|
|
20
|
+
const files = await writer.writePolishScript(spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, 'src'), namespace);
|
|
21
21
|
const scriptUpdater = ScriptUpdater_1.default.FromFeature(this.parent, {
|
|
22
22
|
cwd: this.cwd,
|
|
23
23
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SetupAction.js","sourceRoot":"","sources":["../../../../src/features/polish/actions/SetupAction.ts"],"names":[],"mappings":";;;;;AAAA,+CAAgD;AAChD,uEAAyD;AACzD,oFAA+D;AAC/D,0EAAiD;AAGjD,MAAM,aAAa,GAAG,IAAA,oBAAW,EAAC;IAC9B,EAAE,EAAE,mBAAmB;IACvB,MAAM,EAAE,EAAE;CACb,CAAC,CAAA;AAIF,MAAqB,WAAY,SAAQ,wBAA6B;IAC3D,aAAa,GAAkB,aAAa,CAAA;IAC5C,iBAAiB,GAAG,wBAAwB,CAAA;IAE5C,KAAK,CAAC,OAAO;QAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,0BAA0B,EAAE,CAAA;QACxE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACpC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,iBAAiB,CACxC,6BAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,EACrC,SAAS,
|
|
1
|
+
{"version":3,"file":"SetupAction.js","sourceRoot":"","sources":["../../../../src/features/polish/actions/SetupAction.ts"],"names":[],"mappings":";;;;;AAAA,+CAAgD;AAChD,uEAAyD;AACzD,oFAA+D;AAC/D,0EAAiD;AAGjD,MAAM,aAAa,GAAG,IAAA,oBAAW,EAAC;IAC9B,EAAE,EAAE,mBAAmB;IACvB,MAAM,EAAE,EAAE;CACb,CAAC,CAAA;AAIF,MAAqB,WAAY,SAAQ,wBAA6B;IAC3D,aAAa,GAAkB,aAAa,CAAA;IAC5C,iBAAiB,GAAG,wBAAwB,CAAA;IAE5C,KAAK,CAAC,OAAO;QAChB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,0BAA0B,EAAE,CAAA;QACxE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACpC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,iBAAiB,CACxC,6BAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,EACrC,SAAS,CACZ,CAAA;QAED,MAAM,aAAa,GAAG,uBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE;YAC7D,GAAG,EAAE,IAAI,CAAC,GAAG;SAChB,CAAC,CAAA;QAEF,MAAM,aAAa,CAAC,MAAM,EAAE,CAAA;QAE5B,OAAO;YACH,KAAK;SACR,CAAA;IACL,CAAC;CACJ;AAtBD,8BAsBC"}
|
|
@@ -4,10 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const path_1 = __importDefault(require("path"));
|
|
7
|
+
const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
|
|
7
8
|
const AbstractWriter_1 = __importDefault(require("../../../writers/AbstractWriter"));
|
|
8
9
|
class PolishWriter extends AbstractWriter_1.default {
|
|
9
10
|
async writePolishScript(destinationDir, skillNamespace) {
|
|
10
|
-
const filename = `${skillNamespace}.polish.ts`;
|
|
11
|
+
const filename = `${spruce_skill_utils_1.namesUtil.toKebab(skillNamespace)}.polish.ts`;
|
|
11
12
|
const resolvedDestination = path_1.default.join(destinationDir, filename);
|
|
12
13
|
const content = this.templates.polish();
|
|
13
14
|
const results = await this.writeFileIfChangedMixinResults(resolvedDestination, content, `Polish script at ${filename}!`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PolishWriter.js","sourceRoot":"","sources":["../../../../src/features/polish/writers/PolishWriter.ts"],"names":[],"mappings":";;;;;AAAA,gDAA2B;AAC3B,qFAA4D;AAE5D,MAAqB,YAAa,SAAQ,wBAAc;IAC7C,KAAK,CAAC,iBAAiB,CAC1B,cAAsB,EACtB,cAAsB;QAEtB,MAAM,QAAQ,GAAG,GAAG,cAAc,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"PolishWriter.js","sourceRoot":"","sources":["../../../../src/features/polish/writers/PolishWriter.ts"],"names":[],"mappings":";;;;;AAAA,gDAA2B;AAC3B,uEAA0D;AAC1D,qFAA4D;AAE5D,MAAqB,YAAa,SAAQ,wBAAc;IAC7C,KAAK,CAAC,iBAAiB,CAC1B,cAAsB,EACtB,cAAsB;QAEtB,MAAM,QAAQ,GAAG,GAAG,8BAAS,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,CAAA;QACjE,MAAM,mBAAmB,GAAG,cAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAA;QAEvC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,8BAA8B,CACrD,mBAAmB,EACnB,OAAO,EACP,oBAAoB,QAAQ,GAAG,CAClC,CAAA;QAED,OAAO,OAAO,CAAA;IAClB,CAAC;CACJ;AAjBD,+BAiBC"}
|
|
@@ -16,9 +16,11 @@ class EsLint9Migrator {
|
|
|
16
16
|
return new (this.Class ?? this)(options);
|
|
17
17
|
}
|
|
18
18
|
async migrate() {
|
|
19
|
-
this.deleteFileIfExists('.eslintignore');
|
|
19
|
+
const didDeleteFile = this.deleteFileIfExists('.eslintignore');
|
|
20
20
|
this.deleteFileIfExists('.eslintrc.js');
|
|
21
|
-
|
|
21
|
+
if (didDeleteFile) {
|
|
22
|
+
await this.updateVsCodeSettingsIfExists();
|
|
23
|
+
}
|
|
22
24
|
}
|
|
23
25
|
async updateVsCodeSettingsIfExists() {
|
|
24
26
|
const settings = await spruce_templates_1.templates.vsCodeSettings();
|
|
@@ -31,7 +33,9 @@ class EsLint9Migrator {
|
|
|
31
33
|
const path = this.disk.resolvePath(this.cwd, filename);
|
|
32
34
|
if (this.disk.doesFileExist(path)) {
|
|
33
35
|
this.disk.deleteFile(path);
|
|
36
|
+
return true;
|
|
34
37
|
}
|
|
38
|
+
return false;
|
|
35
39
|
}
|
|
36
40
|
get disk() {
|
|
37
41
|
return EsLint9Migrator.disk;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EsLint9Migrator.js","sourceRoot":"","sources":["../../src/migration/EsLint9Migrator.ts"],"names":[],"mappings":";;AAAA,+CAAkD;AAClD,uEAAyD;AACzD,mEAAwD;AAExD,MAAqB,eAAe;IACzB,MAAM,CAAC,IAAI,GAAG,6BAAQ,CAAA;IACtB,MAAM,CAAC,KAAK,CAA6C;IACxD,GAAG,CAAQ;IAEnB,YAAoB,OAAwB;QACxC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAClB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,OAAwB;QAC3C,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"EsLint9Migrator.js","sourceRoot":"","sources":["../../src/migration/EsLint9Migrator.ts"],"names":[],"mappings":";;AAAA,+CAAkD;AAClD,uEAAyD;AACzD,mEAAwD;AAExD,MAAqB,eAAe;IACzB,MAAM,CAAC,IAAI,GAAG,6BAAQ,CAAA;IACtB,MAAM,CAAC,KAAK,CAA6C;IACxD,GAAG,CAAQ;IAEnB,YAAoB,OAAwB;QACxC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAClB,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAC,OAAwB;QAC3C,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAC9D,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;QAEvC,IAAI,aAAa,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,4BAA4B,EAAE,CAAA;QAC7C,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,4BAA4B;QACtC,MAAM,QAAQ,GAAG,MAAM,4BAAS,CAAC,cAAc,EAAE,CAAA;QAEjD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CACrC,IAAI,CAAC,GAAG,EACR,SAAS,EACT,eAAe,CAClB,CAAA;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC;IACL,CAAC;IAEO,kBAAkB,CAAC,QAAgB;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QACtD,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAC1B,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,IAAY,IAAI;QACZ,OAAO,eAAe,CAAC,IAAI,CAAA;IAC/B,CAAC;;AAjDL,kCAkDC"}
|
|
@@ -112,7 +112,7 @@ class SchemaTemplateItemBuilder {
|
|
|
112
112
|
pluckFields(localSchema) {
|
|
113
113
|
const fields = localSchema.dynamicFieldSignature
|
|
114
114
|
? { dynamicField: localSchema.dynamicFieldSignature }
|
|
115
|
-
: localSchema.fields ?? {};
|
|
115
|
+
: (localSchema.fields ?? {});
|
|
116
116
|
const namedFields = Object.keys(fields).map((name) => ({
|
|
117
117
|
name,
|
|
118
118
|
field: fields[name],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaTemplateItemBuilder.js","sourceRoot":"","sources":["../../src/templateItemBuilders/SchemaTemplateItemBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SchemaTemplateItemBuilder.js","sourceRoot":"","sources":["../../src/templateItemBuilders/SchemaTemplateItemBuilder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
]
|
|
19
19
|
},
|
|
20
20
|
"license": "MIT",
|
|
21
|
-
"version": "21.0.
|
|
21
|
+
"version": "21.0.26",
|
|
22
22
|
"bin": {
|
|
23
23
|
"spruce": "./build/index.js"
|
|
24
24
|
},
|
|
@@ -74,18 +74,18 @@
|
|
|
74
74
|
},
|
|
75
75
|
"dependencies": {
|
|
76
76
|
"@jest/reporters": "^29.7.0",
|
|
77
|
-
"@sprucelabs/error": "^6.0.
|
|
78
|
-
"@sprucelabs/globby": "^2.0.
|
|
79
|
-
"@sprucelabs/heartwood-view-controllers": "^110.
|
|
80
|
-
"@sprucelabs/jest-json-reporter": "^8.0.
|
|
81
|
-
"@sprucelabs/mercury-client": "^42.0.
|
|
82
|
-
"@sprucelabs/mercury-event-emitter": "^42.0.
|
|
83
|
-
"@sprucelabs/mercury-types": "^47.0.
|
|
84
|
-
"@sprucelabs/schema": "^30.0.
|
|
85
|
-
"@sprucelabs/spruce-core-schemas": "^40.1.
|
|
86
|
-
"@sprucelabs/spruce-event-utils": "^40.0.
|
|
87
|
-
"@sprucelabs/spruce-skill-utils": "^31.0.
|
|
88
|
-
"@sprucelabs/spruce-templates": "^21.0.
|
|
77
|
+
"@sprucelabs/error": "^6.0.139",
|
|
78
|
+
"@sprucelabs/globby": "^2.0.97",
|
|
79
|
+
"@sprucelabs/heartwood-view-controllers": "^110.8.18",
|
|
80
|
+
"@sprucelabs/jest-json-reporter": "^8.0.142",
|
|
81
|
+
"@sprucelabs/mercury-client": "^42.0.224",
|
|
82
|
+
"@sprucelabs/mercury-event-emitter": "^42.0.224",
|
|
83
|
+
"@sprucelabs/mercury-types": "^47.0.188",
|
|
84
|
+
"@sprucelabs/schema": "^30.0.185",
|
|
85
|
+
"@sprucelabs/spruce-core-schemas": "^40.1.131",
|
|
86
|
+
"@sprucelabs/spruce-event-utils": "^40.0.201",
|
|
87
|
+
"@sprucelabs/spruce-skill-utils": "^31.0.202",
|
|
88
|
+
"@sprucelabs/spruce-templates": "^21.0.26",
|
|
89
89
|
"@typescript-eslint/eslint-plugin": "^7.7.1",
|
|
90
90
|
"@typescript-eslint/parser": "^7.7.1",
|
|
91
91
|
"cfonts": "^3.3.0",
|
|
@@ -108,27 +108,27 @@
|
|
|
108
108
|
"terminal-kit": "sprucelabsai/terminal-kit",
|
|
109
109
|
"tree-kill": "^1.2.2",
|
|
110
110
|
"tsutils": "^3.21.0",
|
|
111
|
-
"typescript": "^5.
|
|
111
|
+
"typescript": "^5.5.3",
|
|
112
112
|
"uuid": "^10.0.0"
|
|
113
113
|
},
|
|
114
114
|
"devDependencies": {
|
|
115
|
-
"@sprucelabs/data-stores": "^28.1.
|
|
116
|
-
"@sprucelabs/jest-sheets-reporter": "^3.0.
|
|
117
|
-
"@sprucelabs/mercury-core-events": "^24.0.
|
|
118
|
-
"@sprucelabs/resolve-path-aliases": "^2.0.
|
|
119
|
-
"@sprucelabs/spruce-conversation-plugin": "^62.2.
|
|
120
|
-
"@sprucelabs/spruce-deploy-plugin": "^62.2.
|
|
121
|
-
"@sprucelabs/spruce-store-plugin": "^62.2.
|
|
122
|
-
"@sprucelabs/spruce-test-fixtures": "^62.2.
|
|
123
|
-
"@sprucelabs/test": "^9.0.
|
|
124
|
-
"@sprucelabs/test-utils": "^5.
|
|
115
|
+
"@sprucelabs/data-stores": "^28.1.140",
|
|
116
|
+
"@sprucelabs/jest-sheets-reporter": "^3.0.78",
|
|
117
|
+
"@sprucelabs/mercury-core-events": "^24.0.215",
|
|
118
|
+
"@sprucelabs/resolve-path-aliases": "^2.0.120",
|
|
119
|
+
"@sprucelabs/spruce-conversation-plugin": "^62.2.87",
|
|
120
|
+
"@sprucelabs/spruce-deploy-plugin": "^62.2.87",
|
|
121
|
+
"@sprucelabs/spruce-store-plugin": "^62.2.87",
|
|
122
|
+
"@sprucelabs/spruce-test-fixtures": "^62.2.87",
|
|
123
|
+
"@sprucelabs/test": "^9.0.37",
|
|
124
|
+
"@sprucelabs/test-utils": "^5.1.75",
|
|
125
125
|
"@types/blessed": "^0.1.25",
|
|
126
126
|
"@types/eslint": "^8.56.10",
|
|
127
127
|
"@types/fs-extra": "^11.0.4",
|
|
128
128
|
"@types/inquirer": "^9.0.7",
|
|
129
|
-
"@types/lodash": "^4.17.
|
|
129
|
+
"@types/lodash": "^4.17.6",
|
|
130
130
|
"@types/md5": "^2.3.5",
|
|
131
|
-
"@types/node": "^20.14.
|
|
131
|
+
"@types/node": "^20.14.10",
|
|
132
132
|
"@types/promise.allsettled": "^1.0.6",
|
|
133
133
|
"@types/ps-node": "^0.1.3",
|
|
134
134
|
"@types/semver": "^7.5.8",
|
|
@@ -136,13 +136,13 @@
|
|
|
136
136
|
"@types/slug": "^5.0.8",
|
|
137
137
|
"@types/superagent": "^8.1.7",
|
|
138
138
|
"@types/terminal-kit": "^2.5.6",
|
|
139
|
-
"@types/uuid": "^
|
|
139
|
+
"@types/uuid": "^10.0.0",
|
|
140
140
|
"chokidar-cli": "^3.0.0",
|
|
141
141
|
"concurrently": "^8.2.2",
|
|
142
|
-
"conventional-changelog-sprucelabs": "
|
|
142
|
+
"conventional-changelog-sprucelabs": "2.0.1",
|
|
143
143
|
"dotenv": "^16.4.5",
|
|
144
|
-
"eslint": "^9.
|
|
145
|
-
"eslint-config-spruce": "^11.2.
|
|
144
|
+
"eslint": "^9.7.0",
|
|
145
|
+
"eslint-config-spruce": "^11.2.26",
|
|
146
146
|
"find-process": "^1.4.7",
|
|
147
147
|
"jest": "^29.7.0",
|
|
148
148
|
"jest-circus": "^29.7.0",
|
|
@@ -150,7 +150,7 @@
|
|
|
150
150
|
"jest-reporters": "^0.0.2",
|
|
151
151
|
"prettier": "^3.2.5",
|
|
152
152
|
"ps-node": "^0.1.6",
|
|
153
|
-
"ts-jest": "^29.
|
|
153
|
+
"ts-jest": "^29.2.2",
|
|
154
154
|
"ts-node": "^10.9.2",
|
|
155
155
|
"tsc-watch": "^6.2.0",
|
|
156
156
|
"tsconfig-paths": "^4.2.0"
|
|
@@ -591,5 +591,5 @@
|
|
|
591
591
|
"open"
|
|
592
592
|
]
|
|
593
593
|
},
|
|
594
|
-
"gitHead": "
|
|
594
|
+
"gitHead": "31a09313582d92d52571abd2aee2f20bbc970569"
|
|
595
595
|
}
|
|
@@ -12,7 +12,7 @@ export default class KeepingErrorsInSyncTest extends AbstractErrorTest {
|
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
@test()
|
|
15
|
-
protected static async
|
|
15
|
+
protected static async returnsErrorWhenSyncingSchemasFails() {
|
|
16
16
|
await this.installErrorFeature('errors')
|
|
17
17
|
|
|
18
18
|
const createAction = this.Action('error', 'create')
|
|
@@ -22,9 +22,9 @@ export default class KeepingErrorsInSyncTest extends AbstractErrorTest {
|
|
|
22
22
|
nameCamel: 'testError',
|
|
23
23
|
})
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
this.commandFaker.fakeCommand(/yarn/, 1)
|
|
26
|
+
this.commandFaker.fakeCommand(/node/, 1)
|
|
27
|
+
ImportService.disableCache()
|
|
28
28
|
ImportService.clearCache()
|
|
29
29
|
|
|
30
30
|
const results = await this.Action('error', 'sync').execute({})
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { diskUtil } from '@sprucelabs/spruce-skill-utils'
|
|
1
|
+
import { diskUtil, namesUtil } from '@sprucelabs/spruce-skill-utils'
|
|
2
2
|
import { test, assert } from '@sprucelabs/test-utils'
|
|
3
3
|
import AbstractCliTest from '../../../tests/AbstractCliTest'
|
|
4
4
|
|
|
@@ -10,19 +10,13 @@ export default class SettingUpPolishTest extends AbstractCliTest {
|
|
|
10
10
|
|
|
11
11
|
@test()
|
|
12
12
|
protected static async setsUpExpectedScript() {
|
|
13
|
-
await this.
|
|
14
|
-
|
|
15
|
-
const { destination } = await this.generateExpectedFile()
|
|
16
|
-
|
|
17
|
-
assert.isTrue(
|
|
18
|
-
diskUtil.doesFileExist(destination),
|
|
19
|
-
`Did not find polish script at ${destination}!`
|
|
20
|
-
)
|
|
13
|
+
await this.installSkillAndSetupPolish()
|
|
14
|
+
await this.assertPolishScriptWrittenToExpectedPlace()
|
|
21
15
|
}
|
|
22
16
|
|
|
23
17
|
@test()
|
|
24
18
|
protected static async polishResultsAreExpected() {
|
|
25
|
-
const results = await this.
|
|
19
|
+
const results = await this.installSkillAndSetupPolish()
|
|
26
20
|
const { filename, destination } = await this.generateExpectedFile()
|
|
27
21
|
|
|
28
22
|
assert.isLength(results.files, 1)
|
|
@@ -40,7 +34,7 @@ export default class SettingUpPolishTest extends AbstractCliTest {
|
|
|
40
34
|
|
|
41
35
|
@test()
|
|
42
36
|
protected static async createsExpectedScript() {
|
|
43
|
-
await this.
|
|
37
|
+
await this.installSkillAndSetupPolish()
|
|
44
38
|
const pkg = this.Service('pkg')
|
|
45
39
|
const scripts = pkg.get('scripts')
|
|
46
40
|
assert.isEqual(scripts.polish, 'heartwood-polish')
|
|
@@ -48,24 +42,56 @@ export default class SettingUpPolishTest extends AbstractCliTest {
|
|
|
48
42
|
|
|
49
43
|
@test()
|
|
50
44
|
protected static async makeSureScriptHasSomethingAndIsValid() {
|
|
51
|
-
const results = await this.
|
|
45
|
+
const results = await this.installSkillAndSetupPolish()
|
|
52
46
|
const { destination } = await this.generateExpectedFile()
|
|
53
47
|
const contents = diskUtil.readFile(destination)
|
|
54
48
|
assert.isNotEqual(contents, '')
|
|
55
49
|
await this.assertValidActionResponseFiles(results)
|
|
56
50
|
}
|
|
57
51
|
|
|
52
|
+
@test()
|
|
53
|
+
protected static async polishCreatesExpectedFileNameBasedOnSkillsNamespace() {
|
|
54
|
+
await this.installSkill()
|
|
55
|
+
const pkg = await this.Service('pkg')
|
|
56
|
+
const namespace = 'my-skill'
|
|
57
|
+
pkg.set({
|
|
58
|
+
path: ['skill', 'namespace'],
|
|
59
|
+
value: namespace,
|
|
60
|
+
})
|
|
61
|
+
|
|
62
|
+
await this.setupPolish()
|
|
63
|
+
await this.assertPolishScriptWrittenToExpectedPlace()
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
private static async assertPolishScriptWrittenToExpectedPlace() {
|
|
67
|
+
const { destination } = await this.generateExpectedFile()
|
|
68
|
+
|
|
69
|
+
assert.isTrue(
|
|
70
|
+
diskUtil.doesFileExist(destination),
|
|
71
|
+
`Did not find polish script at ${destination}!`
|
|
72
|
+
)
|
|
73
|
+
}
|
|
74
|
+
|
|
58
75
|
private static async generateExpectedFile() {
|
|
59
76
|
const store = this.Store('skill')
|
|
77
|
+
|
|
60
78
|
const namespace = await store.loadCurrentSkillsNamespace()
|
|
61
|
-
const filename = `${
|
|
79
|
+
const filename = `${namesUtil.toKebab(namespace)}.polish.ts`
|
|
62
80
|
const destination = this.resolvePath('src', filename)
|
|
63
81
|
return { filename, destination }
|
|
64
82
|
}
|
|
65
83
|
|
|
84
|
+
private static async installSkillAndSetupPolish() {
|
|
85
|
+
await this.installSkill()
|
|
86
|
+
const results = await this.setupPolish()
|
|
87
|
+
return results
|
|
88
|
+
}
|
|
89
|
+
|
|
66
90
|
private static async setupPolish() {
|
|
91
|
+
return await this.Action('polish', 'setup').execute({})
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
private static async installSkill() {
|
|
67
95
|
await this.FeatureFixture().installCachedFeatures('polish')
|
|
68
|
-
const results = await this.Action('polish', 'setup').execute({})
|
|
69
|
-
return results
|
|
70
96
|
}
|
|
71
97
|
}
|
|
@@ -20,6 +20,9 @@ export default class UpgradingToEslint9Test extends AbstractCliTest {
|
|
|
20
20
|
this.migrator = EsLint9Migrator.Migrator({ cwd: this.cwd })
|
|
21
21
|
|
|
22
22
|
delete EsLint9Migrator.Class
|
|
23
|
+
EsLint9Migrator.disk = {
|
|
24
|
+
...diskUtil,
|
|
25
|
+
}
|
|
23
26
|
EsLint9Migrator.disk.deleteFile = (file) => {
|
|
24
27
|
this.deletedFiles.push(file)
|
|
25
28
|
}
|
|
@@ -109,6 +112,21 @@ export default class UpgradingToEslint9Test extends AbstractCliTest {
|
|
|
109
112
|
assert.isEqual(actual, 'old eslintrc')
|
|
110
113
|
}
|
|
111
114
|
|
|
115
|
+
@test()
|
|
116
|
+
protected static async doNotCopyVsCodeSettingsIfLegacyEsLintConfigDoesNotExist() {
|
|
117
|
+
EsLint9Migrator.disk = diskUtil
|
|
118
|
+
await this.copyLegacyModuleAndMigrate()
|
|
119
|
+
|
|
120
|
+
EsLint9Migrator.disk.writeFile = () =>
|
|
121
|
+
assert.fail('Should not write file')
|
|
122
|
+
|
|
123
|
+
await this.migrate()
|
|
124
|
+
|
|
125
|
+
this.migrator = EsLint9Migrator.Migrator({ cwd: this.cwd })
|
|
126
|
+
|
|
127
|
+
await this.migrate()
|
|
128
|
+
}
|
|
129
|
+
|
|
112
130
|
private static async copyLegacyModuleAndMigrate() {
|
|
113
131
|
await this.copyOverLegacyModule()
|
|
114
132
|
await this.migrate()
|
|
@@ -20,7 +20,7 @@ export default class SetupAction extends AbstractAction<OptionsSchema> {
|
|
|
20
20
|
const writer = this.Writer('polish')
|
|
21
21
|
const files = await writer.writePolishScript(
|
|
22
22
|
diskUtil.resolvePath(this.cwd, 'src'),
|
|
23
|
-
namespace
|
|
23
|
+
namespace
|
|
24
24
|
)
|
|
25
25
|
|
|
26
26
|
const scriptUpdater = ScriptUpdaterImpl.FromFeature(this.parent, {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import pathUtil from 'path'
|
|
2
|
+
import { namesUtil } from '@sprucelabs/spruce-skill-utils'
|
|
2
3
|
import AbstractWriter from '../../../writers/AbstractWriter'
|
|
3
4
|
|
|
4
5
|
export default class PolishWriter extends AbstractWriter {
|
|
@@ -6,7 +7,7 @@ export default class PolishWriter extends AbstractWriter {
|
|
|
6
7
|
destinationDir: string,
|
|
7
8
|
skillNamespace: string
|
|
8
9
|
) {
|
|
9
|
-
const filename = `${skillNamespace}.polish.ts`
|
|
10
|
+
const filename = `${namesUtil.toKebab(skillNamespace)}.polish.ts`
|
|
10
11
|
const resolvedDestination = pathUtil.join(destinationDir, filename)
|
|
11
12
|
const content = this.templates.polish()
|
|
12
13
|
|
|
@@ -195,7 +195,7 @@ export default class TestReporter {
|
|
|
195
195
|
private updateOrientation() {
|
|
196
196
|
const frame = this.window.getFrame()
|
|
197
197
|
|
|
198
|
-
if (frame.width * 0.
|
|
198
|
+
if (frame.width * 0.4 > frame.height) {
|
|
199
199
|
this.orientation = 'landscape'
|
|
200
200
|
} else {
|
|
201
201
|
this.orientation = 'portrait'
|
|
@@ -18,9 +18,12 @@ export default class EsLint9Migrator implements Migrator {
|
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
public async migrate() {
|
|
21
|
-
this.deleteFileIfExists('.eslintignore')
|
|
21
|
+
const didDeleteFile = this.deleteFileIfExists('.eslintignore')
|
|
22
22
|
this.deleteFileIfExists('.eslintrc.js')
|
|
23
|
-
|
|
23
|
+
|
|
24
|
+
if (didDeleteFile) {
|
|
25
|
+
await this.updateVsCodeSettingsIfExists()
|
|
26
|
+
}
|
|
24
27
|
}
|
|
25
28
|
|
|
26
29
|
private async updateVsCodeSettingsIfExists() {
|
|
@@ -41,7 +44,9 @@ export default class EsLint9Migrator implements Migrator {
|
|
|
41
44
|
const path = this.disk.resolvePath(this.cwd, filename)
|
|
42
45
|
if (this.disk.doesFileExist(path)) {
|
|
43
46
|
this.disk.deleteFile(path)
|
|
47
|
+
return true
|
|
44
48
|
}
|
|
49
|
+
return false
|
|
45
50
|
}
|
|
46
51
|
|
|
47
52
|
private get disk() {
|
|
@@ -163,7 +163,7 @@ export default class SchemaTemplateItemBuilder {
|
|
|
163
163
|
private pluckFields(localSchema: Schema) {
|
|
164
164
|
const fields = localSchema.dynamicFieldSignature
|
|
165
165
|
? { dynamicField: localSchema.dynamicFieldSignature }
|
|
166
|
-
: localSchema.fields ?? {}
|
|
166
|
+
: (localSchema.fields ?? {})
|
|
167
167
|
|
|
168
168
|
const namedFields = Object.keys(fields).map((name) => ({
|
|
169
169
|
name,
|
package/build/.spruce/.gitignore
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
tmp
|
package/src/.spruce/.gitignore
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
tmp
|