Skip to content
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

Bump deps and use npm7 #955

Merged
merged 2 commits into from
Jun 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ jobs:
matrix:
# run multiple copies of the current job in parallel
containers: [1, 2, 3, 4, 5]
node-version: ['12.x']
php-versions: ['7.4']

name: runner ${{ matrix.containers }}

Expand All @@ -36,10 +34,13 @@ jobs:
cd cypress
docker-compose up -d
- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v1
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: Install dependencies & build app
run: |
Expand Down
32 changes: 15 additions & 17 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
php-versions: ['7.3', '7.4']
php-versions: ['7.3', '7.4', '8.0']

name: php${{ matrix.php-versions }}
steps:
Expand Down Expand Up @@ -55,18 +55,17 @@ jobs:
node:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: ['12.x']

name: eslint node${{ matrix.node-version }}
name: eslint node
steps:
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v1
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: Install dependencies
run: npm ci
Expand All @@ -77,18 +76,17 @@ jobs:
stylelint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: ['12.x']

name: stylelint node${{ matrix.node-version }}
name: stylelint node
steps:
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v1
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: Install dependencies
run: npm ci
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@ jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: ['12.x']

name: node${{ matrix.node-version }}
name: node
steps:
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-version }}
uses: actions/setup-node@v1
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: Install dependencies & build
run: |
Expand Down
4 changes: 2 additions & 2 deletions js/viewer-main.js

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions js/viewer-main.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ object-assign
/*!
* The buffer module from node.js, for the browser.
*
* @author Feross Aboukhadijeh <http://feross.org>
* @author Feross Aboukhadijeh <https://feross.org>
* @license MIT
*/

/*!
* Vue.js v2.6.13
* Vue.js v2.6.14
* (c) 2014-2021 Evan You
* Released under the MIT License.
*/
Expand All @@ -43,6 +43,8 @@ object-assign

/*! https://mths.be/he v1.2.0 by @mathias | MIT license */

/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
Expand Down
2 changes: 1 addition & 1 deletion js/viewer-main.js.map

Large diffs are not rendered by default.

Loading