Skip to content

Commit

Permalink
WIP #33. Added TypeScript and tsc compiler functionality. Only workin…
Browse files Browse the repository at this point in the history
…g with JS at the moment, but will be converting all code to .ts files soon
  • Loading branch information
Bidthedog committed Sep 9, 2020
1 parent 0161a94 commit 3ae484e
Show file tree
Hide file tree
Showing 5 changed files with 210 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,5 @@ invite.txt
# The below files contain sensitive info related to GitHub Package deployment
docker-username
docker-password

.vscode/symbols.json
33 changes: 28 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,45 @@
# Node Bot Dockerfile

#---------------------
FROM node:lts-alpine3.9
FROM node:lts-alpine3.9 as build
WORKDIR /bot

COPY package.json /bot
COPY package-lock.json /bot
COPY package.json .
COPY package-lock.json .

RUN set -x \
&& npm -v \
&& npm set progress=false \
&& npm install --no-progress

COPY tsconfig.json .
COPY index.* .
COPY app/ ./app

RUN ls -la

RUN set -x \
&& npm run tsc

FROM node:lts-alpine3.9 as host
WORKDIR /bot
COPY --from=build /bot/package.json .
COPY --from=build /bot/package-lock.json .
COPY --from=build /bot/dist .
RUN ls -la

# TODO: Make sure we need the node_modules directory after upgrading to TS
RUN set -x \
&& npm -v \
&& npm set progress=false \
&& npm install --no-progress --only=prod

RUN rm package-lock.json -f

RUN set -x \
&& apk add tzdata

RUN ls -la
COPY /config.json /bot
COPY /index.js /bot
COPY /app /bot/app

CMD ["npm", "run", "start:hosted"]
94 changes: 91 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
"repository": "github:lewster32/corporallancot",
"license": "MIT",
"scripts": {
"start": "dotenv -- node index.js",
"start": "npm run tsc && dotenv -- node dist/index.js",
"start:hosted": "node index.js",
"docker:start": "docker-compose up -d --build",
"docker:startdb": "docker-compose up -d --scale bot=0",
"docker:stop": "docker-compose down",
"docker:watch": "chokidar -p \"{index.js,docker-compose.yml,Dockerfile,.dockerignore,package.json,**/*.js,.env,config.json}\" --ignore \"{**/*.spec.js,node_modules/**/*,spec/**/*}\" -c \"npm run docker:start && docker logs corporallancot.bot\" --initial --debounce 1000",
"docker:watch": "chokidar -p \"{index.js,docker-compose.yml,Dockerfile,.dockerignore,package.json,**/*.js,.env,config.json,tsconfig.json}\" --ignore \"{**/*.spec.js,node_modules/**/*,spec/**/*,dist/**/*}\" -c \"npm run docker:start && docker logs corporallancot.bot\" --initial --debounce 1000",
"test": "jasmine",
"test:watch": "chokidar -p \"{index.js,**/*.js,package.json,spec/support/jasmine.json}\" --ignore \"node_modules/**/*\" -c \"npm run test\" --initial --debounce 500",
"test:watch": "chokidar -p \"{index.js,**/*.js,package.json,spec/support/jasmine.json,tsconfig.json}\" --ignore \"{node_modules/**/*,dist/**/*}\" -c \"npm run test\" --initial --debounce 500",
"lint": "eslint .",
"lint:watch": "chokidar -p \"{index.js,**/*.js,.eslintrc.json,package.json}\" --ignore \"node_modules/**/*\" -c \"npm run lint\" --initial --debounce 500",
"logs": "docker logs corporallancot.bot"
"lint:watch": "chokidar -p \"{index.js,**/*.js,.eslintrc.json,package.json}\" --ignore \"{node_modules/**/*,dist/**/*}\" -c \"npm run lint\" --initial --debounce 500",
"logs": "docker logs corporallancot.bot",
"tsc": "tsc",
"tsc:clean": "rimraf dist/"
},
"dependencies": {
"awilix": "^4.2.6",
Expand All @@ -35,7 +37,10 @@
"faker": "^5.1.0",
"jasmine": "^3.5.0",
"jasmine-console-reporter": "^3.1.0",
"jasmine-theories": "^0.1.3"
"jasmine-theories": "^0.1.3",
"rimraf": "^3.0.2",
"tslint": "^6.1.3",
"typescript": "^4.0.2"
},
"_moduleAliases": {
"@root": "app",
Expand Down
78 changes: 78 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig.json to read more about this file */

/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "ES2020", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
"allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./dist", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */

/* Advanced Options */
"skipLibCheck": true, /* Skip type checking of declaration files. */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
},
"include": [
"./app/**/*", /* TODO: Set to *.ts once all .js files are migrated to .ts */
"./index.js", /* TODO: Remove once all .js files are migrated to .ts */
"./index.ts"
],
"exclude": [
"./**/*.spec.js", /* TODO: Remove once all .js files are migrated to .ts */
"./**/*.spec.ts"
]
}

0 comments on commit 3ae484e

Please sign in to comment.