diff --git a/CHANGELOG.md b/CHANGELOG.md index a6c0cbb..650cbc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# v0.2.0 (February 11, 2023) +# v0.2.1 (February 11, 2023) - New Options: `viewport` - New Options: `policy` diff --git a/README.md b/README.md index 8b12e06..d7b0e70 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ -[![v0.2.0](https://img.shields.io/badge/version-v0.2.0-lightgray.svg?style=flat&logo=)](https://github.com/ptkdev/sveltekit-electron-adapter/blob/main/CHANGELOG.md) [![](https://img.shields.io/npm/v/@ptkdev/sveltekit-electron-adapter?color=CC3534&logo=npm)](https://www.npmjs.com/package/@ptkdev/sveltekit-electron-adapter) [![License: MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat&logo=license)](https://github.com/ptkdev/sveltekit-electron-adapter/blob/main/LICENSE.md) [![Language: TypeScript](https://img.shields.io/badge/language-typescript-blue.svg?style=flat&logo=typescript)](https://www.typescriptlang.org/) [![Framework: Grammy](https://img.shields.io/badge/powered%20by-grammy-009dca.svg?style=flat&logo=telegram)](https://grammy.dev/) [![ECMAScript: 2019](https://img.shields.io/badge/ES-9-F7DF1E.svg?style=flat&logo=javascript)](https://github.com/tc39/ecma262) [![Discord Server](https://discordapp.com/api/guilds/383373985666301975/embed.png)](https://discord.ptkdev.io) +[![v0.2.1-nightly.0](https://img.shields.io/badge/version-v0.2.1--nightly.0-lightgray.svg?style=flat&logo=)](https://github.com/ptkdev/sveltekit-electron-adapter/blob/main/CHANGELOG.md) [![](https://img.shields.io/npm/v/@ptkdev/sveltekit-electron-adapter?color=CC3534&logo=npm)](https://www.npmjs.com/package/@ptkdev/sveltekit-electron-adapter) [![License: MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat&logo=license)](https://github.com/ptkdev/sveltekit-electron-adapter/blob/main/LICENSE.md) [![Language: TypeScript](https://img.shields.io/badge/language-typescript-blue.svg?style=flat&logo=typescript)](https://www.typescriptlang.org/) [![Framework: Grammy](https://img.shields.io/badge/powered%20by-grammy-009dca.svg?style=flat&logo=telegram)](https://grammy.dev/) [![ECMAScript: 2019](https://img.shields.io/badge/ES-9-F7DF1E.svg?style=flat&logo=javascript)](https://github.com/tc39/ecma262) [![Discord Server](https://discordapp.com/api/guilds/383373985666301975/embed.png)](https://discord.ptkdev.io) diff --git a/package-lock.json b/package-lock.json index b850fc5..bd9797c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ }, "devDependencies": { "@ptkdev/all-shields-cli": "^2.0.2", + "@ptkdev/logger": "^1.8.0", "@types/jest": "^29.4.0", "@types/node": "^18.13.0", "@types/shelljs": "^0.8.11", @@ -1549,6 +1550,22 @@ "node": ">=14.0.0" } }, + "node_modules/@ptkdev/logger": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@ptkdev/logger/-/logger-1.8.0.tgz", + "integrity": "sha512-gwg0pleMUyzsZIErDtzz2OP4F2Q3nzRGjhUTP+831/eogq17LpG7PgbHo1n1HZ/dlz/v2xvotfUcPLO3IzwEVQ==", + "dev": true, + "dependencies": { + "chalk": "^4.1.2", + "fs-extra": "^10.0.0", + "lowdb": "^1.0.0", + "rotating-file-stream": "^2.1.5", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/@sinclair/typebox": { "version": "0.25.21", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz", @@ -4369,6 +4386,20 @@ "node": ">= 0.6" } }, + "node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -5127,6 +5158,12 @@ "node": ">=0.10.0" } }, + "node_modules/is-promise": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", + "dev": true + }, "node_modules/is-redirect": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", @@ -5963,6 +6000,18 @@ "node": ">=6" } }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -6462,6 +6511,31 @@ "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", "dev": true }, + "node_modules/lowdb": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz", + "integrity": "sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.3", + "is-promise": "^2.1.0", + "lodash": "4", + "pify": "^3.0.0", + "steno": "^0.4.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/lowdb/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -8373,6 +8447,18 @@ "fsevents": "~2.3.2" } }, + "node_modules/rotating-file-stream": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/rotating-file-stream/-/rotating-file-stream-2.1.6.tgz", + "integrity": "sha512-qS0ndAlDu80MMXeRonqGMXslF0FErzcUSbcXhus3asRG4cvCS79hc5f7s0x4bPAsH6wAwyHVIeARg69VUe3JmQ==", + "dev": true, + "engines": { + "node": ">=10.0" + }, + "funding": { + "url": "https://www.blockchain.com/btc/address/12p1p5q7sK75tPyuesZmssiMYr4TKzpSCN" + } + }, "node_modules/run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -9009,6 +9095,15 @@ "node": ">= 0.6" } }, + "node_modules/steno": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz", + "integrity": "sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.3" + } + }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -9740,6 +9835,15 @@ "node": ">=0.10.0" } }, + "node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -11257,6 +11361,19 @@ "nunjucks": "^3.2.3" } }, + "@ptkdev/logger": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@ptkdev/logger/-/logger-1.8.0.tgz", + "integrity": "sha512-gwg0pleMUyzsZIErDtzz2OP4F2Q3nzRGjhUTP+831/eogq17LpG7PgbHo1n1HZ/dlz/v2xvotfUcPLO3IzwEVQ==", + "dev": true, + "requires": { + "chalk": "^4.1.2", + "fs-extra": "^10.0.0", + "lowdb": "^1.0.0", + "rotating-file-stream": "^2.1.5", + "strip-ansi": "^6.0.0" + } + }, "@sinclair/typebox": { "version": "0.25.21", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.21.tgz", @@ -13411,6 +13528,17 @@ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true }, + "fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -13979,6 +14107,12 @@ "isobject": "^3.0.1" } }, + "is-promise": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", + "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", + "dev": true + }, "is-redirect": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", @@ -14618,6 +14752,16 @@ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -15020,6 +15164,27 @@ "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", "dev": true }, + "lowdb": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz", + "integrity": "sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.3", + "is-promise": "^2.1.0", + "lodash": "4", + "pify": "^3.0.0", + "steno": "^0.4.1" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "dev": true + } + } + }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -16455,6 +16620,12 @@ "fsevents": "~2.3.2" } }, + "rotating-file-stream": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/rotating-file-stream/-/rotating-file-stream-2.1.6.tgz", + "integrity": "sha512-qS0ndAlDu80MMXeRonqGMXslF0FErzcUSbcXhus3asRG4cvCS79hc5f7s0x4bPAsH6wAwyHVIeARg69VUe3JmQ==", + "dev": true + }, "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -16957,6 +17128,15 @@ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true }, + "steno": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz", + "integrity": "sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.3" + } + }, "streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -17482,6 +17662,12 @@ "set-value": "^2.0.1" } }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index 2ac0819..745388b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@ptkdev/sveltekit-electron-adapter", "displayName": "SvelteKit Adapter for Desktop Apps with Electron", "description": "Adapter for SvelteKit apps that prerenders your entire site as a collection of static files for use with Electron", - "version": "0.2.0", + "version": "0.2.1-nightly.0", "main": "./index.js", "type": "module", "exports": { @@ -43,10 +43,10 @@ "git-set-upstream": "git remote add upstream git@github.com:ptkdev/sveltekit-electron-adapter.git && git fetch upstream", "git-pull-upstream": "git pull upstream main && git pull upstream beta && git pull upstream nightly", "git-pull": "git pull --recursive", - "git-hash": "ts-node scripts/githash.ts", + "git-hash": "ts-node --esm scripts/githash.ts", "git-ignore-reset": "git rm -r --cached . && git add . && git commit -m \"[Fix] Removing all files in .gitignore\"", - "github-workflow-next-version": "ts-node scripts/version.ts", - "github-workflow-changelog": "ts-node scripts/changelog_release.ts", + "github-workflow-next-version": "ts-node --esm scripts/version.ts", + "github-workflow-changelog": "ts-node --esm scripts/changelog_release.ts", "npm-publish-main": "git checkout main && npm publish", "npm-publish-beta": "git checkout beta && npm publish --tag beta", "npm-publish-nightly": "git checkout nightly && npm publish --tag nightly", @@ -63,6 +63,7 @@ }, "devDependencies": { "@ptkdev/all-shields-cli": "^2.0.2", + "@ptkdev/logger": "^1.8.0", "@types/jest": "^29.4.0", "@types/node": "^18.13.0", "@types/shelljs": "^0.8.11", diff --git a/scripts/changelog.ts b/scripts/changelog.ts index 640d470..e944739 100644 --- a/scripts/changelog.ts +++ b/scripts/changelog.ts @@ -10,8 +10,9 @@ * */ import * as fs from "fs"; +import { dirname } from "path"; -declare const __dirname: string; +const __dirname = dirname; const changelog = `# v1.0.0 (${new Date().toLocaleString("en-us", { month: "long", diff --git a/scripts/configs.ts b/scripts/configs.ts index 61f2a81..1ac064d 100644 --- a/scripts/configs.ts +++ b/scripts/configs.ts @@ -10,8 +10,9 @@ */ import * as fs from "fs"; import * as shell from "shelljs"; +import { dirname } from "path"; -declare const __dirname: string; +const __dirname = dirname; const path = `${__dirname}/../app/configs/config.js`; diff --git a/scripts/debug.ts b/scripts/debug.ts index c98cda6..97ddc10 100644 --- a/scripts/debug.ts +++ b/scripts/debug.ts @@ -11,8 +11,9 @@ import * as fs from "fs"; import * as shell from "shelljs"; import { argv } from "yargs"; +import { dirname } from "path"; -declare const __dirname: string; +const __dirname = dirname; const path = `${__dirname}/../app/configs/config.js`; diff --git a/scripts/githash.ts b/scripts/githash.ts index d650967..d22ed24 100644 --- a/scripts/githash.ts +++ b/scripts/githash.ts @@ -2,8 +2,10 @@ import Logger from "@ptkdev/logger"; import fs from "fs"; import path from "path"; import { execSync } from "child_process"; -import semver from "../package.json"; +import semver from "../package.json" assert { type: "json" }; +import { dirname } from "path"; +const __dirname = dirname; const gitdotfile = `${__dirname}/../.git/config`; const logger = new Logger(); let branch = ""; diff --git a/scripts/init.ts b/scripts/init.ts index 0d588bd..2cf42ae 100644 --- a/scripts/init.ts +++ b/scripts/init.ts @@ -13,7 +13,9 @@ import * as fs from "fs"; import * as shell from "shelljs"; import { argv } from "yargs"; -declare const __dirname: string; +import { dirname } from "path"; + +const __dirname = dirname; console.log(argv, argv._[0]); const path = `${__dirname}/../app/configs/config.js`; diff --git a/scripts/rmdist.ts b/scripts/rmdist.ts index d645a2a..714bcd6 100644 --- a/scripts/rmdist.ts +++ b/scripts/rmdist.ts @@ -9,7 +9,9 @@ * */ import * as shell from "shelljs"; -declare const __dirname: string; +import { dirname } from "path"; + +const __dirname = dirname; const path = `${__dirname}/../dist`; diff --git a/scripts/version.ts b/scripts/version.ts index 751cb2d..5297570 100644 --- a/scripts/version.ts +++ b/scripts/version.ts @@ -11,7 +11,7 @@ import * as fs from "fs"; import Logger from "@ptkdev/logger"; import { argv } from "yargs"; -import pkg from "../package.json"; +import pkg from "../package.json" assert { type: "json" }; const logger = new Logger(); diff --git a/tsconfig.json b/tsconfig.json index 01d37dc..1913814 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,9 +4,11 @@ "checkJs": true, "noEmit": true, "noImplicitAny": true, - "module": "es2022", + "module": "esnext", "target": "es2022", "moduleResolution": "node", + "esModuleInterop": true, + "resolveJsonModule": true, "allowSyntheticDefaultImports": true, "baseUrl": "." },