Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to angular 9 #509

Merged
merged 26 commits into from
Mar 6, 2020
Merged

Update to angular 9 #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
78e0d4c
Update Angular to 8.2.3 before updating to 9
DanielHabenicht Mar 3, 2020
051f559
Fresh npm install
DanielHabenicht Mar 3, 2020
a18fdc6
Update to Angular 9!
DanielHabenicht Mar 3, 2020
b60f8b3
Update Angular Material to 9
DanielHabenicht Mar 3, 2020
d0df7df
Migrate Localization to
DanielHabenicht Mar 3, 2020
6b0d16c
Update Dependencies and remove previously packages needed for upgrade
DanielHabenicht Mar 3, 2020
6ca8487
Migrate ngxs state classes
DanielHabenicht Mar 3, 2020
44073c2
Migrating localization
DanielHabenicht Mar 3, 2020
ae7b6f0
Update build
DanielHabenicht Mar 3, 2020
8aff640
update node version
DanielHabenicht Mar 4, 2020
ace4a25
update node version
DanielHabenicht Mar 4, 2020
bf16d3e
update node version
DanielHabenicht Mar 4, 2020
f2598a3
trans(localize): move configuration
DanielHabenicht Mar 4, 2020
33eecb9
update translation generation
DanielHabenicht Mar 4, 2020
cdd00c6
update Angular.json config to newest format
DanielHabenicht Mar 4, 2020
ba82bf5
update build
DanielHabenicht Mar 5, 2020
a0e4712
Update multi lang tool chain and fix bugs
DanielHabenicht Mar 5, 2020
d589a31
fix build
DanielHabenicht Mar 5, 2020
83c5531
update docker build
DanielHabenicht Mar 5, 2020
b155064
fix translation file
DanielHabenicht Mar 5, 2020
875c719
update puppeteer to fix build
DanielHabenicht Mar 5, 2020
fe6def4
readd protractor.conf.js
DanielHabenicht Mar 5, 2020
f2b0293
update docs
DanielHabenicht Mar 5, 2020
d48aecb
Update TODO
DanielHabenicht Mar 5, 2020
c6d8e60
update deps
DanielHabenicht Mar 5, 2020
4113384
fix organigram auto link navigation
DanielHabenicht Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure/pipelines/Phonebook.preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- task: UseNode@1
inputs:
version: '11.x'
version: '12.x'

- script: node version.js $(image_tag) $(Build.SourceVersion) $(Build.SourceVersion)
displayName: 'Write Version Number'
Expand Down
34 changes: 6 additions & 28 deletions .azure/pipelines/pr/Phonebook.Frontend.pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- task: UseNode@1
inputs:
version: '11.x'
version: '12.x'

- task: Npm@1
inputs:
Expand All @@ -37,7 +37,7 @@ jobs:
steps:
- task: UseNode@1
inputs:
version: '11.x'
version: '12.x'

- task: Npm@1
inputs:
Expand All @@ -52,14 +52,14 @@ jobs:
workingDir: 'Phonebook.Frontend/'
customCommand: 'run test'

- job: build_de
displayName: Build (de)
- job: build
displayName: Build
pool:
vmImage: 'Ubuntu-16.04'
steps:
- task: UseNode@1
inputs:
version: '11.x'
version: '12.x'

- task: Npm@1
inputs:
Expand All @@ -72,26 +72,4 @@ jobs:
inputs:
command: 'custom'
workingDir: 'Phonebook.Frontend/'
customCommand: 'run build:de'

- job: build_en
displayName: Build (en)
pool:
vmImage: 'Ubuntu-16.04'
steps:
- task: UseNode@1
inputs:
version: '11.x'

- task: Npm@1
inputs:
command: 'custom'
customCommand: 'ci'
workingDir: 'Phonebook.Frontend/'

- task: Npm@1
displayName: 'build app'
inputs:
command: 'custom'
workingDir: 'Phonebook.Frontend/'
customCommand: 'run build:en'
customCommand: 'run build:prod'
2 changes: 2 additions & 0 deletions Phonebook.Frontend/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
!protractor.conf.js
!proxy.conf.json
!tsconfig.json
!tsconfig.app.json
!tsconfig.spec.json
!tslint.json
!nginx
!substitute_variables.sh
Expand Down
4 changes: 2 additions & 2 deletions Phonebook.Frontend/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ key.pem
cert.pem

# e2e
/e2e/*.js
/e2e/*.map
/e2e/src/*.js
/e2e/src/*.map

# System Files
.DS_Store
Expand Down
9 changes: 4 additions & 5 deletions Phonebook.Frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# base image
FROM node:11.15.0 as builder
FROM node:12.16 as builder

# set working directory
RUN mkdir /usr/local/app
Expand All @@ -12,9 +12,8 @@ RUN npm ci
# Because: https://stackoverflow.com/questions/37715224/copy-multiple-directories-with-one-command
COPY ./src/ ./src/

COPY ["angular.json", "tsconfig.json", "tslint.json", "./"]
RUN npm run build:de
RUN npm run build:en
COPY ["angular.json", "tsconfig.json", "tsconfig.app.json", "tsconfig.spec.json", "tslint.json", "./"]
RUN npm run build



Expand Down Expand Up @@ -43,4 +42,4 @@ COPY --from=builder /usr/local/app/dist /usr/share/nginx/html
COPY ./opensearch.xml /usr/share/nginx/html/opensearch.xml

ENTRYPOINT ["./substitute_variables.sh", "/usr/share/nginx/html", "./substitute_variables.sh", "/etc/nginx"]
CMD ["nginx"]
CMD ["nginx"]
Loading