Skip to content

Commit cc70d9e

Browse files
committed
Merge branch 'develop'
2 parents 035c4ec + e9f9f26 commit cc70d9e

File tree

5 files changed

+421
-334
lines changed

5 files changed

+421
-334
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-18.04
1717
strategy:
1818
matrix:
19-
node-version: [12.x, 13.x, 14.x]
19+
node-version: [12.x, 14.x]
2020
env:
2121
HUSKY: 0
2222
steps:

docs/publish.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ yarn build
2222
npm publish
2323

2424
# push code and trigger github release creation
25-
git push
25+
git push --follow-tags
2626
```
2727

2828
## Version 2
@@ -56,5 +56,18 @@ yarn build
5656
npm publish
5757

5858
# push code and trigger github release creation
59+
git push --follow-tags
60+
61+
# merge change logs back to develop
62+
git checkout develop
63+
git merge --no-ff master
5964
git push
6065
```
66+
67+
## Pointing distribution tags `latest` to a specific version
68+
Since npm automatically tag newest published version with distribution tags `latest`, it might be end up in some scenerio where a smaller semver is being taged as `latest`. To point a specific version of package back to `latest`, run the command:
69+
70+
```bash
71+
# Point the distribution tags `latest` to a specific version (OTP needed)
72+
npm dist-tag add html-inline-script-webpack-plugin@<version> latest
73+
```

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
"eslint-config-airbnb-base": "^14.2.0",
4545
"eslint-plugin-import": "^2.22.0",
4646
"eslint-plugin-jest": "^24.1.5",
47-
"husky": "^6.0.0",
47+
"husky": "^7.0.0",
4848
"install-peers-cli": "^2.2.0",
4949
"jest": "^26.6.3",
50-
"lint-staged": "^10.2.11",
50+
"lint-staged": "^11.0.0",
5151
"pinst": "^2.1.6",
5252
"prettier": "^2.0.5",
5353
"ts-jest": "^26.5.3",

src/HtmlInlineScriptPlugin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class HtmlInlineScriptPlugin implements WebpackPluginInstance {
3434

3535
const asset = assets[scriptName];
3636

37-
if (!tag) {
37+
if (!asset) {
3838
return tag;
3939
}
4040

0 commit comments

Comments
 (0)