@rtorcato/repo-tooling 3.8.1 → 3.8.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.
- package/dist/languages/js/fixers.js +41 -9
- package/package.json +1 -1
|
@@ -28,6 +28,22 @@ const ESLINT_SCRIPTS = {
|
|
|
28
28
|
const PRETTIER_SCRIPTS = {
|
|
29
29
|
format: 'prettier --write .',
|
|
30
30
|
};
|
|
31
|
+
/** Kept in step with the knip line of getScripts() in package-json.ts. */
|
|
32
|
+
const KNIP_SCRIPTS = {
|
|
33
|
+
knip: 'knip',
|
|
34
|
+
};
|
|
35
|
+
/** Kept in step with the typescript branch of getScripts() in package-json.ts. */
|
|
36
|
+
const TSCONFIG_SCRIPTS = {
|
|
37
|
+
typecheck: 'tsc --noEmit',
|
|
38
|
+
};
|
|
39
|
+
// getScripts() also emits `test:ui`, but only the browser/both environments
|
|
40
|
+
// install @vitest/ui, so a fixed-up repo would get a script it can't run.
|
|
41
|
+
/** Kept in step with the vitest branch of getScripts() in package-json.ts. */
|
|
42
|
+
const VITEST_SCRIPTS = {
|
|
43
|
+
test: 'vitest',
|
|
44
|
+
'test:watch': 'vitest --watch',
|
|
45
|
+
coverage: 'vitest run --coverage',
|
|
46
|
+
};
|
|
31
47
|
import { WORKSPACE_FILE, dependsOnEsbuild, ensurePnpmSettings, familyGlob, } from '../../cli/generators/pnpm-workspace.js';
|
|
32
48
|
import { generatePostcss } from '../../cli/generators/postcss.js';
|
|
33
49
|
import { generateCypressConfig, generateVitestConfig } from '../../cli/generators/testing.js';
|
|
@@ -150,13 +166,19 @@ export const FIXERS = [
|
|
|
150
166
|
},
|
|
151
167
|
{
|
|
152
168
|
target: 'tsconfig',
|
|
153
|
-
description: 'Scaffold tsconfig.json extending the @rtorcato/repo-tooling preset',
|
|
169
|
+
description: 'Scaffold tsconfig.json extending the @rtorcato/repo-tooling preset, plus the `typecheck` script',
|
|
154
170
|
appliesTo: ['TypeScript'],
|
|
155
|
-
outputs: ['tsconfig.json'],
|
|
171
|
+
outputs: ['tsconfig.json', 'package.json (scripts)'],
|
|
156
172
|
canFixDrift: true,
|
|
157
173
|
async run({ targetDir }) {
|
|
158
174
|
const result = await copyPreset('tsconfig', targetDir);
|
|
159
|
-
|
|
175
|
+
const filesWritten = [result.target];
|
|
176
|
+
// Without `typecheck` the generated CI drops its typecheck job entirely
|
|
177
|
+
// (#377). Shared with non-JS paths, so this is a no-op when there's no
|
|
178
|
+
// package.json to add it to.
|
|
179
|
+
if (await ensureScripts(targetDir, TSCONFIG_SCRIPTS))
|
|
180
|
+
filesWritten.push('package.json');
|
|
181
|
+
return { filesWritten };
|
|
160
182
|
},
|
|
161
183
|
},
|
|
162
184
|
{
|
|
@@ -191,9 +213,9 @@ export const FIXERS = [
|
|
|
191
213
|
},
|
|
192
214
|
{
|
|
193
215
|
target: 'vitest',
|
|
194
|
-
description: 'Scaffold vitest.config.ts (preserves vitest.setup.ts if present)',
|
|
216
|
+
description: 'Scaffold vitest.config.ts (preserves vitest.setup.ts if present), plus the scripts that run it',
|
|
195
217
|
appliesTo: ['Vitest'],
|
|
196
|
-
outputs: ['vitest.config.ts'],
|
|
218
|
+
outputs: ['vitest.config.ts', 'package.json (scripts)'],
|
|
197
219
|
canFixDrift: true,
|
|
198
220
|
async run({ targetDir, pkg }) {
|
|
199
221
|
const setupPath = path.join(targetDir, 'vitest.setup.ts');
|
|
@@ -203,7 +225,12 @@ export const FIXERS = [
|
|
|
203
225
|
if (hadSetup && savedSetup !== null) {
|
|
204
226
|
await fs.writeFile(setupPath, savedSetup);
|
|
205
227
|
}
|
|
206
|
-
|
|
228
|
+
const filesWritten = ['vitest.config.ts'];
|
|
229
|
+
// Without `coverage`/`test` the generated CI drops the whole test job,
|
|
230
|
+
// Codecov upload included (#377).
|
|
231
|
+
if (await ensureScripts(targetDir, VITEST_SCRIPTS))
|
|
232
|
+
filesWritten.push('package.json');
|
|
233
|
+
return { filesWritten };
|
|
207
234
|
},
|
|
208
235
|
},
|
|
209
236
|
{
|
|
@@ -497,13 +524,18 @@ export const FIXERS = [
|
|
|
497
524
|
},
|
|
498
525
|
{
|
|
499
526
|
target: 'knip',
|
|
500
|
-
description: 'Scaffold knip.json (entry globs matched to the package.json build model)',
|
|
527
|
+
description: 'Scaffold knip.json (entry globs matched to the package.json build model), plus the `knip` script',
|
|
501
528
|
appliesTo: ['knip'],
|
|
502
|
-
outputs: ['knip.json'],
|
|
529
|
+
outputs: ['knip.json', 'package.json (scripts)'],
|
|
503
530
|
canFixDrift: true,
|
|
504
531
|
async run({ targetDir }) {
|
|
505
532
|
await generateKnipConfig(targetDir);
|
|
506
|
-
|
|
533
|
+
const filesWritten = ['knip.json'];
|
|
534
|
+
// Without `knip` the generated CI drops its unused-code step, and with no
|
|
535
|
+
// check/lint script either the whole lint job disappears (#377).
|
|
536
|
+
if (await ensureScripts(targetDir, KNIP_SCRIPTS))
|
|
537
|
+
filesWritten.push('package.json');
|
|
538
|
+
return { filesWritten };
|
|
507
539
|
},
|
|
508
540
|
},
|
|
509
541
|
{
|
package/package.json
CHANGED