Merge pull request #846 from spotify/release

Release 12.0.0

Author: spotify-kai

.github/workflows/publish-develop.yml

@@ -20,9 +20,9 @@ jobs:
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16.9
       - name: yarn install
-        run: yarn
+        run: yarn install --frozen-lockfile
       - name: yarn build
         run: yarn build
       - name: lint

.github/workflows/publish-release.yml

@@ -20,9 +20,9 @@ jobs:
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16.9
       - name: yarn install
-        run: yarn
+        run: yarn install --frozen-lockfile
       - name: yarn build
         run: yarn build
       - name: lint

.github/workflows/publish.yml

@@ -3,29 +3,35 @@ name: Publish
 on:
   push:
     branches:
-    - master
+      - master
 
 jobs:
   publish:
     name: Publish
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
-      with:
-        node-version: 14
-    - name: yarn install
-      run: yarn
-    - name: yarn build
-      run: yarn build
-    - name: lint
-      run: yarn lint
-    - name: test
-      run: yarn test
-    - name: release
-      run: yarn release
-      env:
-        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        GH_USERNAME: ${{ secrets.GH_USERNAME }}
+      - uses: actions/checkout@v2
+        with:
+          # pulls all commits (needed for lerna / semantic release to correctly version)
+          fetch-depth: '0'
+      # pulls all tags (needed for lerna / semantic release to correctly version)
+      - name: fetch tags
+        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 16.9
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+      - name: yarn build
+        run: yarn build
+      - name: lint
+        run: yarn lint
+      - name: test
+        run: yarn test
+      - name: release
+        run: yarn release
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_USERNAME: ${{ secrets.GH_USERNAME }}

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [14.17, 16.9]
 
     steps:
       - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: yarn install
-        run: yarn
+        run: yarn install --frozen-lockfile
       - name: yarn build
         run: yarn build
       - name: lint

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn web-scripts commitmsg --edit="$1"

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn web-scripts precommit --no-tests --no-typecheck

.nvmrc

@@ -0,0 +1 @@
+lts/*

README.md

@@ -22,8 +22,8 @@ It is intended to be used within a project as a series of npm scripts.
 ```json
 {
   "devDependencies": {
-    "@spotify/web-scripts": "^11.0.0",
-    "husky": "^4.3.8"
+    "@spotify/web-scripts": "^12.0.0",
+    "husky": "^7.0.0"
   },
   "scripts": {
     "build": "web-scripts build",
@@ -32,17 +32,24 @@ It is intended to be used within a project as a series of npm scripts.
     "lint": "web-scripts lint",
     "commit": "web-scripts commit",
     "release": "web-scripts release",
-    "prepare": "web-scripts audit"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "web-scripts precommit",
-      "commit-msg": "web-scripts commitmsg"
-    }
+    "prepare": "husky install && web-scripts audit"
   }
 }
 ```
 
+Additionally, you'll need to run the following two commands to create the commit and pre-commit hooks:
+
+```shell
+npx husky set .husky/pre-commit 'yarn web-scripts precommit --no-tests --no-typecheck'
+
+npx husky set .husky/commit-msg 'yarn web-scripts commitmsg --edit="$1"' && \
+  sed 's/edit=""/edit="$1"/g' .husky/commit-msg | tee .husky/commit-msg
+```
+
+NOTE: the second command uses sed to hack around [this bug in husky](https://github.com/typicode/husky/issues/1019) that removes `$1`.
+
+You'll want to add and commit the `.husky` directory.
+
 View the [full CLI documentation](./packages/web-scripts) for more details on how to get started.
 
 ### Create a new library

package.json

@@ -14,22 +14,17 @@
     "format": "web-scripts format",
     "commit": "web-scripts commit",
     "bootstrap": "lerna bootstrap --use-workspaces",
-    "release": "./release.sh"
+    "release": "./release.sh",
+    "prepare": "husky install"
   },
   "workspaces": [
     "packages/*"
   ],
   "devDependencies": {
     "@spotify/eslint-config-oss": "^1.0.0",
-    "@spotify/eslint-plugin": "^10.0.0",
-    "husky": "^4.0.0",
+    "@spotify/eslint-plugin": "^11.0.0",
+    "husky": "^7.0.0",
     "lerna": "^4.0.0",
     "typescript": "^4.2.3"
-  },
-  "husky": {
-    "hooks": {
-      "commit-msg": "web-scripts commitmsg",
-      "pre-commit": "web-scripts precommit --no-tests --no-typecheck"
-    }
   }
 }

packages/create-web-scripts-library/package.json

@@ -42,13 +42,13 @@
   },
   "devDependencies": {
     "@spotify/web-scripts": "^11.0.0",
-    "@types/fs-extra": "^9.0.1",
+    "@types/fs-extra": "^9.0.13",
     "tempy": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.17.0"
   }
 }