From 6125f6c8a39b3896fa7d4b402ca0a1a7c06ef73d Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Fri, 2 Apr 2021 08:47:22 -0400 Subject: [PATCH 1/2] Remove bundler install tasks from NPM prepare script **Why**: Required for interoperability with Federalist pending upcoming platform changes. --- Makefile | 6 ------ README.md | 3 ++- package.json | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 202a7b0a..98468842 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,6 @@ ifdef SITE_PREFIX OUTPUT_DIR = ./_site endif -install-jekyll: install-bundler - bundle check || bundle install - -install-bundler: - gem list -i bundler || gem install bundler - start: start-docs start-assets start-docs: diff --git a/README.md b/README.md index b61e8ac8..15745bf1 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,11 @@ The following dependencies are required to build the documentation and assets wi - [Ruby](.ruby-version) - [Node.js](.nvmrc) -After satisfying the above language dependencies and cloning this repository, install package dependencies with `npm`: +After satisfying the above language dependencies and cloning this repository, install package dependencies: ``` npm install +bundle install ``` In development, build the documentation site with assets, watch source files for changes, and serve the compiled site at [localhost:4000](http://localhost:4000) by running: diff --git a/package.json b/package.json index 77038d31..fd0a386f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "test-jest": "make test-runner-jest", "build": "make build", "federalist": "npm install && make build-assets", - "prepare": "make install-jekyll", "prepublishOnly": "make lint && make clean && make build-assets build-package" }, "files": [ From 161d46463350671a3e02769b57274d22bb5a93c5 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Fri, 2 Apr 2021 12:42:10 -0400 Subject: [PATCH 2/2] Remove npm install from Federalist script **Why**: Previously needed because Federalist would only install dependencies, and we rely on devDependencies for the site build. This is changing in an upcoming Federalist release where all dependencies will be installed. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd0a386f..203d2e69 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "test-pa11y": "make test-runner-pa11y", "test-jest": "make test-runner-jest", "build": "make build", - "federalist": "npm install && make build-assets", + "federalist": "make build-assets", "prepublishOnly": "make lint && make clean && make build-assets build-package" }, "files": [