Merge pull request #302 from devmehq/develop

develop

Author: meabed

.github/renovate.json

@@ -1,37 +1,21 @@
 {
-  "extends": [
-    "config:base"
-  ],
+  "extends": ["config:base"],
   "branchPrefix": "renovate-",
   "baseBranches": ["develop"],
   "assigneesFromCodeOwners": true,
   "packageRules": [
     {
-      "matchPackagePatterns": [
-        "*"
-      ],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
+      "matchPackagePatterns": ["*"],
+      "matchUpdateTypes": ["minor", "patch"],
       "groupName": "all non-major dependencies",
       "groupSlug": "all-minor-patch",
       "automerge": true,
-      "labels": [
-        "dependencies"
-      ]
+      "labels": ["dependencies"]
     },
     {
-      "matchPackagePatterns": [
-        "*"
-      ],
-      "matchUpdateTypes": [
-        "major"
-      ],
-      "labels": [
-        "dependencies",
-        "breaking"
-      ]
+      "matchPackagePatterns": ["*"],
+      "matchUpdateTypes": ["major"],
+      "labels": ["dependencies", "breaking"]
     }
   ]
 }

.github/workflows/ci.yml

@@ -9,6 +9,7 @@ on:
       - 'package.json'
       - 'yarn.lock'
       - 'release.config.js'
+      - '.github/workflows/ci.yml'
     branches:
       - '*'
       - '**'
@@ -24,6 +25,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
+    permissions:
+      packages: write
+      contents: write
+
     steps:
       - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
       - uses: styfle/cancel-workflow-action@0.11.0
@@ -36,6 +41,10 @@ jobs:
           fetch-depth: 30
 
       - uses: FranzDiebold/github-env-vars-action@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 19
 
       - name: Yarn
         run: yarn install --frozen-lockfile
@@ -44,10 +53,8 @@ jobs:
         run: |
           yarn test
 
-      - name: Release Prep
-        run: |
-          npm i -g semantic-release @semantic-release/git @semantic-release/github conventional-changelog-conventionalcommits
-
       - name: Release
+        if: github.ref == 'refs/heads/develop'
         run: |
-          semantic-release --no-ci --debug
+          npm i -g semantic-release @semantic-release/git @semantic-release/github conventional-changelog-conventionalcommits
+          npx semantic-release --no-ci --debug

.github/workflows/release.yml

@@ -19,6 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
+    permissions:
+      packages: write
+      contents: write
+
     steps:
       - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
       - uses: styfle/cancel-workflow-action@0.11.0
@@ -31,6 +35,10 @@ jobs:
           fetch-depth: 30
 
       - uses: FranzDiebold/github-env-vars-action@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 19
 
       - name: Yarn
         run: yarn install --frozen-lockfile
@@ -39,10 +47,7 @@ jobs:
         run: |
           yarn test
 
-      - name: Release Prep
-        run: |
-          npm i -g semantic-release @semantic-release/git @semantic-release/github conventional-changelog-conventionalcommits
-
       - name: Release
         run: |
-          semantic-release --no-ci --debug
+          npm i -g semantic-release @semantic-release/git @semantic-release/github conventional-changelog-conventionalcommits
+          npx semantic-release --no-ci --debug

.husky/pre-commit

@@ -0,0 +1,2 @@
+node_modules/.bin/pretty-quick
+node_modules/.bin/lint-staged

CHANGELOG.md

@@ -1,20 +1,24 @@
 # Changelog
 
 ### [1.0.8](https://github.com/devme/react-qr-code/compare/v1.0.7...v1.0.8) (2022-12-28)
+
 - Fix entry points in package.json
 - Update docs
 
 ### [1.0.7](https://github.com/devme/react-qr-code/compare/v1.0.6...v1.0.7) (2022-12-28)
+
 - Simplify build process
 - Move the bundle umd only
 - Update dependencies
 
 ### [1.0.6](https://github.com/devme/react-qr-code/compare/v1.0.5...v1.0.6) (2022-01-09)
