Merge 31af84e into 503bcbc

.clean-publish

@@ -1,3 +1,5 @@
 {
-	"packageManager": "yarn"
+  "withoutPublish": true,
+  "tempDir": "package",
+  "files": ["**/*.spec.d.ts", "**/*.spec.d.ts.map"]
 }

.commitlintrc.json

@@ -0,0 +1,6 @@
+{
+  "extends": ["@commitlint/config-conventional"],
+  "rules": {
+    "body-max-line-length": [0]
+  }
+}

.czrc

@@ -0,0 +1,3 @@
+{
+  "path": "@commitlint/cz-commitlint"
+}

.eslintrc.json

@@ -19,6 +19,6 @@
     "prefer-destructuring": "off"
   },
   "ignorePatterns": [
-    "lib"
+    "dist"
   ]
 }

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
       - name: Run tests

.gitignore

@@ -3,36 +3,15 @@ logs
 *.log
 npm-debug.log*
 
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
 # Coverage directory used by tools like istanbul
 coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
 
 # Dependency directory
 node_modules
 
 # Optional npm cache directory
 .npm
 
-# Optional REPL history
-.node_repl_history
-
 # OS stuff
 ._*
 .DS_Store
@@ -41,11 +20,9 @@ node_modules
 .*cache
 
 # Compiled dist
-lib
+dist
 package
 build
 
+# Env files
 .env
-
-# Test artifacts
-test/artifacts/*

.nano-staged.json

@@ -0,0 +1,3 @@
+{
+  "*.{js,ts,tsx}": "eslint --fix"
+}

.simple-git-hooks.json

@@ -0,0 +1,5 @@
+{
+  "commit-msg": "pnpm commitlint --edit \"$1\"",
+  "pre-commit": "pnpm nano-staged",
+  "pre-push": "pnpm test"
+}

.size-limit.json

@@ -0,0 +1,10 @@
+[
+  {
+    "path": "dist/index.js",
+    "limit": "11 KB"
+  },
+  {
+    "path": "dist/cli.js",
+    "limit": "1.7 KB"
+  }
+]

examples/buildDemo.js

@@ -1,7 +1,7 @@
 const {
   getUserAgentRegExps,
   getUserAgentRegExp
-} = require('../lib')
+} = require('../dist')
 
 function renderStyles() {
   return `<style>

jest.config.json

@@ -1,24 +1,24 @@
 {
-	"testEnvironment": "node",
-	"testRegex": "/src/.*\\.spec\\.(jsx?|tsx?)$",
-	"transform": {
-		"^.+\\.(t|j)sx?$": ["@swc/jest", {
-		  "env": {
-			"targets": {
-			  "node": 12
-			}
-		  }
-		}]
-	},
-	"collectCoverage": true,
-	"collectCoverageFrom": [
-		"src/**/*.{js,jsx,ts,tsx}",
-		"!src/cli.ts",
-		"!**/*.d.ts",
-		"!**/node_modules/**"
-	],
-	"coverageReporters": [
-		"lcovonly",
-		"text"
-	]
+  "testEnvironment": "node",
+  "testRegex": "/src/.*\\.spec\\.(jsx?|tsx?)$",
+  "transform": {
+    "^.+\\.(t|j)sx?$": ["@swc/jest", {
+      "env": {
+      "targets": {
+        "node": 12
+      }
+      }
+    }]
+  },
+  "collectCoverage": true,
+  "collectCoverageFrom": [
+    "src/**/*.{js,jsx,ts,tsx}",
+    "!src/cli.ts",
+    "!**/*.d.ts",
+    "!**/node_modules/**"
+  ],
+  "coverageReporters": [
+    "lcovonly",
+    "text"
+  ]
 }

package.json

