From eae82ba16615f5b3169b4c2d383855c002bbadc9 Mon Sep 17 00:00:00 2001 From: David Chambers Date: Mon, 4 Sep 2017 03:22:43 +0200 Subject: [PATCH] integrate sanctuary-scripts --- .config | 2 ++ .npmrc | 1 + CONTRIBUTING.md | 6 ++--- Makefile | 55 ---------------------------------------------- package.json | 19 +++++----------- scripts/prepublish | 6 ----- 6 files changed, 12 insertions(+), 77 deletions(-) create mode 100644 .config create mode 100644 .npmrc delete mode 100644 Makefile delete mode 100755 scripts/prepublish diff --git a/.config b/.config new file mode 100644 index 0000000..a0f3426 --- /dev/null +++ b/.config @@ -0,0 +1,2 @@ +repo-owner = sanctuary-js +repo-name = sanctuary-int diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..43c97e7 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +package-lock=false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0ffd4ea..dd7edee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,9 +16,9 @@ __README.md__ directly. descriptive commit message. Commit messages should be line wrapped at 72 characters. -4. Run `make test lint`, and address any errors. Preferably, fix commits - in place using `git rebase` or `git commit --amend` to make the changes - easier to review. +4. Run `npm test`, and address any errors. Preferably, fix commits in place + using `git rebase` or `git commit --amend` to make the changes easier to + review. 5. Push: diff --git a/Makefile b/Makefile deleted file mode 100644 index a81e23e..0000000 --- a/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -DOCTEST = node_modules/.bin/doctest --module commonjs --prefix . -ESLINT = node_modules/.bin/eslint --report-unused-disable-directives -ISTANBUL = node_modules/.bin/istanbul -NPM = npm -REMARK = node_modules/.bin/remark --frail --no-stdout -REMEMBER_BOWER = node_modules/.bin/remember-bower -TRANSCRIBE = node_modules/.bin/transcribe -XYZ = node_modules/.bin/xyz --repo git@github.com:sanctuary-js/sanctuary-int.git --script scripts/prepublish - - -.PHONY: all -all: LICENSE README.md - -.PHONY: LICENSE -LICENSE: - cp -- '$@' '$@.orig' - sed 's/Copyright (c) .* Sanctuary/Copyright (c) $(shell git log --date=short --pretty=format:%ad | sort -r | head -n 1 | cut -d - -f 1) Sanctuary/' '$@.orig' >'$@' - rm -- '$@.orig' - -README.md: index.js - $(TRANSCRIBE) \ - --heading-level 4 \ - --url 'https://github.com/sanctuary-js/sanctuary-int/blob/v$(VERSION)/{filename}#L{line}' \ - -- $^ \ - | sed 's/

\(.*\)\1#\2/

\3\1#\2/' >'$@' - - -.PHONY: lint -lint: - $(ESLINT) -- index.js test - $(REMEMBER_BOWER) $(shell pwd) - rm -f README.md - VERSION=0.0.0 make README.md - $(REMARK) \ - --use remark-lint-no-undefined-references \ - --use remark-lint-no-unused-definitions \ - -- README.md - git checkout README.md - - -.PHONY: release-major release-minor release-patch -release-major release-minor release-patch: - @$(XYZ) --increment $(@:release-%=%) - - -.PHONY: setup -setup: - $(NPM) install - - -.PHONY: test -test: - $(ISTANBUL) cover node_modules/.bin/_mocha -- --recursive - $(ISTANBUL) check-coverage --branches 100 - $(DOCTEST) -- index.js diff --git a/package.json b/package.json index ad913f8..2626262 100644 --- a/package.json +++ b/package.json @@ -8,25 +8,18 @@ "url": "git://github.com/sanctuary-js/sanctuary-int.git" }, "scripts": { - "test": "make lint test" + "doctest": "sanctuary-doctest", + "lint": "sanctuary-lint", + "release": "sanctuary-release", + "test": "npm run lint && sanctuary-test && npm run doctest" }, "dependencies": { "sanctuary-def": "0.13.x" }, "devDependencies": { - "doctest": "0.12.x", - "eslint": "4.9.x", - "istanbul": "0.4.x", "jsverify": "0.7.x", - "mocha": "3.x.x", - "remark-cli": "3.x.x", - "remark-lint-no-undefined-references": "1.x.x", - "remark-lint-no-unused-definitions": "1.x.x", - "remember-bower": "0.1.x", - "sanctuary-style": "1.0.x", - "sanctuary-type-classes": "7.1.x", - "transcribe": "0.5.x", - "xyz": "2.0.x" + "sanctuary-scripts": "1.0.x", + "sanctuary-type-classes": "7.1.x" }, "files": [ "/LICENSE", diff --git a/scripts/prepublish b/scripts/prepublish deleted file mode 100755 index 567df7d..0000000 --- a/scripts/prepublish +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e - -rm -f README.md -make -git add LICENSE README.md