Skip to content

Commit 27aec11

Browse files
Merge pull request #3 from blwatkins/main
Template Unification
2 parents a7f6536 + fdf9ae6 commit 27aec11

18 files changed

+1520
-1736
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ updates:
5050
directory: "/"
5151
schedule:
5252
interval: monthly
53-
target-branch: "development-main"
53+
target-branch: "main"
5454
commit-message:
5555
prefix: "dependabot github-action update"
5656
include: "scope"

.github/workflows/codeql.yml

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
name: "CodeQL"
88

99
on:
10+
workflow_dispatch:
1011
push:
1112
branches:
1213
- "main"
1314
pull_request:
1415
branches:
1516
- "main"
17+
schedule:
18+
- cron: '0 0 1 * *'
1619

1720
jobs:
1821
analyze:
@@ -39,38 +42,38 @@ jobs:
3942
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
4043

4144
steps:
42-
- name: Checkout repository
43-
uses: actions/checkout@v4
45+
- name: Checkout repository
46+
uses: actions/checkout@v4
4447

45-
# Initializes the CodeQL tools for scanning.
46-
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v3
48-
with:
49-
languages: ${{ matrix.language }}
50-
# If you wish to specify custom queries, you can do so here or in a config file.
51-
# By default, queries listed here will override any specified in a config file.
52-
# Prefix the list here with "+" to use these queries and those in the config file.
48+
# Initializes the CodeQL tools for scanning.
49+
- name: Initialize CodeQL
50+
uses: github/codeql-action/init@v3
51+
with:
52+
languages: ${{ matrix.language }}
53+
# If you wish to specify custom queries, you can do so here or in a config file.
54+
# By default, queries listed here will override any specified in a config file.
55+
# Prefix the list here with "+" to use these queries and those in the config file.
5356

54-
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
55-
# queries: security-extended,security-and-quality
57+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
58+
# queries: security-extended,security-and-quality
5659

5760

58-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
59-
# If this step fails, then you should remove it and run the build manually (see below)
60-
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v3
61+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
62+
# If this step fails, then you should remove it and run the build manually (see below)
63+
- name: Autobuild
64+
uses: github/codeql-action/autobuild@v3
6265

63-
# ℹ️ Command-line programs to run using the OS shell.
64-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
66+
# ℹ️ Command-line programs to run using the OS shell.
67+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6568

66-
# If the Autobuild fails above, remove it and uncomment the following three lines.
67-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
69+
# If the Autobuild fails above, remove it and uncomment the following three lines.
70+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
6871

69-
# - run: |
70-
# echo "Run, Build Application using script"
71-
# ./location_of_script_within_repo/buildscript.sh
72+
# - run: |
73+
# echo "Run, Build Application using script"
74+
# ./location_of_script_within_repo/buildscript.sh
7275

73-
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v3
75-
with:
76-
category: "/language:${{matrix.language}}"
76+
- name: Perform CodeQL Analysis
77+
uses: github/codeql-action/analyze@v3
78+
with:
79+
category: "/language:${{matrix.language}}"

.github/workflows/node-js.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
22
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
33

4-
name: "Node.js Build"
4+
name: Node.js Build
55

66
on:
7+
workflow_dispatch:
78
push:
89
branches:
910
- "main"
@@ -29,6 +30,7 @@ jobs:
2930
node-version: ${{ matrix.node-version }}
3031
cache: 'npm'
3132
- run: npm ci
32-
- run: npm run lint
33-
- run: npm run build
34-
- run: npm run prod
33+
- run: npm run lint:js
34+
- run: npm run lint:ts
35+
- run: npm run build:dev
36+
- run: npm run build:prod

.gitignore

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
*.DS_Store
22

3-
# WebStorm
4-
.idea/
5-
6-
# npm
3+
# node and npm
74
node_modules/
85

9-
# Webpack
6+
# bundling, testing, and coverage output
107
out/
11-
dist/
8+
9+
# WebStorm and JetBrains IDEs
10+
.idea/

.node-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v22.12.0

0 commit comments

Comments
 (0)