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.

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

Amend/update frontend dependencies #133

Merged
merged 6 commits into from
Feb 10, 2017

Conversation

M4R1KU
Copy link
Member

@M4R1KU M4R1KU commented Feb 10, 2017

This closes nothing

Summary of changes:

  • ​updated nearly all frontend dependencies to the newest version
  • cherry-picked factories from other branch

important
currently the build is only working correctly when the dependecies were installed with npm but not yarn
see this issue

so you have to run yarn first and before you run ng serve or ng build you need to run npm i

I made sure to:

  • Add and / or update tests
  • Run the code formatter (CTRL + ALT + L)
  • Update any documentation (javadoc, domain model, erd, ...)
  • Follow the contribution guidelines

Please review @jmesserli @needToRoll / cc: @outcobra/developers.

(cherry picked from commit 1ac2acb)

(cherry picked from commit 9cb1909)
…end-dependencies

# Conflicts:
#	frontend/angular-cli.json
#	frontend/package.json
#	frontend/src/app/app.module.ts
#	frontend/src/app/shared/notifications/notification-wrapper.service.ts
#	frontend/src/app/shared/services/factories.ts
#	frontend/yarn.lock
{
"root": "src",
"outDir": "dist",
"assets": [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we actually use jquery or materialize?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not really sure. I need some time to check that but I don't have it.

@jmesserli
Copy link
Member

can you please re-enable the ngBuild task in gradle?

Copy link
Member

@jmesserli jmesserli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see 2 comments

@M4R1KU
Copy link
Member Author

M4R1KU commented Feb 10, 2017

Why re-enable? It would fail tough expect we'd move to npm.

@jmesserli
Copy link
Member

jmesserli commented Feb 10, 2017 via email

@M4R1KU
Copy link
Member Author

M4R1KU commented Feb 10, 2017

What did I fix?
The factory: yes
But there is a new error which is caused by yarn but don't ask me why this happens.

@jmesserli
Copy link
Member

jmesserli commented Feb 10, 2017 via email

@jmesserli jmesserli merged commit 0dbdde8 into develop Feb 10, 2017
@jmesserli jmesserli deleted the amend/update-frontend-dependencies branch February 10, 2017 21:40
@M4R1KU
Copy link
Member Author

M4R1KU commented Feb 10, 2017

I hope that this error will be fixed in a future release of yarn or @angular/cli

@jmesserli
Copy link
Member

We can hope ¯_(ツ)_/¯

@jmesserli
Copy link
Member

And I'm pretty sure that sentence does not exist in english

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants