Skip to content

Commit 23d8f42

Browse files
fatihturkerfatihturker
authored
Merge pull request #78 from open-template-hub/develop
Dev to Master
2 parents c0bc0b7 + 4087252 commit 23d8f42

File tree

10 files changed

+213
-163
lines changed

10 files changed

+213
-163
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ updates:
1111
target-branch: 'workflow/dependency-update'
1212
labels:
1313
- 'workflow'
14-
milestone: 1
14+
milestone: 2

‎.github/workflows/cron-dependency-checker-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Npm Outdated
2525
run: npm run outdated
2626
- name: Build
27-
run: npm run buildProd
27+
run: npm run build
2828

2929
- name: Git Commit and Push
3030
run: |

‎.run/outdated.run.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="outdated" type="js.build_tools.npm" nameIsGenerated="true">
33
<package-json value="$PROJECT_DIR$/package.json" />
4-
<command value="outdated" />
4+
<command value="run" />
5+
<scripts>
6+
<script value="outdated" />
7+
</scripts>
58
<node-interpreter value="project" />
69
<package-manager value="npm" />
710
<envs />

‎NPM-README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
</p>
66

77
<h1 align="center">
8-
Open Template Hub - Server Generator v2
8+
Open Template Hub - Server Generator v3
99
</h1>
1010

