Skip to content

Commit

Permalink
Update Angular from v10 to v14 (center-for-threat-informed-defense#499)
Browse files Browse the repository at this point in the history
* npm v6.14

* uninstall angular-crumbs

* uninstall ngx-material-file-input

* angular v11

* angular material v11

* temp comments

* ngx-markdown v11

* change marked script

* angular v12

* angular material v12

* package/code updates

* ngx-markdown v12

* angular v13

* angular material v13

* ngx-markdown v13

* upgrade npm

* update readme

* package updates

* ngx-jdenticon v2

* angular v14

* angular material v14

* package updates

* reset mat chip input value

* upgrade ngx-material-file-input

* fix mat select height

* update dockerfile

* trim displayname

* file formatting

* sonarlint

* more package updates

* cleanup routing modules

* breadcrumb service

* update notes page

* update notes editor

* update changelog
  • Loading branch information
clemiller authored Sep 7, 2023
1 parent 9d9abfe commit b1c9a03
Show file tree
Hide file tree
Showing 95 changed files with 11,728 additions and 11,718 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14 as build
FROM node:18 AS build

# Create app directory
WORKDIR /usr/src/app
Expand All @@ -21,7 +21,7 @@ COPY ./docs ../docs
# Build the bundle
RUN npm run build-prod

FROM nginx:1.19
FROM nginx

# Set Docker labels
LABEL org.opencontainers.image.title="ATT&CK Workbench Frontend Service" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Please refer to our [Docker install instructions](docs/docker-compose.md) for in

#### Requirements

- [Node.js](https://nodejs.org/) version `14.16.1` or greater
- [Node.js](https://nodejs.org/) version 16 or greater

#### Installing dependencies
This step is necessary for cases where the app is deployed locally through `ng serve` or `ng build`. It can be skipped for installs using docker (above).
Expand Down
1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
31 changes: 11 additions & 20 deletions app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
{ "glob": "**/*", "input": "../docs", "output": "/assets/docs" },
"src/favicon.ico",
Expand All @@ -34,11 +33,17 @@
"src/style/theme.scss"
],
"scripts": [
"node_modules/marked/lib/marked.js",
"node_modules/marked/marked.min.js",
"node_modules/prismjs/prism.js",
"node_modules/prismjs/components/prism-json.min.js",
"node_modules/prismjs/components/prism-python.min.js"
]
],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
Expand All @@ -51,7 +56,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
Expand All @@ -69,7 +73,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
Expand Down Expand Up @@ -105,19 +110,6 @@
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
Expand All @@ -132,6 +124,5 @@
}
}
}
},
"defaultProject": "app"
}
}
Loading

0 comments on commit b1c9a03

Please sign in to comment.