Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add watch build script for angular frontend #14524

Merged
merged 2 commits into from
Mar 30, 2021
Merged

Add watch build script for angular frontend #14524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f24bd57
Add watch build script for angular frontend
mshima Mar 28, 2021
f830cfa
Fix for skipServer
mshima Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions generators/client/templates/angular/package.json.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,13 @@
"pretest": "<%= clientPackageManager %> run lint",
"test": "ng test --coverage --log-heap-usage -w=2",
"test:watch": "<%= clientPackageManager %> run test -- --watch",
"watch": "concurrently 'npm run webapp:hmr'<% if(!skipServer) { %> 'npm run backend:start'<% } %>",
"webapp:build": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:dev",
"webapp:build:dev": "ng build",
"webapp:build:prod": "ng build --prod",
"webapp:dev": "ng serve",
"webapp:dev-verbose": "ng serve --verbose",
"webapp:hmr": "ng serve --hmr",
"webapp:prod": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:prod",
"webapp:test": "<%= clientPackageManager %> run test"
},
Expand Down
27 changes: 15 additions & 12 deletions generators/client/templates/angular/webpack/webpack.custom.js.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const ESLintPlugin = require('eslint-webpack-plugin');

const tls = process.env.TLS;

module.exports = (config, options) => {
module.exports = (config, options, targetOptions) => {
// PLUGINS
if (config.mode === 'development') {
config.plugins.push(
Expand All @@ -42,14 +42,25 @@ module.exports = (config, options) => {
new WebpackNotifierPlugin({
title: '<%= humanizedBaseName %>',
contentImage: path.join(__dirname, 'logo-jhipster.png'),
}),
})
);
if (!process.env.JHI_DISABLE_WEBPACK_LOGS) {
config.plugins.push(
new SimpleProgressWebpackPlugin({
format: 'compact',
})
);
}
}
if (targetOptions.target === 'serve' || config.watch) {
config.plugins.push(
new BrowserSyncPlugin(
{
host: 'localhost',
port: 9000,
https: tls,
proxy: {
target: `http${tls ? 's' : ''}://localhost:4200`,
target: `http${tls ? 's' : ''}://localhost:${targetOptions.target === 'serve' ? '4200' : '<%= serverPort %>'}`,
<%_ if (websocket === 'spring-websocket') { _%>
ws: true,
<%_ } _%>
Expand All @@ -72,18 +83,10 @@ module.exports = (config, options) => {
*/
},
{
reload: false,
reload: targetOptions.target === 'build', // enabled for build --watch
}
)
);

if (!process.env.JHI_DISABLE_WEBPACK_LOGS) {
config.plugins.push(
new SimpleProgressWebpackPlugin({
format: 'compact',
})
);
}
}

if (config.mode === 'production') {
Expand Down
11 changes: 5 additions & 6 deletions generators/server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,17 +336,15 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
_postWriting() {
return {
packageJsonScripts() {
const packageJsonStorage = this.createStorage('package.json');
const packageJsonConfigStorage = packageJsonStorage.createStorage('config').createProxy();
const packageJsonConfigStorage = this.packageJson.createStorage('config').createProxy();
packageJsonConfigStorage.backend_port = this.serverPort;
packageJsonConfigStorage.packaging = process.env.JHI_WAR === '1' ? 'war' : 'jar';
if (process.env.JHI_PROFILE) {
packageJsonConfigStorage.default_environment = process.env.JHI_PROFILE.includes('dev') ? 'dev' : 'prod';
}
},
packageJsonDockerScripts() {
const packageJsonStorage = this.createStorage('package.json');
const scriptsStorage = packageJsonStorage.createStorage('scripts');
const scriptsStorage = this.packageJson.createStorage('scripts');
const databaseType = this.jhipsterConfig.databaseType;
const dockerAwaitScripts = [];
if (databaseType === 'sql') {
Expand Down Expand Up @@ -415,8 +413,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
});
},
packageJsonBackendScripts() {
const packageJsonStorage = this.createStorage('package.json');
const scriptsStorage = packageJsonStorage.createStorage('scripts');
const scriptsStorage = this.packageJson.createStorage('scripts');
const javaCommonLog = `-Dlogging.level.ROOT=OFF -Dlogging.level.org.zalando=OFF -Dlogging.level.tech.jhipster=OFF -Dlogging.level.${this.jhipsterConfig.packageName}=OFF`;
const javaTestLog =
'-Dlogging.level.org.springframework=OFF -Dlogging.level.org.springframework.web=OFF -Dlogging.level.org.springframework.security=OFF';
Expand All @@ -428,6 +425,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
'backend:info': './mvnw -ntp enforcer:display-info --batch-mode',
'backend:doc:test': './mvnw -ntp javadoc:javadoc --batch-mode',
'backend:nohttp:test': './mvnw -ntp checkstyle:check --batch-mode',
'backend:start': './mvnw -P-webapp',
'java:jar': './mvnw -ntp verify -DskipTests --batch-mode',
'java:war': './mvnw -ntp verify -DskipTests --batch-mode -Pwar',
'java:docker': './mvnw -ntp verify -DskipTests jib:dockerBuild',
Expand All @@ -440,6 +438,7 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator {
'backend:info': './gradlew -v',
'backend:doc:test': `./gradlew javadoc ${excludeWebapp}`,
'backend:nohttp:test': `./gradlew checkstyleNohttp ${excludeWebapp}`,
'backend:start': './gradlew',
'java:jar': './gradlew bootJar -x test -x integrationTest',
'java:war': './gradlew bootWar -Pwar -x test -x integrationTest',
'java:docker': './gradlew bootJar jibDockerBuild',
Expand Down