From 6814f28def9771dd45fe6d6b58fa48fecce0e49d Mon Sep 17 00:00:00 2001
From: Anthony Sottile
Date: Wed, 31 Dec 2014 13:13:40 -0800
Subject: [PATCH 001/854] s/bootstrap-sass/sass-bootstrap/g
---
base.mako | 4 ++--
bower.json | 2 +-
scss/main.scss | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/base.mako b/base.mako
index ebfd5755..62b8dc29 100644
--- a/base.mako
+++ b/base.mako
@@ -47,7 +47,7 @@
A framework for managing and maintaining multi-language pre-commit hooks.

-
@@ -62,7 +62,7 @@
-
+
+
diff --git a/index.mako b/index.mako
index af9051ba..970d2ddc 100644
--- a/index.mako
+++ b/index.mako
@@ -243,7 +243,7 @@
host. For configuring Docker hooks, your
entry
should correspond to an executable inside the Docker
container, and will be used to override the default container
- entrypoint. Your Docker
CMD will not run when
+ entrypoint. Your Docker
CMD will not run when
pre-commit passes a file list as arguments to the run
container command. Docker allows you to use any language
that's not supported by pre-commit as a builtin.
@@ -354,7 +354,7 @@
script
Script hooks provide a way to write simple scripts which
- valdiate files. The entry should be a path
+ valdiate files. The entry should be a path
relative to the root of the hook repository.
From 1b462efba48c19b8b14ead4f8d9cf2298b3fdd0c Mon Sep 17 00:00:00 2001
From: Frieder Bluemle
Date: Mon, 15 May 2017 22:36:07 +0800
Subject: [PATCH 092/854] Fix GitHub spelling
---
base.mako | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/base.mako b/base.mako
index 7be16e93..0eaa9ecf 100644
--- a/base.mako
+++ b/base.mako
@@ -30,7 +30,7 @@
Demo
From 6a694f88a499129987ed4a061c040838c0c1afef Mon Sep 17 00:00:00 2001
From: Chris Kuehl
Date: Tue, 13 Jun 2017 18:07:12 -0700
Subject: [PATCH 093/854] Fix typo
---
index.mako | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.mako b/index.mako
index 0c74f415..89287710 100644
--- a/index.mako
+++ b/index.mako
@@ -352,7 +352,7 @@
script
Script hooks provide a way to write simple scripts which
- valdiate files. The entry should be a path
+ validate files. The entry should be a path
relative to the root of the hook repository.
From edc0d6f7fc4fd82490ce5bc8282d8742af1c9219 Mon Sep 17 00:00:00 2001
From: Anthony Sottile
Date: Mon, 3 Jul 2017 12:40:58 -0700
Subject: [PATCH 094/854] Switch from bower to npm
---
.gitignore | 3 +--
Makefile | 18 +++++++++---------
base.mako | 4 ++--
bower.json | 8 --------
package.json | 5 +++++
requirements-dev.txt | 1 -
scss/main.scss | 2 +-
7 files changed, 18 insertions(+), 23 deletions(-)
delete mode 100644 bower.json
create mode 100644 package.json
diff --git a/.gitignore b/.gitignore
index 7b46b5f5..93aaa514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@
.project
.pydevproject
/all-hooks.json
-/bower_components
+/node_modules
/build
-/nenv
/venv
diff --git a/Makefile b/Makefile
index 5cfd9d0c..b66caee3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ all: install-hooks build/main.css all-hooks.json index.html hooks.html
install-hooks: venv
venv/bin/pre-commit install
-build/main.css: nenv build scss/main.scss scss/_variables.scss
+build/main.css: venv node_modules build scss/main.scss scss/_variables.scss
venv/bin/sassc -s compressed scss/main.scss build/main.css
all-hooks.json: venv make_all_hooks.py all-repos.yaml
@@ -20,23 +20,23 @@ venv: requirements-dev.txt Makefile
virtualenv venv -ppython3.6
venv/bin/pip install -r requirements-dev.txt
-nenv: venv
- rm -rf nenv
- venv/bin/nodeenv nenv --prebuilt && \
- . nenv/bin/activate && \
- npm install -g bower && \
- bower install
+node_modules: package.json
+ ( \
+ npm install && \
+ npm prune && \
+ touch $@ \
+ ) || touch $@ --reference $^ --date '1 day ago'
push: venv
venv/bin/markdown-to-presentation push \
--master-branch real_master \
--pages-branch master \
.travis.yml README.md CNAME \
- build bower_components *.html *.png favicon.ico \
+ build node_modules *.html *.png favicon.ico \
all-hooks.json install-local.py
clean:
- rm -rf venv nenv build bower_components *.html all-hooks.json
+ rm -rf venv build node_modules *.html all-hooks.json
build:
mkdir -p build
diff --git a/base.mako b/base.mako
index 0eaa9ecf..69202421 100644
--- a/base.mako
+++ b/base.mako
@@ -62,8 +62,8 @@
Brought to you by Yelp. Check out some of our other open source projects on GitHub.
-
-
+
+