resolve conflicts

AdguardTeam · May 25, 2023 · 6c61a03 · 6c61a03
2 parents d220a6f + 3f6a7ae
commit 6c61a03
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- ability for `prevent-element-src-loading` scriptlet to prevent inline `onerror` and match `link` tag [#276](https://github.com/AdguardTeam/Scriptlets/issues/276)
+- ability for `prevent-element-src-loading` scriptlet to prevent inline `onerror`
+  and match `link` tag [#276](https://github.com/AdguardTeam/Scriptlets/issues/276)
 - new special value modifiers for `set-constant` [#316](https://github.com/AdguardTeam/Scriptlets/issues/316)
 
 ### Changed

diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml
@@ -33,15 +33,19 @@ Build:
 
             yarn install
 
+            # run tests
+            yarn test
+
+            # build dist
+            yarn build
+
             # build docs
             yarn wiki:build-docs
             node ./scripts/build-compatibility-table.js
+
             # lint code and docs
             yarn lint
 
-            yarn test
-            yarn build
-
             rm -rf node_modules
   artifacts:
     - name: scriptlets.corelibs.json

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
         "browserstack": "babel-node scripts/build-tests.js && node browserstack.js",
         "gui-test": "babel-node scripts/build-tests.js && open http://localhost:8585 && node ./tests/server.js",
         "jest": "jest trusted-set-cookie-reload.spec.js",
-        "lint": "eslint --cache . && markdownlint .",
+        "lint": "eslint --cache . && yarn lint:md",
         "lint:md": "markdownlint .",
         "lint-staged": "lint-staged",
         "prepare": "husky install",