@@ -12,24 +12,31 @@
     "url": "https://github.com/browserslist/browserslist-useragent-regexp/issues"
   },
   "bin": {
-    "browserslist-useragent-regexp": "lib/cli.js"
+    "browserslist-useragent-regexp": "dist/cli.js"
   },
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "engines": {
     "node": ">=12.0.0"
   },
   "scripts": {
+    "clear:package": "del ./package",
+    "clear": "del ./package ./dist ./coverage",
+    "prepublishOnly": "run test build clear:package clean-publish",
+    "postpublish": "yarn clear:package",
     "emitDeclarations": "tsc --emitDeclarationOnly",
-    "build": "rollup -c && yarn emitDeclarations",
+    "build": "run -p [ rollup -c ] emitDeclarations",
     "lint": "eslint './*{js,ts}' './src/**/*.{js,ts}' './examples/**/*.{js,ts}'",
     "jest": "jest -c jest.config.json",
-    "checkSize": "trigen-scripts checkSize",
-    "test": "trigen-scripts test",
+    "test:size": "size-limit",
+    "test": "run -p lint jest",
     "build:demo": "node examples/buildDemo > ./docs/demo.html && cp -R examples/demojs/ docs/demojs/",
-    "build:docs": "trigen-scripts build:docs",
-    "start": "trigen-scripts start",
-    "cleanPublish": "trigen-scripts test && del 'lib/**/*.spec.*' && clean-publish"
+    "build:docs": "typedoc ./src --out ./docs --excludeExternals && touch docs/.nojekyll",
+    "commit": "cz",
+    "bumpVersion": "standard-version",
+    "createGithubRelease": "simple-github-release",
+    "release": "run bumpVersion [ git push origin master --tags ] createGithubRelease",
+    "updateGitHooks": "simple-git-hooks"
   },
   "keywords": [
     "browserslist",
@@ -38,39 +45,43 @@
   "dependencies": {
     "@types/node": "^16.9.6",
     "argue-cli": "^1.2.0",
-    "browserslist": "^4.16.3",
+    "browserslist": "^4.21.4",
     "chalk": "^4.0.0",
     "easy-table": "^1.1.1",
     "useragent": "^2.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@commitlint/cz-commitlint": "^17.1.2",
     "@rollup/plugin-node-resolve": "^15.0.0",
-    "@size-limit/preset-small-lib": "^5.0.4",
+    "@size-limit/file": "^8.1.0",
     "@swc/core": "^1.3.6",
     "@swc/helpers": "^0.4.12",
     "@swc/jest": "^0.2.23",
     "@trigen/browserslist-config": "^8.0.0-alpha.5",
     "@trigen/eslint-config": "^8.0.0-alpha.14",
-    "@trigen/scripts": "^7.3.1",
-    "@trigen/scripts-plugin-babel": "^7.3.1",
-    "@trigen/scripts-plugin-eslint": "^7.3.4",
-    "@trigen/scripts-plugin-jest": "^7.3.1",
-    "@trigen/scripts-plugin-rollup": "^7.1.0",
-    "@trigen/scripts-plugin-size-limit": "^7.3.1",
-    "@trigen/scripts-plugin-typescript": "^7.3.2",
-    "@trigen/scripts-preset-lib": "^7.3.4",
+    "@trigen/scripts": "^8.0.0-alpha.9",
+    "@types/jest": "^29.1.2",
     "browserslist-useragent": "^3.0.0",
+    "clean-publish": "^4.0.1",
+    "commitizen": "^4.2.5",
     "del-cli": "^4.0.1",
     "eslint": "^8.25.0",
+    "jest": "^29.1.2",
+    "nano-staged": "^0.8.0",
     "rollup": "^2.79.1",
     "rollup-plugin-add-shebang": "^0.3.0",
     "rollup-plugin-swc": "^0.2.1",
-    "size-limit": "^5.0.4",
+    "simple-git-hooks": "^2.8.0",
+    "simple-github-release": "^1.0.0",
+    "size-limit": "^8.1.0",
+    "standard-version": "^9.5.0",
     "typescript": "^4.1.3",
     "user-agents": "^1.0.213"
   },
   "files": [
-    "lib"
+    "dist"
   ]
 }

rollup.config.js

@@ -44,7 +44,7 @@ export default [
     plugins: [...plugins(nodeEsm.join(', ')), shebang()],
     external: _ => !_.endsWith('src/cli.ts'),
     output: {
-      file: 'lib/cli.js',
+      file: 'dist/cli.js',
       format: 'cjs',
       exports: 'named',
       sourcemap: true

src/useragentRegexp/useragentRegexp.spec.ts

@@ -33,8 +33,8 @@ function *getUserAgents() {
     for (let i = 0; i < 30; i++) {
       try {
         data = new UserAgent(({ userAgent }) => !userAgents.has(userAgent)
-						&& mobile(userAgent, i)
-						&& matchesUA(userAgent, options))
+            && mobile(userAgent, i)
+            && matchesUA(userAgent, options))
       } catch (err) {
         continue
       }