Skip to content

Commit ade1e46

Browse files
authored
Merge pull request #16 from NeoScript/upgrade_angular
Upgrade angular
2 parents 11c6d84 + ffdcabf commit ade1e46

File tree

13 files changed

+13483
-11482
lines changed

13 files changed

+13483
-11482
lines changed

.devcontainer/Dockerfile

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

.devcontainer/devcontainer.json

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/javascript-node
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
33
{
4-
"name": "Node.js",
5-
"build": {
6-
"dockerfile": "Dockerfile",
7-
// Update 'VARIANT' to pick a Node version: 18, 16, 14.
8-
// Append -bullseye or -buster to pin to an OS version.
9-
// Use -bullseye variants on local arm64/Apple Silicon.
10-
"args": { "VARIANT": "16-bullseye" }
4+
"name": "Node.js & TypeScript",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm",
7+
"features": {
8+
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
119
},
1210

13-
// Set *default* container specific settings.json values on container create.
14-
"settings": {},
15-
16-
// Add the IDs of extensions you want installed when the container is created.
17-
"extensions": [
18-
"dbaeumer.vscode-eslint",
19-
"mhutchie.git-graph",
20-
"Angular.ng-template"
21-
],
11+
// Features to add to the dev container. More info: https://containers.dev/features.
12+
// "features": {},
2213

2314
// Use 'forwardPorts' to make a list of ports inside the container available locally.
24-
// "forwardPorts": [],
15+
"forwardPorts": [4200, 8681, 7200],
2516

2617
// Use 'postCreateCommand' to run commands after the container is created.
27-
"postCreateCommand": "npm install -g @angular/cli;",
18+
// "postCreateCommand": "yarn install",
2819

29-
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
30-
"remoteUser": "node",
31-
"features": {
32-
"docker-in-docker": {
33-
"version": "latest",
34-
"moby": false,
35-
},
36-
"git": "os-provided"
37-
}
20+
// Configure tool-specific properties.
21+
// "customizations": {},
22+
23+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
24+
// "remoteUser": "root"
3825
}

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for more information:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
# https://containers.dev/guide/dependabot
6+
7+
version: 2
8+
updates:
9+
- package-ecosystem: "devcontainers"
10+
directory: "/"
11+
schedule:
12+
interval: weekly

webapp/.browserslistrc

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

webapp/angular.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
"builder": "@angular-devkit/build-angular:dev-server",
7474
"configurations": {
7575
"production": {
76-
"browserTarget": "webapp:build:production"
76+
"buildTarget": "webapp:build:production"
7777
},
7878
"development": {
79-
"browserTarget": "webapp:build:development"
79+
"buildTarget": "webapp:build:development"
8080
}
8181
},
8282
"defaultConfiguration": "development"
8383
},
8484
"extract-i18n": {
8585
"builder": "@angular-devkit/build-angular:extract-i18n",
8686
"options": {
87-
"browserTarget": "webapp:build"
87+
"buildTarget": "webapp:build"
8888
}
8989
},
9090
"test": {
@@ -109,5 +109,7 @@
109109
}
110110
}
111111
},
112-
"defaultProject": "webapp"
112+
"cli": {
113+
"analytics": false
114+
}
113115
}

0 commit comments

Comments
 (0)