diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4c5a9f10..303dcecc3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -205,12 +205,12 @@ jobs: - name: Write Changelog to Plugin XML run: | - notes=$(cat << EOF + notes=$(cat <(.*)<\/CHANGES>/\n${escapedNotes}\n<\/CHANGES>/g" "dynamix.unraid.net.staging.plg" - name: Copy other release files to pr-release diff --git a/api/src/environment.ts b/api/src/environment.ts index 5030c30d6..2cc462075 100644 --- a/api/src/environment.ts +++ b/api/src/environment.ts @@ -1,22 +1,29 @@ -export const API_VERSION = process.env.npm_package_version ?? 'PLEASE_RUN_PACKAGE_AS_NPM_SCRIPT'; +import { version } from 'package.json'; + +export const API_VERSION = + process.env.npm_package_version ?? version ?? 'PLEASE_RUN_PACKAGE_AS_NPM_SCRIPT'; export const NODE_ENV = process.env.NODE_ENV as 'development' | 'test' | 'staging' | 'production'; export const environment = { - IS_MAIN_PROCESS: false, + IS_MAIN_PROCESS: false, }; export const CHOKIDAR_USEPOLLING = process.env.CHOKIDAR_USEPOLLING === 'true'; export const IS_DOCKER = process.env.IS_DOCKER === 'true'; export const DEBUG = process.env.DEBUG === 'true'; export const INTROSPECTION = process.env.INTROSPECTION === 'true'; -export const ENVIRONMENT = process.env.ENVIRONMENT as 'production' | 'staging' | 'development' -export const GRAPHQL_INTROSPECTION = Boolean( - INTROSPECTION ?? DEBUG ?? ENVIRONMENT !== 'production' -); +export const ENVIRONMENT = process.env.ENVIRONMENT as 'production' | 'staging' | 'development'; +export const GRAPHQL_INTROSPECTION = Boolean(INTROSPECTION ?? DEBUG ?? ENVIRONMENT !== 'production'); export const PORT = process.env.PORT ?? '/var/run/unraid-api.sock'; export const DRY_RUN = process.env.DRY_RUN === 'true'; export const BYPASS_PERMISSION_CHECKS = process.env.BYPASS_PERMISSION_CHECKS === 'true'; export const BYPASS_CORS_CHECKS = process.env.BYPASS_CORS_CHECKS === 'true'; export const LOG_CORS = process.env.LOG_CORS === 'true'; -export const LOG_TYPE = process.env.LOG_TYPE as 'pretty' | 'raw' ?? 'pretty'; -export const LOG_LEVEL = process.env.LOG_LEVEL as 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'FATAL'; -export const LOG_TRANSPORT = process.env.LOG_TRANSPORT as 'file' | 'stdout'; \ No newline at end of file +export const LOG_TYPE = (process.env.LOG_TYPE as 'pretty' | 'raw') ?? 'pretty'; +export const LOG_LEVEL = process.env.LOG_LEVEL as + | 'TRACE' + | 'DEBUG' + | 'INFO' + | 'WARN' + | 'ERROR' + | 'FATAL'; +export const LOG_TRANSPORT = process.env.LOG_TRANSPORT as 'file' | 'stdout'; diff --git a/api/tsconfig.json b/api/tsconfig.json index 4490836b9..844d9caac 100644 --- a/api/tsconfig.json +++ b/api/tsconfig.json @@ -38,6 +38,6 @@ ], /* List of folders to include type definitions from. */ "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */, - "resolveJsonModule": false, + "resolveJsonModule": true, } } \ No newline at end of file