From f2e04d5cca0abd1e7a32262b1772ae2c9a728a4e Mon Sep 17 00:00:00 2001
From: Jack Reed <phillipjreed@gmail.com>
Date: Thu, 26 Oct 2017 02:54:18 -0400
Subject: [PATCH] remove final bower dependency
---
CONTRIBUTING.md | 2 --
Gruntfile.js | 4 ++--
README.md | 1 -
bower.json | 3 ---
package.json | 1 +
5 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8ed443851..d0aaaabcf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -77,8 +77,6 @@ Mirador uses the node.js runtime for its development environment, and to bundle
#### The NPM package manager
Dependencies are managed primarily with the NPM package manager, and releases are primarily distributed over npm. It is recommended that any new dependencies being added are tracked with a specific version in the `package.json` and installed with npm. The final build dependency is then copied into the `js/lib` directory for inclusion into Mirador. Only this copied final version of the dependency should be versioned (added to git).
#### Javascript Resources
-#### Bower Package Manager [DEPRECATED]
-Some resources are managed with bower, but this is being phased out. It is recommended that no new dependency be added through bower unless it is truly unavailable on NPM.
### Project Management with Grunt
[Grunt](http://gruntjs.com/) is a utility for managing repetitive tasks involved in the development process, such as building, linting, format-checking, and compressing files, running tests and generating coverage reports, and reloading the browser on file changes (for interactive feedback during feature development). A variety of tasks have been automated for developer convenience.
#### Building and Compressing
diff --git a/Gruntfile.js b/Gruntfile.js
index f7b292919..edb4a8ece 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -45,7 +45,7 @@ module.exports = function(grunt) {
'node_modules/i18next/i18next.min.js',
'node_modules/i18next-browser-languagedetector/i18nextBrowserLanguageDetector.min.js',
'node_modules/i18next-xhr-backend/i18nextXHRBackend.min.js',
- 'bower_components/simplePagination.js/jquery.simplePagination.js',
+ 'node_modules/simple-pagination.js/jquery.simplePagination.js',
'js/lib/modernizr.custom.js',
'js/lib/sanitize-html.min.js',
'node_modules/iiif-evented-canvas/dist/iiif-evented-canvas.umd.min.js',
@@ -103,7 +103,7 @@ module.exports = function(grunt) {
'node_modules/select2/dist/css/select2.min.css',
'css/mirador.css',
'css/material-icons.css',
- 'bower_components/simplePagination.js/simplePagination.css'
+ 'node_modules/simple-pagination.js/simplePagination.css'
],
dest: 'build/mirador/css/mirador-combined.css'
}
diff --git a/README.md b/README.md
index 72bfa9433..091b80ee9 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@ Mirador uses [Node.js](https://nodejs.org/) and a build system to assemble, test
1. Install [Node.js](https://nodejs.org/)
2. Install the Grunt command line runner i.e. `npm install -g grunt-cli`
- 3. Install the Bower command line utility i.e. `npm install -g bower`
1. Clone the Mirador repository
1. Change into the Mirador directory
1. Install all dependencies with `npm install`. Run `npm start`.
diff --git a/bower.json b/bower.json
index 727616b14..de99abbda 100644
--- a/bower.json
+++ b/bower.json
@@ -20,9 +20,6 @@
"tests"
],
"dependencies": {
- "sanitize-html": "~1.11.4",
- "qtip2": "~2.2.1",
- "simplePagination.js": "*"
},
"resolutions": {
"jquery": ">=1.7.2"
diff --git a/package.json b/package.json
index 281b78e4b..9d1cfb4e2 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
"openseadragon": "^2.2.1",
"paper": "^0.10.2",
"select2": "^4.0.3",
+ "simple-pagination.js": "^1.6.0",
"spectrum-colorpicker": "^1.8.0",
"tinymce": "^4.1.7",
"urijs": "^1.16.1"
--
GitLab