Merged in tstemplate-v1.2.4 (pull request #8)

Tstemplate v1.2.4

Approved-by: John Martin

Author: dmg-aimmerman

.eslintrc.json

@@ -13,15 +13,16 @@
 		{
 			"files": ["*.ts"],
 			"parserOptions": {
-				"project": ["./tsconfig.json", "./tsconfig.spec.json"]
+				"project": ["./tsconfig.json"]
 			}
 		}
 	],
 	"rules": {
 		"curly": 2,
 		"indent": [2, "tab"],
 		"max-len": [1, 80],
-		"no-empty": 2,
+		"no-empty": 1,
+		"@typescript-eslint/no-empty-interface": 1,
 		"no-eval": 2,
 		"@typescript-eslint/no-misused-new": "error",
 		"no-trailing-spaces": 2,

.gitignore

@@ -62,7 +62,6 @@ typings/
 
 # Build directory
 dist/
-dist-test/
 
 # Environment Variables
 .env

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Typescript Project Template
 
+## [v1.2.4]
+
+### Fixes
+- [TSTEMPLATE-18] Add instructions in readme that MY_APP replacement should not contain spaces
+- [TSTEMPLATE-17] Environment file should merge declaration and definitions
+- [TSTEMPLATE-16] Build should clear dist
+- [TSTEMPLATE-15] Set no-empty eslint rule to warn instead of error
+- [TSTEMPLATE-14] Remove tsconfig.spec.json
+- [TSTEMPLATE-13] Switch tsconfig to output es6
+
 ## [v1.2.3]
 
 ### Fixes

README.md

@@ -3,7 +3,7 @@
 ## Installation
 
 1. Fork this repo
-2. Replace MY_APP with the name of your app project-wide
+2. Replace MY_APP with the name of your app project-wide (**No Spaces or special characters!**)
 3. `npm i`
 4. Update the documentation, changelog, etc
 

jasmine.json

@@ -1,5 +1,5 @@
 {
-	"spec_dir": "./dist-test",
+	"spec_dir": "./dist",
 	"spec_files": [ "**/*[sS]pec.js" ],
 	"helpers": [ "helpers/**/*.js" ],
 	"stopSpecOnExpectationFailure": false,

package-lock.json

@@ -1,15 +1,14 @@
 {
 	"name": "MY_APP",
 	"version": "1.0.0",
-	"ts-project-version": "1.2.3",
+	"ts-project-version": "1.2.4",
 	"scripts": {
 		"start": "npm run dev",
 		"dev": "npm run lint && ts-node src/index.ts",
-		"test": "npm run build:dev && npm run build:spec && npm run coverage",
-		"clean": "rm -rf dist dist-test",
+		"test": "npm run build:dev:clean && npm run coverage",
+		"clean": "rm -rf dist",
 		"build:dev": "npm run lint && npm run preprocess && npm run compile && npm run postprocess",
 		"build:dev:clean": "npm run clean && npm run build:dev",
-		"build:spec": "tsc --p tsconfig.spec.json",
 		"build:prod": "npm run preprocess prod && npm run lint:prod && npm run compile && npm run postprocess prod",
 		"build:prod:clean": "npm run clean && npm run build:prod",
 		"compile": "./node_modules/.bin/tsc",
@@ -29,15 +28,15 @@
 	"devDependencies": {
 		"@istanbuljs/nyc-config-typescript": "^1.0.1",
 		"@types/jasmine": "^3.9.1",
-		"@types/node": "^12.20.28",
+		"@types/node": "^12.20.32",
 		"@typescript-eslint/eslint-plugin": "^4.33.0",
 		"@typescript-eslint/parser": "^4.33.0",
 		"coveralls": "^3.1.1",
 		"eslint": "^7.32.0",
 		"jasmine": "^3.9.0",
 		"nyc": "^15.1.0",
-		"ts-node": "^10.2.1",
+		"ts-node": "^10.3.0",
 		"typedoc": "^0.21.9",
-		"typescript": "^4.4.3"
+		"typescript": "^4.4.4"
 	}
 }

package.json

@@ -4,16 +4,12 @@ const envfile = dotenv.config();
 /**
  * Environment Variables Schema
  */
-export interface Environment {
-	APP_TITLE: string
+export class Environment {
+	APP_TITLE = 'MY_APP';
 }
 
-/**
- * Default Values
- */
-const defaults: Environment = {
-	APP_TITLE: 'MY_APP'
-};
-
 // Export
-export const env: Environment = Object.assign(defaults, envfile.parsed);
+export const env: Environment = Object.assign(
+	new Environment(),
+	envfile.parsed
+);

src/environment.ts

@@ -9,13 +9,17 @@
 		"moduleResolution": "node",
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
-		"target": "es5",
+		"target": "es6",
 		"types": ["node"],
 		"typeRoots": ["node_modules/@types", "./"],
 		"lib": ["es2017"]
 	},
 	"exclude": [
-		"./test/",
 		"./dist/"
+	],
+	"include": [
+		"./example/",
+		"./src/",
+		"./test/"
 	]
 }