Skip to content

Commit

Permalink
refactor: made app a monorepo
Browse files Browse the repository at this point in the history
Turned out I just needed to udate grunt to handle mono-repos.
Maybe trying to remove it wasn't necessary. Having a monorepo
causes an bbissue with module-alias though, I must redefine
aliases in the root package.json. They are duplicated, this
is annoying. For now though, having a monorepo opens
up the possibility of running tests in a neat CI pipeline.
  • Loading branch information
francois-roseberry committed Nov 8, 2024
1 parent f5ae68f commit 06f7d49
Show file tree
Hide file tree
Showing 7 changed files with 3,228 additions and 4,457 deletions.
1 change: 0 additions & 1 deletion client/.yarnrc.yml

This file was deleted.

14 changes: 7 additions & 7 deletions client/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ module.exports = function(grunt) {
concat: {
dependencies: {
src: [
'node_modules/underscore/underscore.js',
'node_modules/d3/d3.min.js',
'node_modules/rx/dist/rx.all.min.js',
'node_modules/jquery/dist/jquery.min.js',
'node_modules/jquery-ui/dist/jquery-ui.min.js',
'node_modules/bootstrap/dist/js/bootstrap.min.js'
'../node_modules/underscore/underscore.js',
'../node_modules/d3/d3.min.js',
'../node_modules/rx/dist/rx.all.min.js',
'../node_modules/jquery/dist/jquery.min.js',
'../node_modules/jquery-ui/dist/jquery-ui.min.js',
'../node_modules/bootstrap/dist/js/bootstrap.min.js'
],
dest: 'dist/lib/dependencies.js'
}
Expand All @@ -29,7 +29,7 @@ module.exports = function(grunt) {
files: {
'dist/styles.min.css': [
'src/**/*.css',
'node_modules/jquery-ui/dist/themes/ui-lightness/jquery-ui.min.css'
'../node_modules/jquery-ui/dist/themes/ui-lightness/jquery-ui.min.css'
]
}
}
Expand Down
6 changes: 3 additions & 3 deletions client/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ echo "Copying index.html entrypoint..."
cp static/index.html dist/index.html

echo "Copying bootstrap CSS..."
cp node_modules/bootstrap/dist/css/bootstrap.css dist/lib/bootstrap.css
cp ../node_modules/bootstrap/dist/css/bootstrap.css dist/lib/bootstrap.css

echo "Copying jQuery UI images..."
mkdir -p dist/images
cp node_modules/jquery-ui/dist/themes/ui-lightness/images/* dist/images
cp ../node_modules/jquery-ui/dist/themes/ui-lightness/images/* dist/images

echo "Copying bootstrap fonts"
mkdir -p dist/fonts
cp node_modules/bootstrap/dist/fonts/* dist/fonts
cp ../node_modules/bootstrap/dist/fonts/* dist/fonts
6 changes: 3 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"browserify-transform-tools": "1.7.0",
"csslint": "1.0.5",
"expect.js": "0.3.1",
"grunt": "0.4.5",
"grunt-contrib-concat": "0.5.1",
"grunt-contrib-cssmin": "0.12.3",
"grunt": "1.6.1",
"grunt-contrib-concat": "2.1.0",
"grunt-contrib-cssmin": "5.0.0",
"jquery": "2.1.4",
"jquery-ui": "1.13.3",
"jsdom": "25.0.1",
Expand Down
Loading

0 comments on commit 06f7d49

Please sign in to comment.