Skip to content

Commit

Permalink
fix(perf): Update to angular 9 (#509)
Browse files Browse the repository at this point in the history
* Update Angular to 8.2.3 before updating to 9

* Fresh npm install

Also temporary installed packages for upgrade (see:angular/angular#35221 (comment))

* Update to Angular 9!

* Update Angular Material to 9

* Migrate Localization to

* Update Dependencies and remove previously packages needed for upgrade

* Migrate ngxs state classes

* Migrating localization

* Update build

* update node version

* update node version

* update node version

* trans(localize): move configuration
remove superflous test lang in xliff config

* update translation generation

* update Angular.json config to newest format
 - clean up the redundancy
 - fix build
 - fix tests

* update build

* Update multi lang tool chain and fix bugs

* fix build

* update docker build

* fix translation file

* update puppeteer to fix build

* readd protractor.conf.js

* update docs

* Update TODO

* update deps

* fix organigram auto link navigation
  • Loading branch information
DanielHabenicht authored Mar 6, 2020
1 parent 80fb7f1 commit a81b424
Show file tree
Hide file tree
Showing 71 changed files with 13,676 additions and 15,269 deletions.
2 changes: 1 addition & 1 deletion .azure/pipelines/Phonebook.preview.yml
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
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
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
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
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

0 comments on commit a81b424

Please sign in to comment.