From 19b7c7664ac9a0cd4dc85524396ef2f5d3c734bd Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 28 Jan 2025 15:08:42 +0100 Subject: [PATCH] update scripts to typescript --- package.json | 4 +-- .../{clear-logs.js => clear-logs.ts} | 6 ++--- scripts/dashboard/{shared.js => shared.ts} | 6 ++--- scripts/email/deploy.ts | 14 ++-------- .../shared-helper.ts} | 27 ++++++------------- scripts/producer/shared.js | 6 ----- scripts/producer/shared.ts | 1 + 7 files changed, 18 insertions(+), 46 deletions(-) rename scripts/dashboard/{clear-logs.js => clear-logs.ts} (74%) rename scripts/dashboard/{shared.js => shared.ts} (77%) rename scripts/{shared-helper.js => helpers/shared-helper.ts} (67%) delete mode 100644 scripts/producer/shared.js create mode 100644 scripts/producer/shared.ts diff --git a/package.json b/package.json index c9b62b5..15600db 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "dashboard:clear-logs": "node scripts/dashboard/clear-logs.js", - "dashboard:shared": "node scripts/dashboard/shared.js", + "dashboard:clear-logs": "ts-node scripts/dashboard/clear-logs.ts", + "dashboard:shared": "ts-node scripts/dashboard/shared.ts", "producer:shared": "node scripts/producer/shared.js", "email:deploy": "ts-node scripts/email/deploy.ts" }, diff --git a/scripts/dashboard/clear-logs.js b/scripts/dashboard/clear-logs.ts similarity index 74% rename from scripts/dashboard/clear-logs.js rename to scripts/dashboard/clear-logs.ts index ed4217a..9ecbe08 100644 --- a/scripts/dashboard/clear-logs.js +++ b/scripts/dashboard/clear-logs.ts @@ -1,6 +1,6 @@ -const path = require('path'); -const fs = require('fs'); +import fs from 'fs'; +import path from 'path'; const dashboardPath = path.join(__dirname, '../../dashboard'); @@ -13,5 +13,5 @@ const logNames = [ for (const logName of logNames) { const logFullPath = path.join(dashboardPath, logName); - fs.rmSync(logFullPath); + if (fs.existsSync(logFullPath)) fs.rmSync(logFullPath); } \ No newline at end of file diff --git a/scripts/dashboard/shared.js b/scripts/dashboard/shared.ts similarity index 77% rename from scripts/dashboard/shared.js rename to scripts/dashboard/shared.ts index c902b8f..735a451 100644 --- a/scripts/dashboard/shared.js +++ b/scripts/dashboard/shared.ts @@ -1,7 +1,5 @@ -const path = require('path'); -const fs = require('fs'); -const { SharedHelper } = require('../shared-helper.js'); - +import { SharedHelper } from "../helpers/shared-helper"; +import path from "path"; const helper = new SharedHelper(path.join(__dirname, '../../dashboard/shared')) diff --git a/scripts/email/deploy.ts b/scripts/email/deploy.ts index 330163f..9d71694 100644 --- a/scripts/email/deploy.ts +++ b/scripts/email/deploy.ts @@ -4,19 +4,11 @@ import path from 'path'; import { createZip } from '../helpers/zip-helper'; import { DeployHelper } from '../helpers/deploy-helper'; -const MODE = process.env.MODE; -const isProduction = MODE === 'prod'; - -if (MODE === 'prod') { - console.error('production mode not implemented yet') - process.exit(); -} - const TMP_PATH = path.join(__dirname, '../../tmp'); const LOCAL_PATH = path.join(__dirname, '../../email'); -const REMOTE_PATH = '/home/testmode/litlyx/email'; +const REMOTE_PATH = '/home/production/litlyx/email'; async function main() { @@ -26,9 +18,7 @@ async function main() { const archive = createZip(TMP_PATH + '/email.zip'); archive.directory(LOCAL_PATH + '/dist', '/dist'); - const ecosystemContent = fs.readFileSync(LOCAL_PATH + '/ecosystem.config.js', 'utf8'); - const devContent = ecosystemContent.replace(/name: '(.*?)'/, "name: 'test-$1'"); - archive.append(Buffer.from(devContent), { name: '/ecosystem.config.js' }) + archive.file(LOCAL_PATH + '/ecosystem.config.js', { name: '/ecosystem.config.js' }) archive.file(LOCAL_PATH + '/package.json', { name: '/package.json' }); archive.file(LOCAL_PATH + '/pnpm-lock.yaml', { name: '/pnpm-lock.yaml' }); diff --git a/scripts/shared-helper.js b/scripts/helpers/shared-helper.ts similarity index 67% rename from scripts/shared-helper.js rename to scripts/helpers/shared-helper.ts index 29687bf..5b6b876 100644 --- a/scripts/shared-helper.js +++ b/scripts/helpers/shared-helper.ts @@ -1,17 +1,13 @@ -const path = require('path'); -const fs = require('fs'); +import path from 'path'; +import fs from 'fs'; -class SharedHelper { +export class SharedHelper { - static getSharedPath() { - return path.join(__dirname, '../shared_global'); - } + constructor(private localSharedPath: string) { } - constructor(localSharedPath) { - this.localSharedPath = localSharedPath; - } + static getSharedPath() { return path.join(__dirname, '../../shared_global'); } clear() { if (fs.existsSync(this.localSharedPath)) { @@ -20,28 +16,21 @@ class SharedHelper { } } - create(name) { + create(name: string) { const localFolder = path.join(this.localSharedPath, name); fs.mkdirSync(localFolder); } - copy(name) { + copy(name: string) { const localSharedFile = path.join(this.localSharedPath, name); const sharedFile = path.join(SharedHelper.getSharedPath(), name); fs.cpSync(sharedFile, localSharedFile); } - copyFolder(name) { + copyFolder(name: string) { const localFolder = path.join(this.localSharedPath, name); const sharedFolder = path.join(SharedHelper.getSharedPath(), name); fs.cpSync(sharedFolder, localFolder, { force: true, recursive: true }); } } - - - - -module.exports = { - SharedHelper -} \ No newline at end of file diff --git a/scripts/producer/shared.js b/scripts/producer/shared.js deleted file mode 100644 index 62ae601..0000000 --- a/scripts/producer/shared.js +++ /dev/null @@ -1,6 +0,0 @@ -const { getSharedPath } = require("../shared-helper"); - - - -console.log('SHAREDPATH') -console.log(getSharedPath()); \ No newline at end of file diff --git a/scripts/producer/shared.ts b/scripts/producer/shared.ts new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/scripts/producer/shared.ts @@ -0,0 +1 @@ +