Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: radubarbos/zxing-js-library
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: zxing-js/library
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing 620 changed files with 10,142 additions and 4,416 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# These are supported funding model platforms

open_collective: zxing-js
custom: ['https://picpay.me/odahcam', 'https://apoia.se/zxing']

44 changes: 44 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages

name: Continuous Integration

on:
# Trigger the workflow on push or pull request,
# but only for the main branch
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v1
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Build the application
run: yarn build

- name: E2E Test the application
run: yarn test
54 changes: 0 additions & 54 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

46 changes: 5 additions & 41 deletions .github/workflows/npmpublish.yml
Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 12
node-version: 18

- name: Get yarn cache directory path
id: yarn-cache-dir-path
@@ -58,47 +58,11 @@ jobs:
with:
name: pack-artifact

- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 12
node-version: 18
registry-url: https://registry.npmjs.org/

- run: npm publish ./pack-artifact/package.tgz
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

publish-gpr:
needs: build
runs-on: ubuntu-latest
steps:

- name: Download build artifacts
uses: actions/download-artifact@v1
with:
name: pack-artifact

- name: Install JQ for JSON handling
run: sudo apt-get install jq

- name: Get repository name
run: echo ::set-env name=REPOSITORY_NAME::$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
shell: bash

- name: Rename NPM package
run: |
ORG_NAME="zxing-js"
PACKAGE_NAME="@$ORG_NAME/$REPOSITORY_NAME"
tar -xzf ./pack-artifact/package.tgz
cd ./package
mv package.json temp.json
jq -r --arg NAME $PACKAGE_NAME '.name |= $NAME' temp.json > package.json
rm temp.json
- uses: actions/setup-node@v1
with:
node-version: 12
registry-url: https://npm.pkg.github.com/

- run: npm publish ./pack-artifact/package.tgz
env:
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
5 changes: 2 additions & 3 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
name: Mark stale issues and pull requests

on:
schedule:
- cron: "0 * * * *"
workflow_dispatch: {}

jobs:
stale:

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v1
with:
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

43 changes: 35 additions & 8 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -54,18 +54,45 @@
{
"type": "node",
"request": "launch",
"name": "EAN 13 Tests",
"program": "${workspaceFolder}/node_modules/mocha-webpack/bin/mocha-webpack",
"name": "Code 93 Tests - ts-node",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"env": {
"TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.test.json"
},
"args": [
"./src/test/core/oned/Ean13*.spec.ts",
"--require",
"ts-node/register",
"--require",
"tsconfig-paths/register",
"-u",
"tdd",
"--timeout",
"999999",
"--colors",
"--recursive",
"./src/test/core/oned/Code93*.spec.ts"
],
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "node",
"request": "launch",
"name": "EAN 13 Tests - ts-node",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": [
"--require",
"ts-node/register",
"--require",
"tsconfig-paths/register",
"-u",
"tdd",
"--timeout",
"999999",
"--webpack-env",
"dbg",
"--webpack-config",
"webpack.config.test.js"
]
"--colors",
"--recursive",
"./src/test/core/oned/Ean13*.spec.ts"
],
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "node",
Loading