Skip to content

Commit 61e5427

Browse files
committed
chore: npm audit fix, update build.yml
1 parent d5665b8 commit 61e5427

File tree

2 files changed

+20
-34
lines changed

2 files changed

+20
-34
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,18 @@
1-
name: JavaScript
1+
name: Javascript
22

3-
on:
4-
push:
5-
branches:
6-
- master
3+
on: [workflow_dispatch, push, pull_request]
74

85
jobs:
9-
build:
10-
name: JS / Build
11-
runs-on: ubuntu-latest
6+
run:
7+
uses: flarum/framework/.github/workflows/REUSABLE_frontend.yml@main
8+
with:
9+
enable_bundlewatch: false
10+
enable_prettier: true
11+
enable_typescript: false
1212

13-
steps:
14-
- name: Check out code
15-
uses: actions/checkout@v2
16-
17-
- name: Restore npm cache
18-
uses: actions/cache@v2
19-
with:
20-
path: ~/.npm
21-
key: ${{ runner.os }}-node-${{ hashFiles('js/package-lock.json') }}
22-
restore-keys: |
23-
${{ runner.os }}-node-
24-
25-
# Our action will install npm, cd into `./js`, run `npm run build` and
26-
# `npm run build-typings`, then commit and upload any changes
27-
- name: Build production JS
28-
uses: flarum/action-build@2
29-
with:
30-
github_token: ${{ secrets.GITHUB_TOKEN }}
31-
build_script: build
32-
package_manager: npm
13+
frontend_directory: ./js
14+
backend_directory: .
15+
js_package_manager: npm
16+
main_git_branch: master
17+
secrets:
18+
bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

js/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)