Skip to content

develop #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jan 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ad572fa
chore(deps): update dependency @types/jest to v29.2.5
renovate[bot] Dec 31, 2022
7965b7a
Merge pull request #289 from devmehq/renovate/all-minor-patch
meabed Dec 31, 2022
9d87903
chore(deps): update dependency eslint to v8.31.0
renovate[bot] Dec 31, 2022
de349cb
Merge pull request #290 from devmehq/renovate-all-minor-patch
meabed Dec 31, 2022
b111306
chore(deps): update all non-major dependencies
renovate[bot] Jan 2, 2023
c2b8365
Merge pull request #291 from devmehq/renovate-all-minor-patch
meabed Jan 2, 2023
8af87c9
chore(deps): update dependency @rollup/plugin-typescript to v11
renovate[bot] Jan 6, 2023
b519b31
Merge pull request #292 from devmehq/renovate-rollup-plugin-typescrip…
meabed Jan 6, 2023
529c2fe
chore(deps): bump json5 from 2.1.3 to 2.2.3
dependabot[bot] Jan 6, 2023
d9c5c7a
chore(deps): update dependency prettier to v2.8.2
renovate[bot] Jan 7, 2023
59fe7f6
Merge pull request #294 from devmehq/renovate-all-minor-patch
meabed Jan 7, 2023
8e73534
Merge pull request #293 from devmehq/dependabot/npm_and_yarn/json5-2.2.3
meabed Jan 9, 2023
070603b
chore(deps): update all non-major dependencies to v5.48.1
renovate[bot] Jan 9, 2023
e65fd17
Merge pull request #295 from devmehq/renovate-all-minor-patch
meabed Jan 9, 2023
1bce47d
chore(deps): update dependency ts-jest to v29.0.4
renovate[bot] Jan 11, 2023
5bff954
Merge pull request #296 from devmehq/renovate-all-minor-patch
meabed Jan 11, 2023
577d6f0
chore(deps): update dependency rollup to v3.10.0
renovate[bot] Jan 12, 2023
d646165
Merge pull request #297 from devmehq/renovate-all-minor-patch
meabed Jan 12, 2023
7449ec5
chore(deps): update dependency ts-jest to v29.0.5
renovate[bot] Jan 13, 2023
36aae52
Merge pull request #298 from devmehq/renovate-all-minor-patch
meabed Jan 13, 2023
4e20576
chore(deps): update dependency prettier to v2.8.3
renovate[bot] Jan 14, 2023
e9c9828
Merge pull request #299 from devmehq/renovate-all-minor-patch
meabed Jan 14, 2023
ec2888b
chore(deps): update dependency eslint to v8.32.0
renovate[bot] Jan 15, 2023
f727993
Merge pull request #300 from devmehq/renovate-all-minor-patch
meabed Jan 15, 2023
ee7aa70
chore(deps): update all non-major dependencies to v5.48.2
renovate[bot] Jan 16, 2023
66c5c40
Merge pull request #301 from devmehq/renovate-all-minor-patch
meabed Jan 16, 2023
86ebd5e
chore: update release
meabed Jan 18, 2023
49045e2
chore: update release
meabed Jan 18, 2023
d6f7e85
chore: update release
meabed Jan 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -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"]
}
]
}
17 changes: 12 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- 'package.json'
- 'yarn.lock'
- 'release.config.js'
- '.github/workflows/ci.yml'
branches:
- '*'
- '**'
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
15 changes: 10 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
2 changes: 2 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/.bin/pretty-quick
node_modules/.bin/lint-staged
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
58 changes: 23 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"
}
}
Loading