diff --git a/package.json b/package.json index a383aac..f50e507 100644 --- a/package.json +++ b/package.json @@ -2,11 +2,10 @@ "name": "browser_extension_template", "version": "0.0.1", "private": true, - "type": "module", "scripts": { - "deploy-v3": "npm run build-tooling && node ./tools/deploy.js && npm run sync && npm run build-js && npm run build-css && node ./tools/clean.js", - "deploy-v2": "npm run deploy-v3 && node ./tools/v2.js", - "build-js": "webpack --config ./webpack.config.cjs && webpack --config ./webpack.config.settings.cjs && webpack --config ./webpack.config.background.cjs", + "deploy-v3": "npx rimraf ./dist/ && npm run build-tooling && node ./tools/deploy.js && npm run sync && npm run build-js && npm run build-css && node ./tools/clean.js", + "deploy-v2": " npm run deploy-v3 && node ./tools/v2.js", + "build-js": "webpack --config ./webpack.config.ts && webpack --config ./webpack.config.settings.ts && webpack --config ./webpack.config.background.ts", "build-css": "sass ./src/sass/:./dist/css/", "build-tooling": "tsc --project ./tooling.tsconfig.json", "watch-ts": "tsc -w -p tsconfig.json", @@ -19,6 +18,7 @@ "@webcomponents/webcomponentsjs": "^2.7.0", "sass": "^1.39.0", "ts-loader": "^9.4.2", + "ts-node": "^10.9.1", "typescript": "^4.2.4", "webpack": "^5.75.0", "webpack-cli": "^5.0.1" diff --git a/tools/clean.ts b/tools/clean.ts index caba573..2ed412e 100644 --- a/tools/clean.ts +++ b/tools/clean.ts @@ -1,4 +1,5 @@ -import * as fs from "fs"; +// @ts-ignore +const fs = require("fs"); function removeExport(file: string) { let content = fs.readFileSync(file, "utf8"); diff --git a/tools/deploy.ts b/tools/deploy.ts index a12bf54..7308509 100644 --- a/tools/deploy.ts +++ b/tools/deploy.ts @@ -1,6 +1,8 @@ -import * as fs from 'fs'; -import * as path from 'path'; -const appConfig = JSON.parse(fs.readFileSync('./app.config.json', 'utf8')); +const path = require('path'); +// @ts-ignore +const fs = require('fs'); + +const appConfigJson = JSON.parse(fs.readFileSync('./app.config.json', 'utf8')); const DEPLOY_ENTRY = "./public/"; const DEPLOY_TARGET = "./dist/"; @@ -37,7 +39,7 @@ function findHtmlFilesRecursive(source: string): string[] { function replaceKeywordsInHtmlFile(file: string) { let content = fs.readFileSync(file, 'utf8'); - const pairs = appConfig.htmlTemplatePairs; + const pairs = appConfigJson.htmlTemplatePairs; pairs.forEach(function (pair: object) { // @ts-ignore content = content.replaceAll(pair.key, pair.value); @@ -81,4 +83,4 @@ mkdirSync(DEPLOY_TARGET); copyFiles(DEPLOY_ENTRY, DEPLOY_TARGET); buildHtmlFiles(DEPLOY_ENTRY); -console.log("Deployed to " + DEPLOY_TARGET); \ No newline at end of file +console.log("Deployed to " + DEPLOY_TARGET); diff --git a/tools/syncConfig.ts b/tools/syncConfig.ts index 22b800c..a9eeaa5 100644 --- a/tools/syncConfig.ts +++ b/tools/syncConfig.ts @@ -1,8 +1,9 @@ -import * as fs from 'fs'; +// @ts-ignore +const fs = require('fs'); const appConfig = JSON.parse(fs.readFileSync('./app.config.json', 'utf8')); const pkg = JSON.parse(fs.readFileSync('./package.json', 'utf8')); -const manifest = JSON.parse(fs.readFileSync('./public/manifest.json', 'utf8')); +const manifestJson = JSON.parse(fs.readFileSync('./public/manifest.json', 'utf8')); pkg.version = appConfig.AppData.version; pkg.name = appConfig.AppData.id; @@ -13,10 +14,10 @@ pkg.license = appConfig.AppData.license; pkg.repository = appConfig.AppData.repository; pkg.bugs = appConfig.AppData.bugs; -manifest.version = appConfig.AppData.version; -manifest.name = appConfig.AppData.name; -manifest.description = appConfig.AppData.description; -manifest.homepage_url = appConfig.AppData.homepage; +manifestJson.version = appConfig.AppData.version; +manifestJson.name = appConfig.AppData.name; +manifestJson.description = appConfig.AppData.description; +manifestJson.homepage_url = appConfig.AppData.homepage; fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2)); -fs.writeFileSync('./public/manifest.json', JSON.stringify(manifest, null, 2)); \ No newline at end of file +fs.writeFileSync('./public/manifest.json', JSON.stringify(manifestJson, null, 2)); diff --git a/tools/v2.ts b/tools/v2.ts index dd42ddb..d958bbe 100644 --- a/tools/v2.ts +++ b/tools/v2.ts @@ -1,4 +1,5 @@ -import * as fs from 'fs'; +// @ts-ignore +const fs = require('fs'); const manifest = JSON.parse(fs.readFileSync('./dist/manifest.json', 'utf8')); @@ -42,4 +43,4 @@ if (manifest.action) { } delete manifest.action -fs.writeFileSync('./dist/manifest.json', JSON.stringify(manifest, null, 2)); \ No newline at end of file +fs.writeFileSync('./dist/manifest.json', JSON.stringify(manifest, null, 2)); diff --git a/webpack.config.background.cjs b/webpack.config.background.ts similarity index 100% rename from webpack.config.background.cjs rename to webpack.config.background.ts diff --git a/webpack.config.settings.cjs b/webpack.config.settings.ts similarity index 100% rename from webpack.config.settings.cjs rename to webpack.config.settings.ts diff --git a/webpack.config.cjs b/webpack.config.ts similarity index 100% rename from webpack.config.cjs rename to webpack.config.ts