diff options
-rw-r--r-- | language-web/build.gradle | 28 | ||||
-rw-r--r-- | language-web/package.json | 1 |
2 files changed, 18 insertions, 11 deletions
diff --git a/language-web/build.gradle b/language-web/build.gradle index 9e67f4e0..19a378f8 100644 --- a/language-web/build.gradle +++ b/language-web/build.gradle | |||
@@ -38,9 +38,7 @@ frontend { | |||
38 | assembleScript = 'run assemble' | 38 | assembleScript = 'run assemble' |
39 | } | 39 | } |
40 | 40 | ||
41 | tasks.named('installFrontend') { | 41 | def installFrontend = tasks.named('installFrontend') |
42 | inputs.files('package.json', 'yarn.lock') | ||
43 | } | ||
44 | 42 | ||
45 | def assembleFrontend = tasks.named('assembleFrontend') | 43 | def assembleFrontend = tasks.named('assembleFrontend') |
46 | assembleFrontend.configure { | 44 | assembleFrontend.configure { |
@@ -53,7 +51,20 @@ assembleFrontend.configure { | |||
53 | outputs.dir productionResources | 51 | outputs.dir productionResources |
54 | } | 52 | } |
55 | 53 | ||
54 | tasks.register('webpackStats', RunNpmYarn) { | ||
55 | dependsOn installFrontend | ||
56 | dependsOn generateXtext | ||
57 | inputs.dir 'src/main/css' | ||
58 | inputs.dir 'src/main/html' | ||
59 | inputs.dir 'src/main/js' | ||
60 | inputs.dir "${buildDir}/generated/sources/xtext/js" | ||
61 | inputs.files('package.json', 'yarn.lock', 'webpack.config.js') | ||
62 | outputs.file "${buildDir}/webpack/stats.json" | ||
63 | script = 'run stats' | ||
64 | } | ||
65 | |||
56 | def eslint = tasks.register('eslint', RunNpmYarn) { | 66 | def eslint = tasks.register('eslint', RunNpmYarn) { |
67 | dependsOn installFrontend | ||
57 | inputs.dir 'src/main/js' | 68 | inputs.dir 'src/main/js' |
58 | inputs.files('.eslintrc.js', 'tsconfig.json') | 69 | inputs.files('.eslintrc.js', 'tsconfig.json') |
59 | script = 'run check:eslint' | 70 | script = 'run check:eslint' |
@@ -62,6 +73,7 @@ def eslint = tasks.register('eslint', RunNpmYarn) { | |||
62 | } | 73 | } |
63 | 74 | ||
64 | def stylelint = tasks.register('stylelint', RunNpmYarn) { | 75 | def stylelint = tasks.register('stylelint', RunNpmYarn) { |
76 | dependsOn installFrontend | ||
65 | inputs.dir 'src/main/css' | 77 | inputs.dir 'src/main/css' |
66 | inputs.file '.stylelintrc.js' | 78 | inputs.file '.stylelintrc.js' |
67 | script = 'run check:stylelint' | 79 | script = 'run check:stylelint' |
@@ -103,7 +115,7 @@ tasks.named('shadowJar') { | |||
103 | } | 115 | } |
104 | 116 | ||
105 | def jettyRun = tasks.register('jettyRun', JavaExec) { | 117 | def jettyRun = tasks.register('jettyRun', JavaExec) { |
106 | shouldRunAfter assembleFrontend | 118 | dependsOn assembleFrontend |
107 | dependsOn sourceSets.main.runtimeClasspath | 119 | dependsOn sourceSets.main.runtimeClasspath |
108 | classpath = sourceSets.main.runtimeClasspath.filter{it.exists()} | 120 | classpath = sourceSets.main.runtimeClasspath.filter{it.exists()} |
109 | main = mainClass | 121 | main = mainClass |
@@ -113,14 +125,8 @@ def jettyRun = tasks.register('jettyRun', JavaExec) { | |||
113 | description = 'Start a Jetty web server serving the Xtex API and assets (without rebuilding assets).' | 125 | description = 'Start a Jetty web server serving the Xtex API and assets (without rebuilding assets).' |
114 | } | 126 | } |
115 | 127 | ||
116 | tasks.register('jettyRunAssets') { | ||
117 | dependsOn assembleFrontend | ||
118 | dependsOn jettyRun | ||
119 | group = 'run' | ||
120 | description = 'Rebuild assets and start a Jetty web server serving the Xtex API and assets.' | ||
121 | } | ||
122 | |||
123 | tasks.register('webpackServe', RunNpmYarn) { | 128 | tasks.register('webpackServe', RunNpmYarn) { |
129 | dependsOn installFrontend | ||
124 | dependsOn generateXtext | 130 | dependsOn generateXtext |
125 | outputs.dir "${webpackOutputDir}/development" | 131 | outputs.dir "${webpackOutputDir}/development" |
126 | script = 'run serve' | 132 | script = 'run serve' |
diff --git a/language-web/package.json b/language-web/package.json index 85e1178b..ec54f7fd 100644 --- a/language-web/package.json +++ b/language-web/package.json | |||
@@ -5,6 +5,7 @@ | |||
5 | "main": "index.js", | 5 | "main": "index.js", |
6 | "scripts": { | 6 | "scripts": { |
7 | "assemble": "webpack --node-env production", | 7 | "assemble": "webpack --node-env production", |
8 | "stats": "webpack --node-env production --json > build/webpack/stats.json", | ||
8 | "serve": "webpack serve --node-env development --hot", | 9 | "serve": "webpack serve --node-env development --hot", |
9 | "check": "yarn run check:eslint && yarn run check:stylelint", | 10 | "check": "yarn run check:eslint && yarn run check:stylelint", |
10 | "check:eslint": "eslint .", | 11 | "check:eslint": "eslint .", |