From 1c3c64e5fe0d859b94e1eac17e8631e35012d2c3 Mon Sep 17 00:00:00 2001 From: max-debug022 Date: Tue, 13 Feb 2024 10:33:45 +0100 Subject: [PATCH] @comet/create-app remove-showcase: Improve and fix regex for content-removal (#159) The regex is slightly changed in order to: - Fix an issue, where too much content in "Routes.tsx" is deleted - Avoid empty lines after the deletion of content - Don't delete "ConfigModule, ConsoleModule" in "fixture.modules.ts" as it is needed for an import in another module --- .../src/scripts/remove-showcase/removeShowcase.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/create-app/src/scripts/remove-showcase/removeShowcase.ts b/create-app/src/scripts/remove-showcase/removeShowcase.ts index 112e002d1..41e95d76d 100644 --- a/create-app/src/scripts/remove-showcase/removeShowcase.ts +++ b/create-app/src/scripts/remove-showcase/removeShowcase.ts @@ -7,27 +7,27 @@ import { deleteFilesAndFolders } from "../../util/deleteFilesAndFolders"; async function removeFileContent() { const contentToRemove: Array<{ file: string; - replacements: RegExp[]; + replacements: Array; }> = [ { file: `./admin/src/Routes.tsx`, - replacements: [/<.*?products.*?>/gs], + replacements: [/\s*<.*?products.*?>/g], }, { file: `./admin/src/common/MasterMenu.tsx`, - replacements: [//gs], + replacements: [/\s*\s*<\/MenuCollapsibleItem>/gs], }, { file: `./api/src/app.module.ts`, - replacements: [/ProductsModule,\n/gs], + replacements: [/\s*ProductsModule,/gs], }, { file: `./api/src/db/fixtures/fixtures.console.ts`, - replacements: [/constructor.*Product.*{}/gs, /await Promise.all\(\[generateProducts.*]\);/gs], + replacements: [/, @InjectRepository.*Product.*/gs, /\s*await Promise.all\(\[generateProducts.*]\);/gs], }, { file: `./api/src/db/fixtures/fixtures.module.ts`, - replacements: [/imports: \[MikroOrmModule.forFeature\(\[Product]\), ConfigModule, ConsoleModule],/gs], + replacements: ["MikroOrmModule.forFeature([Product]), "], }, ]; const eslint = new ESLint({