mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-21 22:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compile options

Browse Source
This commit is contained in:
Simon Larsen 2022-11-09 12:53:55 +00:00
parent 85a0c58ceb
commit cbbab8b2f3
No known key found for this signature in database
GPG Key ID: AB45983AA9C81CDE
9 changed files with 7525 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Scripts/Install/MergeEnvTemplate.js → Scripts/Install/MergeEnvTemplate.ts
View File

@ -2,30 +2,30 @@
import fs from 'fs';
try {
const tempate = fs.readFileSync('./config.tpl.env', 'utf8');
const env = fs.readFileSync('./config.env', 'utf8');
const init = (): void => {
const tempate: string = fs.readFileSync('./config.tpl.env', 'utf8');
const env: string = fs.readFileSync('./config.env', 'utf8');
const linesInTemplate: Array<string> = tempate.split("\n");
const linesInEnv: Array<string> = env.split("\n");
const linesInTemplate = tempate.split("\n");
const linesInEnv = env.split("\n");
for (const line of linesInTemplate) {
// this is a comment, ignore.
if (line.startsWith("//")) {
continue;
continue;
}
// comment. Ignore.
if (line.startsWith("#")) {
continue;
continue;
}
// if the line is present in template but is not present in env file then add it to the env file. We assume, values in template file are default values.
if (line.split("=").length > 0) {
if (linesInEnv.filter((envLine) => {
return envLine.split("=").length > 0 && envLine.split("=")[0] === line.split("=")[0]
return envLine.split("=").length > 0 && envLine.split("=")[0] === line.split("=")[0]
}).length === 0) {
linesInEnv.push(line);
}
@ -35,7 +35,6 @@ try {
// write the file back to disk and exit.
fs.writeFileSync('./config.env.temp', linesInEnv.join("\n"));
}
} catch (err) {
console.error(err);
}
init();

43
Scripts/Install/ReplaceValueInConfig.js → Scripts/Install/ReplaceValueInConfig.ts
View File

@ -2,39 +2,48 @@
import fs from 'fs';
try {
const env = fs.readFileSync('./config.env', 'utf8');
const envValToReplace = process.argv[2];
const init = (): void => {
const env: string = fs.readFileSync('./config.env', 'utf8');
const envValToReplace: string | undefined = process.argv[2];
if (!envValToReplace) {
console.log("Please have env var to replace");
return;
}
const envValToReplaceWith = process.argv[3];
const envValToReplaceWith: string | undefined = process.argv[3];
if (!envValToReplaceWith) {
console.log("Please have env var to replace with");
return;
}
const linesInEnv = env.split("\n");
const linesToRender = [];
for (const line of linesInEnv) {
const linesInEnv: Array<string> = env.split("\n");
const linesToRender: Array<string> = [];
let found: boolean = false;
for (let line of linesInEnv) {
// this is a comment, ignore.
if (!line.startsWith(envValToReplace)) {
linesToRender.push(line);
} else {
found = true;
const items = line.split("=");
items[1] = envValToReplaceWith;
line = items.join("=");
linesToRender.push(line);
}
}
if (!found) {
linesToRender.push(envValToReplace + "=" + envValToReplaceWith);
}
// write the file back to disk and exit.
fs.writeFileSync('./config.env', linesToRender.join("\n"));
}
init();
} catch (err) {
console.error(err);
}

7350
Scripts/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

17
Scripts/package.json Normal file
View File

@ -0,0 +1,17 @@
{
"name": "scripts",
"version": "1.0.0",
"description": "",
"scripts": {
"compile": "tsc"
},
"devDependencies": {
"@faker-js/faker": "^6.3.1",
"@types/jest": "^27.5.2",
"@types/node": "^17.0.22",
"jest": "^27.5.1",
"ts-jest": "^27.1.4"
},
"author": "",
"license": "ISC"
}

106
Scripts/tsconfig.json Normal file
View File

@ -0,0 +1,106 @@
{
"compilerOptions": {
"experimentalDecorators": true,
/* Visit https://aka.ms/tsconfig.json to read more about this file */
/* Projects */
// "incremental": true, /* Enable incremental compilation */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
/* Language and Environment */
"target": "es2017", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
"jsx": "react", /* Specify what JSX code is generated. */ /* Enable experimental support for TC39 stage 2 draft decorators. */
"emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
// "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
/* Modules */
"module": "es2022" /* Specify what module code is generated. */,
// "rootDir": "./" /* Specify the root folder within your source files. */,
"moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
"typeRoots": [
"./node_modules/@types"
] /* Specify multiple folders that act like `./node_modules/@types`. */,
"types": [
"node",
"jest"
] /* Specify type package names to be included without being referenced in a source file. */,
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "resolveJsonModule": true, /* Enable importing .json files */
// "noResolve": true, /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
/* Emit */
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
"sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
"outDir": "./build/dist" /* Specify an output folder for all emitted files. */,
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
/* Type Checking */
"strict": true /* Enable all strict type-checking options. */,
"noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied `any` type.. */,
"strictNullChecks": true /* When type checking, take into account `null` and `undefined`. */,
"strictFunctionTypes": true /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */,
"strictBindCallApply": true /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */,
"strictPropertyInitialization": true /* Check for class properties that are declared but not set in the constructor. */,
"noImplicitThis": true /* Enable error reporting when `this` is given the type `any`. */,
"useUnknownInCatchVariables": true /* Type catch clause variables as 'unknown' instead of 'any'. */,
"alwaysStrict": true /* Ensure 'use strict' is always emitted. */,
"noUnusedLocals": true /* Enable error reporting when a local variables aren't read. */,
"noUnusedParameters": true /* Raise an error when a function parameter isn't read */,
"exactOptionalPropertyTypes": true /* Interpret optional property types as written, rather than adding 'undefined'. */,
"noImplicitReturns": true /* Enable error reporting for codepaths that do not explicitly return in a function. */,
"noFallthroughCasesInSwitch": true /* Enable error reporting for fallthrough cases in switch statements. */,
"noUncheckedIndexedAccess": true /* Include 'undefined' in index signature results */,
"noImplicitOverride": true /* Ensure overriding members in derived classes are marked with an override modifier. */,
"noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type */,
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
}
}

4
config.tpl.env
View File

@ -5,8 +5,8 @@ APP_TAG=latest
# This will be generated automatically during install.
ONEUPTIME_SECRET={{ .Env.ONEUPTIME_SECRET }}
# This supports test | production | development.
# Development is used for local development. Test is used for insider / beta / staging builds. Production is used for production ready app.
# This supports test | production | development | ci.
# Development is used for local development. Test is used for insider / beta / staging builds. Production is used for production ready app. ci is for testing in the CI/CD.
ENVIRONMENT=production
# IS BILLING ENABLED for this installer.

2
docker-compose.tpl.yml
View File

@ -143,7 +143,7 @@ services:
status-page:
ports:
- '3105:3105'
{{ if eq .Env.ENVIRONMENT "development" }}
{{ if (eq .Env.ENVIRONMENT "development") or (eq .Env.ENVIRONMENT "ci") }}
build:
network: host
context: .

11
package.json
View File

@ -31,9 +31,10 @@
"prettier": "^2.6.0"
},
"scripts": {
"config-to-dev": "npm run prerun && node ./Scripts/Install/ReplaceValueInConfig.js ENVIRONMENT development && npm run prerun",
"config-to-test": "npm run prerun && node ./Scripts/Install/ReplaceValueInConfig.js ENVIRONMENT test",
"config-to-production": "npm run prerun && node ./Scripts/Install/ReplaceValueInConfig.js ENVIRONMENT production",
"config-to-dev": "ts-node-esm ./Scripts/Install/ReplaceValueInConfig.ts ENVIRONMENT development",
"config-to-ci": "ts-node-esm ./Scripts/Install/ReplaceValueInConfig.ts ENVIRONMENT ci",
"config-to-test": "ts-node-esm ./Scripts/Install/ReplaceValueInConfig.ts ENVIRONMENT test",
"config-to-production": "ts-node-esm ./Scripts/Install/ReplaceValueInConfig.ts ENVIRONMENT production",
"prerun": "sudo bash preinstall.sh",
"typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js",
"uninstall": "bash uninstall.sh",
@ -43,10 +44,10 @@
"start": "docker-compose up -d $npm_config_services",
"ps": "docker-compose ps",
"logs": "docker-compose logs --tail=100 -f $npm_config_services",
"force-build": "npm run config-to-dev && docker-compose build --no-cache $npm_config_services",
"force-build": "npm run config-to-dev && docker-compose build --no-cache $npm_config_services",
"kill": "npm run stop",
"prod": "npm run prerun && docker-compose up -d",
"dev": "npm run prerun && npm run start $npm_config_services",
"dev": "npm run config-to-dev && npm run prerun && npm run start $npm_config_services",
"stop": "docker-compose down --remove-orphans",
"prune": "docker system prune",
"remove-all-containers": "docker stop $(docker ps -a -q) && docker rm $(docker ps -a -q) || echo 'No running containers'",

6
preinstall.sh
View File

@ -92,6 +92,10 @@ if [[ ! $(which gomplate) ]]; then
sudo npm install -g gomplate
fi
if [[ ! $(which ts-node) ]]; then
sudo npm install -g ts-node
fi
cd oneuptime
@ -99,7 +103,7 @@ cd oneuptime
touch config.env
#Run a scirpt to merge config.env.tpl to config.env
node ./Scripts/Install/MergeEnvTemplate.js
ts-node-esm ./Scripts/Install/MergeEnvTemplate.ts
cat config.env.temp | gomplate > config.env