Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release/v1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
manuth committed Nov 19, 2018
2 parents 40f372b + 90bd27b commit 57a81fe
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 57 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## TSGeneratorGenerator v1.2.3
- Improved the `package.json`-template
- Reworked the ignore-files

[Show differences][v1.2.3]

## TSGeneratorGenerator v1.2.2
- Improved the creation of the `package.json`-file
- Removed unnecessary dependencies
Expand Down Expand Up @@ -41,4 +47,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[v1.0.1]: https://github.com/manuth/TSGeneratorGenerator/compare/v1.0.0...v1.0.1
[v1.2.0]: https://github.com/manuth/TSGeneratorGenerator/compare/v1.0.1...v1.2.0
[v1.2.1]: https://github.com/manuth/TSGeneratorGenerator/compare/v1.2.0...v1.2.1
[v1.2.2]: https://github.com/manuth/TSGeneratorGenerator/compare/v1.2.1...v1.2.2
[v1.2.2]: https://github.com/manuth/TSGeneratorGenerator/compare/v1.2.1...v1.2.2
[v1.2.3]: https://github.com/manuth/TSGeneratorGenerator/compare/v1.2.2...v1.2.3
32 changes: 16 additions & 16 deletions package-lock.json

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

56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
{
"name": "generator-ts-generator",
"version": "1.2.2",
"version": "1.2.3",
"description": "A Generator for Yeoman Generators Written in TypeScript.",
"scripts": {
"watch": "tsc -p . --watch",
"compile": "tsc -p .",
"lint": "tslint -p ./ -t verbose",
"test": "mocha",
"prepare": "npm run compile"
},
"repository": {
"type": "git",
"url": "git+https://github.com/manuth/TSGeneratorGenerator.git"
},
"author": "Manuel Thalmann <[email protected]>",
"license": "MIT",
"keywords": [
"yo",
"yoeoman-generator",
"Generator",
"TypeScript"
],
"author": "Manuel Thalmann <[email protected]>",
"license": "MIT",
"repository": {
"type": "git",
"url": "git+https://github.com/manuth/TSGeneratorGenerator.git"
},
"bugs": {
"url": "https://github.com/manuth/TSGeneratorGenerator/issues"
},
"homepage": "https://github.com/manuth/TSGeneratorGenerator#readme",
"scripts": {
"watch": "tsc -p . --watch",
"compile": "tsc -p .",
"lint": "tslint -p ./ -t verbose",
"test": "mocha",
"prepare": "npm run compile"
},
"dependencies": {
"chalk": "^2.4.1",
"dedent": "^0.7.0",
"fs-extra": "^7.0.1",
"inquirer": "^6.2.0",
"lodash.camelcase": "^4.3.0",
"lodash.kebabcase": "^4.1.1",
"yeoman-generator": "^3.1.1",
"yosay": "^2.0.2"
},
"devDependencies": {
"@types/dedent": "^0.7.0",
"@types/fs-extra": "^5.0.4",
"@types/inquirer": "0.0.43",
"@types/lodash.camelcase": "^4.3.4",
"@types/lodash.kebabcase": "^4.1.4",
"@types/mocha": "^5.2.5",
"@types/node": "^10.12.1",
"@types/yeoman-generator": "^3.0.0",
"@types/node": "^10.12.9",
"@types/yeoman-generator": "^3.0.1",
"@types/yeoman-test": "^1.7.4",
"@types/yosay": "0.0.29",
"mocha": "^5.2.0",
"npm": "^6.4.1",
"tslint": "^5.11.0",
"typescript": "^3.1.5",
"typescript-tslint-plugin": "0.0.5",
"typescript": "^3.1.6",
"typescript-tslint-plugin": "0.1.0",
"yeoman-test": "^1.9.1",
"yo": "^2.0.5"
},
"dependencies": {
"chalk": "^2.4.1",
"dedent": "^0.7.0",
"fs-extra": "^7.0.0",
"inquirer": "^6.2.0",
"lodash.camelcase": "^4.3.0",
"lodash.kebabcase": "^4.1.1",
"yeoman-generator": "^3.1.1",
"yosay": "^2.0.2"
}
}
26 changes: 14 additions & 12 deletions src/generators/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ class AppGenerator extends Generator<IAppSettings>
*/
protected GetPackageJSON = (): {} =>
{

let scripts = [
"watch",
"compile",
Expand Down Expand Up @@ -370,18 +369,21 @@ class AppGenerator extends Generator<IAppSettings>
"@types/yosay");
}

let result: any = {};
let packageJSON = require(Path.join("..", "..", "..", "package.json"));
result.name = this.Settings[AppSetting.ModuleName];
result.version = "0.0.0";
result.description = this.Settings[AppSetting.Description];
result.scripts = {};
result.author = {
name: this.user.git.name(),
email: this.user.git.email()
let result = {
name: this.Settings[AppSetting.ModuleName],
version: "0.0.0",
description: this.Settings[AppSetting.Description],
author: {
name: this.user.git.name(),
email: this.user.git.email()
},
keywords: ["yeoman-generator"],
scripts: {} as { [key: string]: string },
dependencies: {} as { [key: string]: string },
devDependencies: {} as { [key: string]: string }
};
result.devDependencies = {};
result.dependencies = {};

let packageJSON: typeof result = require(Path.join(__dirname, "..", "..", "..", "package.json"));

for (let script of scripts)
{
Expand Down
4 changes: 4 additions & 0 deletions templates/app/.npmignore.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ typings/
# Source-files
[Ss]rc/

# TypeScript config-files
tsconfig.json
tslint.json

# Unit-Tests
test/
[Ll]ib/tests
Expand Down

0 comments on commit 57a81fe

Please sign in to comment.