+
 - Remove qr.js as dependency
 - Migrate qr.js to local typescript implementation
 - Remove source maps from production build
 - Minor code enhancements
 
 ### [1.0.5](https://github.com/devme/react-qr-code/compare/v1.0.3...v1.0.5) (2022-01-01)
+
 - Rewrite the codebase
 - Improve readme

LICENSE.md

@@ -1,6 +1,6 @@
 [The MIT License](https://tldrlegal.com/l/mit)
 
-Copyright (c) 2021 <mo.meabed@gmail.com>
+Copyright (c) 2023 <support@dev.me>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package.json

@@ -17,19 +17,19 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/devmehq/react-qr-code.git"
+    "url": "https://github.com/devmehq/react-qr-code.git"
   },
   "license": "MIT",
   "author": {
-    "name": "Mohamed Meabed",
-    "email": "mo@meabed.com",
-    "url": "https://meabed.com"
+    "name": "DEV.ME Team",
+    "email": "support@dev.me",
+    "url": "https://devme.com"
   },
   "maintainers": [
     {
-      "name": "Mohamed Meabed",
-      "email": "mo@meabed.com",
-      "url": "https://meabed.com"
+      "name": "DEV.ME Team",
+      "email": "support@dev.me",
+      "url": "https://devme.com"
     }
   ],
   "sideEffects": false,
@@ -43,55 +43,43 @@
     "build": "rollup -c rollup.config.mjs",
     "build:prod": "NODE_ENV=production rollup -c rollup.config.mjs",
     "lint-js": "eslint src/**/*.ts",
+    "prepare": "yarn husky install",
     "prepublishOnly": "rm -rf dist/* && NODE_ENV=production rollup -c rollup.config.mjs",
     "prettier": "prettier --write '**/*.{ts,tsx,css,scss}'",
-    "test": "echo \"Error: no test specified\" && exit 0",
+    "test": "echo \"Error: no test specified\"",
     "test-watch": "jest --watch"
   },
   "lint-staged": {
-    "**/*.{ts,tsx,js,jsx,css,scss,sass,less,md}": [
-      "prettier --write",
-      "git add"
-    ],
-    "src/**/*.{ts,tsx}": [
-      "npm run lint:fix",
-      "git add"
-    ]
-  },
-  "config": {
-    "commitizen": {
-      "path": "cz-conventional-changelog"
-    }
+    "src/*.{ts,tsx,js,jsx}": "prettier --write",
+    "__tests__/*.{ts,tsx,js,jsx}": "prettier --write"
   },
   "devDependencies": {
     "@ianvs/prettier-plugin-sort-imports": "3.7.1",
     "@rollup/plugin-commonjs": "24.0.0",
     "@rollup/plugin-node-resolve": "15.0.1",
     "@rollup/plugin-replace": "5.0.2",
-    "@rollup/plugin-typescript": "10.0.1",
+    "@rollup/plugin-typescript": "11.0.0",
     "@types/jasmine": "4.3.1",
-    "@types/jest": "29.2.4",
+    "@types/jest": "29.2.5",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.10",
-    "@typescript-eslint/eslint-plugin": "5.47.1",
-    "@typescript-eslint/parser": "5.47.1",
-    "eslint": "8.30.0",
-    "eslint-config-prettier": "8.5.0",
+    "@typescript-eslint/eslint-plugin": "5.48.2",
+    "@typescript-eslint/parser": "5.48.2",
+    "eslint": "8.32.0",
+    "eslint-config-prettier": "8.6.0",
+    "husky": "8.0.3",
     "jest": "29.3.1",
-    "prettier": "2.8.1",
-    "rollup": "3.9.0",
+    "lint-staged": "13.1.0",
+    "prettier": "2.8.3",
+    "pretty-quick": "3.1.3",
+    "rollup": "3.10.0",
     "rollup-plugin-uglify": "6.0.4",
-    "ts-jest": "29.0.3",
+    "ts-jest": "29.0.5",
     "tslib": "2.4.1",
     "typescript": "4.9.4"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
     "react-dom": ">=17.0.2"
-  },
-  "engines": {
-    "node": ">=8.5",
-    "npm": ">=6.0",
-    "yarn": "^1.0"
   }
 }