Skip to content

Commit d4626eb

Browse files
Merge branch 'stage'
2 parents 774133b + fef516b commit d4626eb

File tree

80 files changed

+15664
-17257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+15664
-17257
lines changed

.github/workflows/on-push-pr.action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/setup-node@v3
3333
name: Set NodeJS version
3434
with:
35-
node-version: 14
35+
node-version: 18
3636
- name: Install packages
3737
run: "npm ci"
3838
- name: Build source

.prettierrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.prettierrc.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
trailingComma: "es5",
3+
tabWidth: 4,
4+
printWidth: 120,
5+
semi: true,
6+
singleQuote: false,
7+
useTabs: false,
8+
bracketSpacing: true,
9+
arrowParens: "avoid",
10+
endOfLine: "auto",
11+
};

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Based on https://mherman.org/blog/dockerizing-an-angular-app/
22
# base image
3-
FROM node:14-alpine as DEV
3+
FROM node:16-alpine as DEV
44

55
# removed this for now
66
# install chrome for protractor tests

angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"assets": [
2626
"src/favicon.ico",
2727
"src/assets",
28-
{ "glob": "**/*", "input": "node_modules/monaco-editor", "output": "assets/monaco-editor" }
28+
{ "glob": "**/*", "input": "node_modules/monaco-editor", "output": "/assets/monaco/" }
2929
],
3030
"styles": [
3131
"./node_modules/animate.css/animate.min.css",

0 commit comments

Comments
 (0)