From 3836c7d5e0e4594e83d625ae0dcde643ef14f87a Mon Sep 17 00:00:00 2001 From: Rodrigo Medina Date: Fri, 3 Jun 2022 23:39:57 -0500 Subject: [PATCH 1/3] Modified package.json to latest --- src/version.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.ts b/src/version.ts index 67065ec..55f845d 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1 +1 @@ -export const version: string = "2.3.2"; +export const version: string = "2.3.7"; From d5f14d21e333a89f19a9cc60ee53391cca7047fc Mon Sep 17 00:00:00 2001 From: Rodrigo Medina Date: Mon, 13 Jun 2022 23:18:35 -0500 Subject: [PATCH 2/3] Fixed wrong path for templates --- package.json | 3 ++- src/utils/files.utils.ts | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8a46ead..b68ec43 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "start": "npm run build && npm i -g && challenge-generator", "test": "jest", "version:output": "echo \"export const version: string = \"'\"'\"$(cat package.json | jq -r '.version')\"'\"'\";\" > src/version.ts", - "build": "npm run version:output && npm run clean:some && tsc -p .", + "copy-files": "cp src/templates/{run,testframework}.templates.* lib/templates/", + "build": "npm run version:output && npm run clean:some && tsc -p . && npm run copy-files", "format": "prettier -w .", "format:check": "prettier -c . '!lib/**/*|README.md'", "prepare": "npm run build", diff --git a/src/utils/files.utils.ts b/src/utils/files.utils.ts index 9dcdb0c..67e1893 100644 --- a/src/utils/files.utils.ts +++ b/src/utils/files.utils.ts @@ -1,6 +1,9 @@ import fs from "fs"; import { FileType, FileExtension, ProgrammingLanguage } from "../models"; import { minify } from "terser"; +import { join } from "path"; + +const BIN_PATH = join(__dirname, "../../lib"); export type FileWriter = ( content: string, @@ -23,7 +26,7 @@ export const createOrReplaceDir = (path: string): FileWriter => { fileType: FileType, fileExtension: FileExtension ) => { - fs.writeFileSync(`${path}/${fileType}${fileExtension}`, content); + fs.writeFileSync(join(`${path}`, `${fileType}${fileExtension}`), content); }; }; @@ -40,7 +43,7 @@ export const readTemplateTestFile = async ( minifyContent: Boolean = true ): Promise => { const templateContent: string = fs.readFileSync( - `src/templates/testframework.templates${fileExtension}`, + join(BIN_PATH, `templates`, `testframework.templates${fileExtension}`), "utf8" ); @@ -57,7 +60,7 @@ export const readTemplateTestFile = async ( */ export const readTemplateRunFile = (fileExtension: FileExtension): string => { return fs.readFileSync( - `src/templates/run.templates${fileExtension}.bash`, + join(BIN_PATH, `templates`, `run.templates${fileExtension}.bash`), "utf8" ); }; From ac25b78cae16e0d98f151021de16a41fe7802d36 Mon Sep 17 00:00:00 2001 From: Rodrigo Medina Date: Mon, 13 Jun 2022 23:25:10 -0500 Subject: [PATCH 3/3] Extended package.json bc CI issues --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b68ec43..c016c67 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "start": "npm run build && npm i -g && challenge-generator", "test": "jest", "version:output": "echo \"export const version: string = \"'\"'\"$(cat package.json | jq -r '.version')\"'\"'\";\" > src/version.ts", - "copy-files": "cp src/templates/{run,testframework}.templates.* lib/templates/", + "copy-files": "cp src/templates/run.templates.js.bash src/templates/run.templates.py.bash src/templates/run.templates.java.bash src/templates/testframework.templates.js src/templates/testframework.templates.py src/templates/testframework.templates.java lib/templates/", "build": "npm run version:output && npm run clean:some && tsc -p . && npm run copy-files", "format": "prettier -w .", "format:check": "prettier -c . '!lib/**/*|README.md'",