1111
[![GitHubRepo](https://img.shields.io/badge/GitHub-Repository-24292e.svg?style=for-the-badge&logo=github)](https://github.com/open-template-hub/server-generator)
1212
[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_server-generator?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_server-generator)
13-
[![BTC](https://img.shields.io/badge/Donate-BTC-ORANGE?color=F5922F&style=for-the-badge&logo=bitcoin)](https://commerce.coinbase.com/checkout/8313af5f-de48-498d-b2cb-d98819ca7d5e)
1413

15-
Command line interface generator of the servers at [Open Template Hub](https://github.com/open-template-hub)
14+
Command-line interface generator of the servers at [Open Template Hub](https://github.com/open-template-hub)
1615

1716
Available server types are:
1817

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</p>
66

77
<h1 align="center">
8-
Open Template Hub - Server Generator v2
8+
Open Template Hub - Server Generator v3
99
</h1>
1010

1111
[![Version](https://img.shields.io/npm/v/@open-template-hub/server-generator?color=CB3837&style=for-the-badge&logo=npm)](https://www.npmjs.com/package/@open-template-hub/server-generator)
@@ -16,9 +16,8 @@ Open Template Hub - Server Generator v2
1616
[![LastCommit](https://img.shields.io/github/last-commit/open-template-hub/server-generator?color=43b043&style=for-the-badge)](https://github.com/open-template-hub/server-generator/commits/master)
1717
[![Release](https://img.shields.io/github/release/open-template-hub/server-generator?include_prereleases&color=43b043&style=for-the-badge)](https://github.com/open-template-hub/server-generator/releases)
1818
[![SonarCloud](https://img.shields.io/sonar/quality_gate/open-template-hub_server-generator?server=https%3A%2F%2Fsonarcloud.io&label=Sonar%20Cloud&style=for-the-badge&logo=sonarcloud)](https://sonarcloud.io/dashboard?id=open-template-hub_server-generator)
19-
[![BTC](https://img.shields.io/badge/Donate-BTC-ORANGE?color=F5922F&style=for-the-badge&logo=bitcoin)](https://commerce.coinbase.com/checkout/8313af5f-de48-498d-b2cb-d98819ca7d5e)
2019

21-
Command line interface generator of the servers at [Open Template Hub](https://github.com/open-template-hub)
20+
Command-line interface generator of the servers at [Open Template Hub](https://github.com/open-template-hub)
2221

2322
Available server types are:
2423

‎app.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"name": "@open-template-hub/server-generator",
3+
"description": "Command-line interface generator of the servers at Open Template Hub",
4+
"website": "https://opentemplatehub.com/product/generator/server-generator",
5+
"repository": "https://github.com/open-template-hub/server-generator",
6+
"logo": "https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/logo/generator/server-generator-logo.png",
7+
"keywords": [
8+
"server",
9+
"rest",
10+
"node",
11+
"nodejs",
12+
"typescript",
13+
"mongo",
14+
"mongodb",
15+
"mongoose",
16+
"postgre",
17+
"postgresql",
18+
"cli",
19+
"auth",
20+
"authentication",
21+
"payment",
22+
"busines",
23+
"logic",
24+
"business logic",
25+
"backend",
26+
"template",
27+
"server template",
28+
"auth server example",
29+
"auth server template",
30+
"payment server example",
31+
"payment server template",
32+
"business logic server example",
33+
"business logic server template",
34+
"mail server example",
35+
"mail server template",
36+
"open template hub"
37+
]
38+
}

‎dependency-checker.ts‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ console.log(
1414
'\n' +
1515
'\n' +
1616
'<h1 align="center">\n' +
17-
'Open Template Hub - Server Generator v2\n' +
17+
'Open Template Hub - Server Generator v3\n' +
1818
' <br/>\n' +
1919
'(outdated packages)\n' +
2020
'</h1>\n' +
@@ -26,25 +26,36 @@ for ( const line of lines ) {
2626
if ( line.length === 0 ) {
2727
continue;
2828
}
29-
29+
3030
if ( lines.indexOf( line ) === 0 ) {
3131
columnIndexes[ 0 ] = line.indexOf( 'Current' );
3232
columnIndexes[ 1 ] = line.indexOf( 'Wanted' ) + 3;
3333
columnIndexes[ 2 ] = line.indexOf( 'Latest' ) + 6;
3434
columnIndexes[ 3 ] = line.indexOf( 'Location' ) + 9;
3535
}
36-
37-
let modifiedLine = line;
38-
36+
37+
let modifiedLine = '';
38+
3939
if ( columnIndexes [ 0 ] >= 0 ) {
40-
for ( const columnIndex of columnIndexes ) {
41-
modifiedLine = modifiedLine.substring( 0, columnIndex ) + ' | ' + modifiedLine.substring( columnIndex, modifiedLine.length );
40+
const stringParts = line.split( /(\s+)/ );
41+
42+
modifiedLine += '| ';
43+
44+
for ( let part of stringParts ) {
45+
if ( part.match( /\s+/ ) ) {
46+
modifiedLine += ' | ';
47+
} else {
48+
modifiedLine += part;
49+
}
4250
}
43-
console.log( '| ' + modifiedLine + ' |' );
51+
52+
modifiedLine += ' |';
53+
54+
console.log( modifiedLine );
4455
} else {
4556
console.log( modifiedLine );
4657
}
47-
58+
4859
if ( lines.indexOf( line ) === 0 ) {
4960
console.log( '| --- | --- | --- | --- | --- |' );
5061
}

‎docs/OUTDATED.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66

77

88
<h1 align="center">
9-
Open Template Hub - Server Generator v2
9+
Open Template Hub - Server Generator v3
1010
<br/>
1111
(outdated packages)
1212
</h1>
1313

1414
Following packages are not updated in the develop branch yet. So, if you want to update outdated packages on your own risk, update the package.json and install dependencies.
1515

16-
| Package | Current | Wanted | Latest | Location |
17-
| --- | --- | --- | --- | --- |
1816

1917
<table align="right"><tr><td><a href="https://opentemplatehub.com"><img src="https://raw.githubusercontent.com/open-template-hub/open-template-hub.github.io/master/assets/logo/brand-logo.png" width="50px" alt="oth"/></a></td><td><b>Open Template Hub © 2021</b></td></tr></table>
2018

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@open-template-hub/server-generator",
3-
"description": "CLI server generator of Server Templates on Open Template Hub",
3+
"description": "Command-line interface generator of the servers at Open Template Hub",
44
"version": "3.0.1",
55
"license": "MIT",
66
"preferGlobal": true,
@@ -11,25 +11,25 @@
1111
"outdated": "node dependency-checker.ts > docs/OUTDATED.md"
1212
},
1313
"bin": {
14-
"open-template-hub-server-generator": "dist/index.js"
14+
"open-template-hub-server-generator": "dist/src/index.js"
1515
},
1616
"dependencies": {
17-
"@types/ncp": "^2.0.4",
18-
"@types/rimraf": "^3.0.0",
19-
"chalk": "^4.1.0",
20-
"inquirer": "^8.1.5",
17+
"@types/ncp": "^2.0.5",
18+
"@types/rimraf": "^3.0.2",
19+
"colors": "^1.4.0",
20+
"inquirer": "^8.2.0",
2121
"ncp": "^2.0.0",
2222
"rimraf": "^3.0.2",
2323
"shelljs": "^0.8.2",
24-
"yargs": "^17.2.1"
24+
"yargs": "^17.3.0"
2525
},
2626
"devDependencies": {
27-
"@types/inquirer": "^0.0.43",
28-
"@types/node": "^16.10.1",
29-
"@types/shelljs": "^0.8.0",
30-
"@types/yargs": "^11.1.1",
31-
"ts-node": "^7.0.1",
32-
"typescript": "^4.4.3"
27+
"@types/inquirer": "^8.1.3",
28+
"@types/node": "^16.11.12",
29+
"@types/shelljs": "^0.8.9",
30+
"@types/yargs": "^17.0.4",
31+
"ts-node": "^10.3.0",
32+
"typescript": "^4.5.3"
3333
},
3434
"git repository": "https://github.com/open-template-hub/open-template-hub-server-generator",
3535
"repository": {

0 commit comments

Comments
 (0)