Skip to content

Make NPM build output work with Gradle cache #229

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

Merged
labkey-tchad merged 1 commit into from
Nov 14, 2022
Merged

Make NPM build output work with Gradle cache #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion AnimalRequests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
}
},
"clean": {
"command": "rimraf resources/web/animalrequests/gen ; rimraf node_modules"
"command": "rimraf resources/web/AnimalRequests/gen ; rimraf node_modules"
},
"build-jest-test": {
"command": "jest",
Expand Down
2 changes: 1 addition & 1 deletion AnimalRequests/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = [function wp() {
library: 'AnimalRequests',
libraryExport: 'default',
libraryTarget: 'umd',
path: path.resolve(__dirname, 'resources/web/animalrequests/gen/')
path: path.resolve(__dirname, 'resources/web/AnimalRequests/gen/')
},
resolve: {
extensions: ['.ts', '.tsx', '.js', '.json', '.css'],
Expand Down
4 changes: 2 additions & 2 deletions AnimalRequests/webpack/dev-style.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
},

output: {
path: path.resolve(__dirname, '../resources/web/animalrequests/app/'),
path: path.resolve(__dirname, '../resources/web/AnimalRequests/gen/'),
publicPath: '/',
filename: 'style.js' // do not override app.js
},
Expand Down Expand Up @@ -48,4 +48,4 @@ module.exports = {
filename: '[name].css'
})
]
};
};
2 changes: 1 addition & 1 deletion AnimalRequests/webpack/dev.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = {
},

output: {
path: path.resolve(__dirname, '../resources/web/animalrequests/app/'),
path: path.resolve(__dirname, '../resources/web/AnimalRequests/gen/'),
publicPath: 'http://localhost:3000/',
filename: '[name].js'
},
Expand Down
3 changes: 1 addition & 2 deletions AnimalRequests/webpack/prod.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ module.exports = {
},

output: {
path: path.resolve(__dirname, '../resources/web/animalrequests/gen/app/'),
//path: path.resolve(__dirname, '../../WNPRC_EHR/resources/web/wnprc_ehr/reactjs/animalrequests/'),
path: path.resolve(__dirname, '../resources/web/AnimalRequests/gen/'),
publicPath: './', // allows context path to resolve in both js/css
filename: "[name].js"
},
Expand Down
6 changes: 6 additions & 0 deletions WNPRC_EHR/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,9 @@ configurations.all {
force "com.google.http-client:google-http-client:${googleHttpClientVersion}"
}
}

// Declare atypical npm build output directory for Gradle to correctly cache output
List.of(project.tasks.named("npm_run_build-prod"), project.tasks.named("npm_run_build"))
.forEach(task -> task.configure {
outputs.dir(project.file("./resources/web/wnprc_ehr/gen"))
})
2 changes: 1 addition & 1 deletion WNPRC_EHR/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build-storybook": "build-storybook",
"build": "better-npm-run build",
"build-prod": "better-npm-run build-prod",
"clean": "rm -rf resources/web/gen; rm -rf resources/views/gen"
"clean": "rm -rf resources/web/wnprc_ehr/gen; rm -rf resources/views/gen"
},
"keywords": [],
"author": "",
Expand Down