From 49ac1a7968b53fb71f27cf47f6f39daed53674bb Mon Sep 17 00:00:00 2001 From: Maximilian Franzke <787658+mfranzke@users.noreply.github.com> Date: Sat, 1 Feb 2025 14:45:27 +0100 Subject: [PATCH 1/2] refactor(xo): removed ignores we shouldn't ignore `xo` in general. `xo` is here to hurt our feelings. If it does, that's a good thing. --- .xo-config.cjs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.xo-config.cjs b/.xo-config.cjs index b68eeef82ea..9dfcfc30c1c 100644 --- a/.xo-config.cjs +++ b/.xo-config.cjs @@ -1,9 +1,7 @@ module.exports = { prettier: true, ignores: [ - './showcases/nuxt-showcase/**', - './packages/migration/**', - './packages/foundations/**' + './showcases/nuxt-showcase/**' ], overrides: [ { From 467a9a61599b7c53d17cdffe5238c6be21c9d682 Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Sat, 1 Feb 2025 22:03:21 +0100 Subject: [PATCH 2/2] refactor: optimizations --- packages/foundations/assets/fonts/generate-eu-fonts.ts | 7 +++---- packages/migration/src/data.ts | 6 +++--- packages/migration/src/migration/index.ts | 9 +++++++-- packages/migration/src/program.ts | 1 + packages/migration/src/types.ts | 7 +++++-- .../migration/test/color-q32024/color-q32024.spec.ts | 4 +--- packages/migration/test/icon-q32024/icon-q32024.spec.ts | 4 +--- packages/migration/test/v0.0.5-v0.0.6/v005_v006.spec.ts | 4 +--- packages/migration/test/v0.0.6-v0.0.7/v006_v007.spec.ts | 4 +--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/foundations/assets/fonts/generate-eu-fonts.ts b/packages/foundations/assets/fonts/generate-eu-fonts.ts index 061cc9c82a8..3ef5ab7c881 100644 --- a/packages/foundations/assets/fonts/generate-eu-fonts.ts +++ b/packages/foundations/assets/fonts/generate-eu-fonts.ts @@ -1,10 +1,9 @@ import { exec } from 'node:child_process'; import { promisify } from 'node:util'; +import { dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; import { glob } from 'glob'; -import { dirname } from 'path'; -import { fileURLToPath } from 'url'; - const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename).replaceAll('\\', '/'); @@ -14,7 +13,7 @@ const generateFonts = async () => { console.log('Generating EU fonts...'); try { await execAsync('pyftsubset --help'); - } catch (e) { + } catch { console.warn( 'You need to install pyftsubset. Check packages/foundations/assets/fonts/README.md for more information.' ); diff --git a/packages/migration/src/data.ts b/packages/migration/src/data.ts index f01533d1fb8..516ad1cea27 100644 --- a/packages/migration/src/data.ts +++ b/packages/migration/src/data.ts @@ -1,9 +1,9 @@ +import type { ReplaceInFileConfig } from 'replace-in-file'; import type { ProgrammOptionsType } from './types'; import { colorQ32024 } from './migration/color-q32024'; -import type { ReplaceInFileConfig } from 'replace-in-file'; import { iconQ32024 } from './migration/icon-q32024'; -import { v005_v006 } from './migration/v0.0.5-v0.0.6'; -import { v006_v007 } from './migration/v0.0.6-v0.0.7'; +import { v005_v006 } from './migration/v0.0.5-v0.0.6.ts'; +import { v006_v007 } from './migration/v0.0.6-v0.0.7.ts'; export const migrationTypes: Record = { colorQ32024, diff --git a/packages/migration/src/migration/index.ts b/packages/migration/src/migration/index.ts index c41fc72bb9e..789ca53a345 100644 --- a/packages/migration/src/migration/index.ts +++ b/packages/migration/src/migration/index.ts @@ -1,6 +1,10 @@ +#!/usr/bin/env node import { globSync } from 'glob'; -import type { ReplaceInFileConfig, ReplaceResult } from 'replace-in-file'; -import { replaceInFileSync } from 'replace-in-file'; +import { + type ReplaceInFileConfig, + type ReplaceResult, + replaceInFileSync +} from 'replace-in-file'; import type { OptionsType } from '../types'; import { migrationTypes } from '../data'; import { AdditionalInformation } from './additional-information'; @@ -50,6 +54,7 @@ export const migrate = ( if (cli) { console.log(result); } + return result; } } diff --git a/packages/migration/src/program.ts b/packages/migration/src/program.ts index 52ee197f927..68ac79c1437 100644 --- a/packages/migration/src/program.ts +++ b/packages/migration/src/program.ts @@ -1,3 +1,4 @@ +#!/usr/bin/env node import { program } from 'commander'; import type { OptionsType, ProgrammOptionsType } from './types'; diff --git a/packages/migration/src/types.ts b/packages/migration/src/types.ts index 6359021e84d..326e7692cf8 100644 --- a/packages/migration/src/types.ts +++ b/packages/migration/src/types.ts @@ -1,4 +1,5 @@ -import { v005_v006 } from './migration/v0.0.5-v0.0.6'; +#!/usr/bin/env node +import { v005_v006 } from './migration/v0.0.5-v0.0.6.ts'; export type ProgrammOptionsType = { name: string; @@ -12,6 +13,8 @@ export type ProgrammOptionsType = { export type OptionsType = { src: string; - type: (string | 'colorQ32024' | 'iconQ32024' | 'v005_v006' | 'v006_v007')[]; + type: Array< + string | 'colorQ32024' | 'iconQ32024' | 'v005_v006' | 'v006_v007' + >; dryRun?: string | boolean; }; diff --git a/packages/migration/test/color-q32024/color-q32024.spec.ts b/packages/migration/test/color-q32024/color-q32024.spec.ts index 1bbf59447ea..4caf1f7314e 100644 --- a/packages/migration/test/color-q32024/color-q32024.spec.ts +++ b/packages/migration/test/color-q32024/color-q32024.spec.ts @@ -12,8 +12,6 @@ describe('color-q32024', () => { expect(result).not.undefined; - expect( - (result as ReplaceResult[]).filter((res) => res.hasChanged) - ).toHaveLength(1); + expect(result!.filter((res) => res.hasChanged)).toHaveLength(1); }); }); diff --git a/packages/migration/test/icon-q32024/icon-q32024.spec.ts b/packages/migration/test/icon-q32024/icon-q32024.spec.ts index 61e64a73701..7ad47ab274f 100644 --- a/packages/migration/test/icon-q32024/icon-q32024.spec.ts +++ b/packages/migration/test/icon-q32024/icon-q32024.spec.ts @@ -12,8 +12,6 @@ describe('icon-q32024', () => { expect(result).not.undefined; - expect( - (result as ReplaceResult[]).filter((res) => res.hasChanged) - ).toHaveLength(1); + expect(result!.filter((res) => res.hasChanged)).toHaveLength(1); }); }); diff --git a/packages/migration/test/v0.0.5-v0.0.6/v005_v006.spec.ts b/packages/migration/test/v0.0.5-v0.0.6/v005_v006.spec.ts index d85768603cc..ea10be3a7d3 100644 --- a/packages/migration/test/v0.0.5-v0.0.6/v005_v006.spec.ts +++ b/packages/migration/test/v0.0.5-v0.0.6/v005_v006.spec.ts @@ -12,8 +12,6 @@ describe('v005_v006', () => { expect(result).not.undefined; - expect( - (result as ReplaceResult[]).filter((res) => res.hasChanged) - ).toHaveLength(1); + expect(result!.filter((res) => res.hasChanged)).toHaveLength(1); }); }); diff --git a/packages/migration/test/v0.0.6-v0.0.7/v006_v007.spec.ts b/packages/migration/test/v0.0.6-v0.0.7/v006_v007.spec.ts index 61d5fa2b758..24a8749afac 100644 --- a/packages/migration/test/v0.0.6-v0.0.7/v006_v007.spec.ts +++ b/packages/migration/test/v0.0.6-v0.0.7/v006_v007.spec.ts @@ -12,8 +12,6 @@ describe('v006_v007', () => { expect(result).not.undefined; - expect( - (result as ReplaceResult[]).filter((res) => res.hasChanged) - ).toHaveLength(1); + expect(result!.filter((res) => res.hasChanged)).toHaveLength(1); }); });