Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
81 changes: 41 additions & 40 deletions .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,63 @@
"project": {
"name": "great-big-example-application"
},
"apps": [
{
"root": "src/main/webapp/",
"outDir": "target/www/app",
"assets": [
"content",
"i18n",
"favicon.ico",
"node_modules/@angular/material/prebuilt-themes"
],
"index": "index.html",
"main": "app/app.main.ts",
"polyfills": "app/polyfills.ts",
"test": "../../../test.ts",
"tsconfig": "../../../tsconfig.json",
"prefix": "jhi",
"mobile": false,
"styles": [
"content/scss/vendor.scss",
"content/scss/global.scss"
],
"scripts": []
}
],
"apps": [{
"root": "src/main/webapp",
"outDir": "target/www/app",
"assets": [
"content",
"i18n",
"favicon.ico"
],
"index": "index.html",
"main": "app/app.main.ts",
"polyfills": "app/polyfills.ts",
"test": "src/test/javascript/spec/entry.ts",
"tsconfig": "../../../tsconfig.json",
"prefix": "jhi",
"mobile": false,
"styles": [
"content/scss/vendor.scss",
"content/scss/global.scss"
],
"scripts": []
}],
"e2e": {
"protractor": {
"config": "protractor.conf.js"
"config": "src/test/javascript/protractor.conf.js"
}
},
"lint": [
{
"project": "./tsconfig.json",
"exclude": "**/node_modules/**/*"
"lint": [{
"project": "../../../tsconfig.json"
},
{
"project": "./tsconfig-aot.json",
"exclude": "**/node_modules/**/*"
"project": "../../../tsconfig-aot.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
"config": "src/test/javascript/karma.conf.js"
}
},
"defaults": {
"styleExt": "scss",
"prefixInterfaces": false,
"component": {
"inlineStyle": true,
"inlineTemplate": false
"component" : {
"inlineStyle" : true,
"inlineTemplate": false,
"spec": false
},
"directive" : {
"spec": false
},
"guard" : {
"spec": false
},
"pipe" : {
"spec": false
},
"spec": {
"component": false,
"directive": false,
"pipe": false,
"service": false
"service" : {
"spec": false
}
},
"packageManager": "yarn"
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*.properties text
*.sass text
*.scss text
*.sh text
*.sh text eol=lf
*.sql text
*.txt text
*.ts text
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
node_tmp/
node_modules/
npm-debug.log.*
/.awcache/*

######################
# SASS
Expand Down Expand Up @@ -117,7 +118,7 @@ Desktop.ini
######################
# Logs
######################
*.log
*.log*

######################
# Others
Expand Down
164 changes: 83 additions & 81 deletions .yo-rc.json
Original file line number Diff line number Diff line change
@@ -1,82 +1,84 @@
{
"generator-jhipster": {
"promptValues": {
"packageName": "org.exampleapps.greatbig",
"nativeLanguage": "en"
},
"jhipsterVersion": "4.6.1",
"baseName": "GreatBigExampleApplication",
"packageName": "org.exampleapps.greatbig",
"packageFolder": "org/exampleapps/greatbig",
"serverPort": "8090",
"authenticationType": "jwt",
"hibernateCache": "ehcache",
"clusteredHttpSession": false,
"websocket": "spring-websocket",
"databaseType": "sql",
"devDatabaseType": "h2Disk",
"prodDatabaseType": "postgresql",
"searchEngine": "elasticsearch",
"messageBroker": false,
"serviceDiscoveryType": false,
"buildTool": "maven",
"enableSocialSignIn": true,
"jwtSecretKey": "7c10615c946ddf4de8dd2fbf6469aeb8eb4c48c6",
"clientFramework": "angularX",
"useSass": true,
"clientPackageManager": "yarn",
"applicationType": "monolith",
"testFrameworks": [
"gatling",
"protractor"
],
"jhiPrefix": "jhi",
"otherModules": [
{
"name": "generator-jhipster-nav-element",
"version": "1.2.2"
},
{
"name": "generator-jhipster-bootstrap-material-design",
"version": "3.5.1"
},
{
"name": "generator-jhipster-swagger2markup",
"version": "1.2.0"
},
{
"name": "generator-jhipster-entity-audit",
"version": "2.4.0"
},
{
"name": "generator-jhipster-darktheme",
"version": "0.0.7"
},
{
"name": "generator-jhipster-bootswatch",
"version": "1.0.2"
},
{
"name": "generator-jhipster-material",
"version": "0.0.0"
},
{
"name": "generator-jhipster-fortune",
"version": "0.0.2"
},
{
"name": "generator-jhipster-google-analytics",
"version": "0.0.1"
}
],
"enableTranslation": true,
"nativeLanguage": "en",
"languages": [
"en",
"fr",
"de",
"es"
],
"herokuAppName": "great-big-example-application"
}
}
"generator-jhipster": {
"promptValues": {
"packageName": "org.exampleapps.greatbig",
"nativeLanguage": "en"
},
"jhipsterVersion": "4.14.3",
"baseName": "GreatBigExampleApplication",
"packageName": "org.exampleapps.greatbig",
"packageFolder": "org/exampleapps/greatbig",
"serverPort": "8090",
"authenticationType": "jwt",
"hibernateCache": "ehcache",
"clusteredHttpSession": false,
"websocket": "spring-websocket",
"databaseType": "sql",
"devDatabaseType": "h2Disk",
"prodDatabaseType": "postgresql",
"searchEngine": "elasticsearch",
"messageBroker": false,
"serviceDiscoveryType": false,
"buildTool": "maven",
"enableSocialSignIn": true,
"jwtSecretKey": "7c10615c946ddf4de8dd2fbf6469aeb8eb4c48c6",
"clientFramework": "angularX",
"useSass": true,
"clientPackageManager": "yarn",
"applicationType": "monolith",
"testFrameworks": [
"gatling",
"protractor"
],
"jhiPrefix": "jhi",
"otherModules": [
{
"name": "generator-jhipster-nav-element",
"version": "1.2.2"
},
{
"name": "generator-jhipster-bootstrap-material-design",
"version": "3.5.1"
},
{
"name": "generator-jhipster-swagger2markup",
"version": "1.2.0"
},
{
"name": "generator-jhipster-entity-audit",
"version": "2.4.0"
},
{
"name": "generator-jhipster-darktheme",
"version": "0.0.7"
},
{
"name": "generator-jhipster-bootswatch",
"version": "1.0.2"
},
{
"name": "generator-jhipster-material",
"version": "0.0.0"
},
{
"name": "generator-jhipster-fortune",
"version": "0.0.2"
},
{
"name": "generator-jhipster-google-analytics",
"version": "0.0.1"
}
],
"enableTranslation": true,
"nativeLanguage": "en",
"languages": [
"en",
"fr",
"de",
"es"
],
"herokuAppName": "great-big-example-application",
"cacheProvider": "ehcache",
"enableHibernateCache": true
}
}
2 changes: 1 addition & 1 deletion docs/contents/articles/102-troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ ERROR:
reflect-metadata shim is required when using class decorators

FIX:
Add var reflect = require('reflect-metadata'); to test.ts
Add var reflect = require('reflect-metadata'); to entry.ts
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"moment": "2.3.x",
"moment": "2.19.x",
"typogr": "0.5.x",
"underscore": "1.4.x",
"wintersmith": "2.3.1",
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = (config) => {

// list of files / patterns to load in the browser
files: [
'test.ts',
'entry.ts',
'node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css'
],

Expand All @@ -25,7 +25,7 @@ module.exports = (config) => {
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
'test.ts': ['webpack', 'sourcemap']
'entry.ts': ['webpack', 'sourcemap']
},

webpack: webpackConfig(WATCH),
Expand Down
Loading