Skip to content

Commit

Permalink
Use npm version of clipboard
Browse files Browse the repository at this point in the history
clipboard 2.0.6 introduced some => functions into dist code.
A fix was introduced, but only available for the npm version
due to a missing update of the version number in the bower.json file.

This broke the build as uglifyjs can't parse => functions.

Fixes #359
  • Loading branch information
TheGreatRefrigerator committed Jun 11, 2021
1 parent 3b2571c commit aaee802
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 4 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ RELEASING:
8. Add version to docker-compose.yml (grunt version always adds 1 on top the current version ...)
-->

## [Unreleased]

### Changed
- clipboard.js from bower to npm

### Fixed
- broken build due to clipboard.js ([#359](https://github.com/GIScience/openrouteservice-app/issues/359))

## [v0.7.0] - 2021-02-03

### Added
Expand Down
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<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="bower_components/clipboard/dist/clipboard.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/@angular/router/angular1/angular_1_router.js"></script>
Expand Down
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
"leaflet.locatecontrol": "^0.62.0",
"leaflet-distance-markers": "https://github.com/adoroszlai/leaflet-distance-markers.git",
"ng-focus-if": "^1.0.7",
"ngclipboard": "^2.0.0",
"clipboard": "^2.0.0"
"ngclipboard": "^2.0.0"
},
"resolutions": {
"angular": "~1.5.10",
Expand Down
38 changes: 38 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
},
"devDependencies": {
"bower": "^1.8.8",
"clipboard": "^2.0.8",
"connect-modrewrite": "^0.10.2",
"d3-scale-chromatic": "^1.5.0",
"grunt-angular-templates": "^1.2.0",
Expand All @@ -63,8 +64,8 @@
"grunt-traceur": "git+https://github.com/aaronfrost/grunt-traceur.git",
"grunt-usemin": "git+https://github.com/TheGreatRefrigerator/grunt-usemin.git",
"grunt-version": "^1.3.2",
"lite-server": "^2.5.4",
"http-proxy-middleware": "0.20.0",
"lite-server": "^2.5.4",
"load-grunt-tasks": "^3.5.2",
"serve-static": "^1.14.1",
"time-grunt": "^1.4.0",
Expand Down

0 comments on commit aaee802

Please sign in to comment.