Skip to content

Commit

Permalink
Removed bower from dependencies
Browse files Browse the repository at this point in the history
as more and more bower packages are disappearing,
all leftover bower dependencies were migrated to their
npm counterpart and bower as a dependency completely removed.

Leaflet is kept at v1.7.x until an issue with the leaflet-measure
package is resolved.

Also moved to minimised sources where possible in index.html

closes #365
  • Loading branch information
TheGreatRefrigerator committed May 13, 2022
1 parent feb9b2c commit 3b2283a
Show file tree
Hide file tree
Showing 12 changed files with 2,685 additions and 2,105 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Ignore .DS_Store
.DS_Store
node_modules
bower_components
weathercheck.txt
app/js/config.js
app/js/templates.js
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ branches:
script:
- npm install -g grunt-cli
- npm install
- node_modules/bower/bin/bower install
- cp Gruntfile.default.js Gruntfile.js
- node_modules/.bin/grunt ci
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ RELEASING:

### Changed
- leaflet.markercluster from bower to npm
- leftover bower dependencies to npm ([#365](https://github.com/GIScience/openrouteservice-app/issues/365))
- to minimised sources where possible

### Removed
- bower as dependency management


## [0.7.2] - 2021-06-14

Expand Down
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
FROM timbru31/node-alpine-git:12

# copy required files
COPY [".bowerrc", "bower.json", "bs-config.js", "main.js", "package.json", "package-lock.json", "/ors-classic-maps/"]
COPY ["bs-config.js", "main.js", "package.json", "package-lock.json", "/ors-classic-maps/"]

RUN cd /ors-classic-maps
WORKDIR /ors-classic-maps

# install npm dependencies
RUN npm install

# install bower dependencies
RUN node_modules/bower/bin/bower install --allow-root

# move default Gruntfile to correct place
COPY Gruntfile.default.js /ors-classic-maps/Gruntfile.js

Expand Down
8 changes: 2 additions & 6 deletions Gruntfile.default.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ module.exports = function(grunt) {
expand: true,
cwd: "./",
src: [
"bower_components/font-awesome/**",
"bower_components/leaflet/**",
"node_modules/font-awesome/**",
"node_modules/leaflet/**",
"node_modules/leaflet.heightgraph/dist/**"
],
dest: "build"
Expand Down Expand Up @@ -177,10 +177,6 @@ module.exports = function(grunt) {
modRewrite([
"!\\.html|\\.js|\\.txt|\\.ico|\\.svg|\\.map|\\.woff2|\\.woff|\\.ttf|\\.css|\\.png$ /index.html [L]"
]),
connect().use(
"/bower_components",
serveStatic("./bower_components")
),
connect().use(
"/node_modules",
serveStatic("./node_modules")
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ After cloning the repository:
```sh
# install all modules listed as dependencies in package.json
npm install

# install dependencies listed in bower.json
node_modules/bower/bin/bower install
```

- Initiate default files:
Expand Down
4 changes: 0 additions & 4 deletions app/components/ors-map/ors-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -1065,10 +1065,6 @@ angular.module("orsApp").directive("orsMap", () => {
};
let geojson = L.geoJson(actionPackage.geometry, {
pointToLayer: function(feature, latlng) {
// let locationsIcon = L.icon({
// iconUrl: '/bower_components/Font-Awesome-SVG-PNG/black/png/22/btc.png',
// iconSize: [22, 22], // size of the icon
// });
let locationsIcon = L.divIcon(lists.locationsIcon);
locationsIcon.options.html =
lists.locations_icons[
Expand Down
79 changes: 38 additions & 41 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,30 @@
<meta name="description" content="Openrouteservice is a open source route planner with plenty of features for car, heavy vehicles, hiking and cycling."/>
<link href="favicon.ico" rel="shortcut icon" type="image/x-icon">
<!-- build:css(.) vendor.css -->
<link href="bower_components/angular-loading-bar/build/loading-bar.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/reset.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/input.css" rel="stylesheet"></link>
<link href="node_modules/angular-loading-bar/build/loading-bar.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/reset.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/input.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/button.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/divider.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/list.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/dropdown.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/checkbox.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/label.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/form.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/grid.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/message.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/table.min.css" rel="stylesheet"></link>
<link href="node_modules/semantic-ui-css/components/loader.min.css" rel="stylesheet"></link>

<link href="bower_components/semantic/dist/components/button.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/divider.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/list.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/dropdown.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/checkbox.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/label.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/form.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/grid.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/message.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/table.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/loader.css" rel="stylesheet"></link>
<link href="bower_components/semantic/dist/components/form.css" rel="stylesheet"></link>

<link href="bower_components/angular-tooltips/dist/angular-tooltips.css" rel="stylesheet" type="text/css" />
<link href="node_modules/angular-tooltips/dist/angular-tooltips.min.css" rel="stylesheet" type="text/css" />
<link href="node_modules/leaflet/dist/leaflet.css" rel="stylesheet"></link>
<link href="bower_components/leaflet-measure/dist/leaflet-measure.css" rel="stylesheet"></link>
<link href="node_modules/leaflet-measure/dist/leaflet-measure.css" rel="stylesheet"></link>
<link href="node_modules/leaflet.markercluster/dist/MarkerCluster.css" rel="stylesheet"></link>
<link href="node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css" rel="stylesheet"></link>
<link href="node_modules/leaflet-distance-markers/leaflet-distance-marker.css" rel="stylesheet"></link>
<!-- endbuild -->
<!-- these scripts remain unbuilt as they contain relative paths -->
<link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet"></link>
<link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"></link>
<link href="node_modules/leaflet.heightgraph/dist/L.Control.Heightgraph.min.css" rel="stylesheet"></link>
<!-- build:css main.css -->
<link href="css/ors-landmark.css" rel="stylesheet"></link>
Expand Down Expand Up @@ -93,47 +91,46 @@
<!-- start auto template tags -->
<!-- end auto template tags -->
<!-- build:js(.) vendor.js -->
<script src="bower_components/rxjs/dist/rx.lite.js"></script>
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-translate/angular-translate.js"></script>
<script src="bower_components/ng-focus-if/focusIf.min.js"></script>
<script src="node_modules/rx-lite/rx.lite.min.js"></script>
<script src="node_modules/jquery/dist/jquery.min.js"></script>
<script src="node_modules/jquery-ui-dist/jquery-ui.min.js"></script>
<script src="node_modules/angular/angular.min.js"></script>
<script src="node_modules/angular-cookies/angular-cookies.min.js"></script>
<script src="node_modules/angular-animate/angular-animate.min.js"></script>
<script src="node_modules/angular-sanitize/angular-sanitize.min.js"></script>
<script src="node_modules/angular-translate/dist/angular-translate.min.js"></script>
<script src="node_modules/ng-focus-if/focusIf.min.js"></script>
<script src="node_modules/clipboard/dist/clipboard.min.js"></script>
<script src="bower_components/ngclipboard/dist/ngclipboard.min.js"></script>
<script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
<script src="node_modules/ngclipboard/dist/ngclipboard.min.js"></script>
<script src="node_modules/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
<script src="node_modules/@angular/router/angular1/angular_1_router.js"></script>
<script src="node_modules/geojson/geojson.min.js"></script>
<script src="node_modules/jxon/jxon.js"></script>
<script src="node_modules/jxon/jxon.min.js"></script>
<script src="node_modules/togpx/togpx.js"></script>
<script src="node_modules/xml-js/dist/xml-js.min.js"></script>
<script src="node_modules/tokml/tokml.js"></script>
<script src="node_modules/leaflet-omnivore/leaflet-omnivore.min.js"></script>
<script src="node_modules/turf.js" type="text/javascript"></script>
<script src="node_modules/leaflet/dist/leaflet.js"></script>
<script src="bower_components/leaflet-measure/dist/leaflet-measure.js"></script>
<script src="node_modules/leaflet-measure/dist/leaflet-measure.min.js"></script>
<script src="node_modules/leaflet-control-angular/src/L.Control.Angular.js"></script>
<script src="node_modules/leaflet-geometryutil/src/leaflet.geometryutil.js"></script>
<script src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
<script src="bower_components/leaflet.editable/src/Leaflet.Editable.js"></script>
<script src="node_modules/leaflet-editable/src/Leaflet.Editable.js"></script>
<script src="node_modules/leaflet.heightgraph/dist/L.Control.Heightgraph.min.js"></script>
<script src="bower_components/leaflet.locatecontrol/src/L.Control.Locate.js" charset="utf-8"></script>
<script src="node_modules/leaflet.locatecontrol/src/L.Control.Locate.js" charset="utf-8"></script>
<script src="node_modules/leaflet-distance-markers/leaflet-distance-marker.js" charset="utf-8"></script>
<script src="node_modules/leaflet.featuregroup.subgroup/dist/leaflet.featuregroup.subgroup.js"></script>
<script src="bower_components/angular-loading-bar/build/loading-bar.js"></script>
<script src="bower_components/angular-ui-sortable/sortable.js"></script>
<script src="bower_components/angularjs-slider/dist/rzslider.min.js"></script>
<script src="node_modules/angular-loading-bar/build/loading-bar.min.js"></script>
<script src="node_modules/angular-ui-sortable/dist/sortable.min.js"></script>
<script src="node_modules/angularjs-slider/dist/rzslider.min.js"></script>
<script src="node_modules/d3/dist/d3.min.js"></script>
<script src="bower_components/d3-tip/index.js"></script>
<script src="node_modules/d3-tip/index.js"></script>
<script src="node_modules/d3-interpolate/dist/d3-interpolate.min.js"></script>
<script src="node_modules/d3-color/dist/d3-color.min.js"></script>
<script src="node_modules/d3-scale-chromatic/dist/d3-scale-chromatic.min.js"></script>
<script src="bower_components/vkBeautify/vkbeautify.js" type="text/javascript"></script>
<script src="bower_components/angular-file-saver/dist/angular-file-saver.bundle.js" type="text/javascript"></script>
<script src="bower_components/angular-tooltips/dist/angular-tooltips.js"></script>
<script src="node_modules/angular-file-saver/dist/angular-file-saver.bundle.min.js" type="text/javascript"></script>
<script src="node_modules/angular-tooltips/dist/angular-tooltips.min.js"></script>
<!-- endbuild -->
<!-- build:js scripts.js -->
<script src="js/app.js"></script>
Expand Down
39 changes: 0 additions & 39 deletions bower.json

This file was deleted.

0 comments on commit 3b2283a

Please sign in to comment.