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

Webpack #3596

Merged
merged 28 commits into from
Apr 20, 2021
Merged

Webpack #3596

merged 28 commits into from
Apr 20, 2021

Conversation

bbert
Copy link
Contributor

@bbert bbert commented Apr 2, 2021

Migrate bundler to webpack.
What has been done:

  • replace grunt by webpack
  • replace jshint by eslint
  • add dev task for watch mode
  • add start task for running dev server with watch mode and hot reloading
  • generate only minified files (with source maps) in build task
  • add files section in package.json in order to publish only dist folder

To complete:

  • publish files on ftp server
  • update precommit git hook (@dsilhavy where git hooks are configured for this repo for all users?)

@dsilhavy dsilhavy requested a review from mlasak April 6, 2021 06:44
@dsilhavy dsilhavy added this to the 4.0.0 milestone Apr 6, 2021
package.json Outdated Show resolved Hide resolved
package.json Show resolved Hide resolved
if [ "${CIRCLE_BRANCH}" = "development" ] && [ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_PASSWORD" ]; then
sudo npm install -g grunt-cli
grunt deploy --git-commit=$CIRCLE_SHA1 --ftp-host=$DEPLOY_HOST --ftp-user=$DEPLOY_USER --ftp-pass=$DEPLOY_PASSWORD
if [ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_PASSWORD" ]; then
Copy link
Contributor

@mlasak mlasak Apr 9, 2021

Choose a reason for hiding this comment

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

Removing the condition "${CIRCLE_BRANCH}" = "development" would result in having builds from any branch deployed via ftp as circle ci builds happen on any branch. Most of those deployment would be not desired in most cases (feature branches would overwrite the "nightly build"). Only from one agreed on branch deployments should happen (currently this was/is "development").

Btw, sorry, i owe you all some docu/howto on circle ci config ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was done temporarily to check ftp push feature in this branch .
This will restore before being merged

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, i'll keep this one open so we do not forget..

package copy.json Outdated Show resolved Hide resolved
@mlasak
Copy link
Contributor

mlasak commented Apr 12, 2021

@bbert, until now githooks were added by module grunt-githooks. This module modifies the local file .git/hooks/pre-commit (pls have a look in yours locally)

I fully support removing this outdated module as dep, so i tried to implement this functionality already as postinstall node script in
9483b0c
But, instead of using grunt lint it should call npm run lint

What do you think about this approach @bbert ?

@dsilhavy fyi

@bbert
Copy link
Contributor Author

bbert commented Apr 12, 2021

@bbert, until now githooks were added by module grunt-githooks. This module modifies the local file .git/hooks/pre-commit (pls have a look in yours locally)

I fully support removing this outdated module as dep, so i tried to implement this functionality already as postinstall node script in
9483b0c
But, instead of using grunt lint it should call npm run lint

What do you think about this approach @bbert ?

@dsilhavy fyi

Fine, I prefer this approach (postinstall)

.eslintrc Show resolved Hide resolved
.eslintrc Show resolved Hide resolved
@bbert
Copy link
Contributor Author

bbert commented Apr 13, 2021

@bbert, until now githooks were added by module grunt-githooks. This module modifies the local file .git/hooks/pre-commit (pls have a look in yours locally)
I fully support removing this outdated module as dep, so i tried to implement this functionality already as postinstall node script in
9483b0c
But, instead of using grunt lint it should call npm run lint
What do you think about this approach @bbert ?
@dsilhavy fyi

Fine, I prefer this approach (postinstall)

Have you sublmitted this code in any PR?

Yes i've submitted this PR #3253 . But is still not merged :(
How would you like to proceed on this?

We can merge yours first, then I will update ts PR

@mlasak
Copy link
Contributor

mlasak commented Apr 13, 2021

@bbert, until now githooks were added by module grunt-githooks. This module modifies the local file .git/hooks/pre-commit (pls have a look in yours locally)
I fully support removing this outdated module as dep, so i tried to implement this functionality already as postinstall node script in
9483b0c
But, instead of using grunt lint it should call npm run lint
What do you think about this approach @bbert ?
@dsilhavy fyi

Fine, I prefer this approach (postinstall)

Have you sublmitted this code in any PR?

Yes i've submitted this PR #3253 . But is still not merged :(
How would you like to proceed on this?

We can merge yours first, then I will update ts PR

Ok, cool. I will pull out this out of the huge PR and make a separate/specific PR. This makes things faster.

@mlasak
Copy link
Contributor

mlasak commented Apr 13, 2021

@bbert pls put: Update README.md to the "To complete:"-List ;) All this grunt stuff needs to be removed there

deploy.js Outdated Show resolved Hide resolved
deploy.js Outdated Show resolved Hide resolved
deploy.js Show resolved Hide resolved
deploy.js Outdated Show resolved Hide resolved
deploy.js Outdated Show resolved Hide resolved
build/webpack.dev.js Outdated Show resolved Hide resolved
@mlasak
Copy link
Contributor

mlasak commented Apr 13, 2021

@bbert, until now githooks were added by module grunt-githooks. This module modifies the local file .git/hooks/pre-commit (pls have a look in yours locally)
I fully support removing this outdated module as dep, so i tried to implement this functionality already as postinstall node script in
9483b0c
But, instead of using grunt lint it should call npm run lint
What do you think about this approach @bbert ?
@dsilhavy fyi

Fine, I prefer this approach (postinstall)

Have you sublmitted this code in any PR?

Yes i've submitted this PR #3253 . But is still not merged :(
How would you like to proceed on this?

We can merge yours first, then I will update ts PR

Ok, cool. I will pull out this out of the huge PR and make a separate/specific PR. This makes things faster.

@bbert As discussed, we have merged the git hook creation script and the postinstall instruction into development.
I think only thing you need now to do is base ontop of development and then change the githook.js script to run npm run lint instead the current grunt lint call.

@bbert
Copy link
Contributor Author

bbert commented Apr 14, 2021

@bbert, until now githooks were added by module grunt-githooks. This module modifies the local file .git/hooks/pre-commit (pls have a look in yours locally)
I fully support removing this outdated module as dep, so i tried to implement this functionality already as postinstall node script in
9483b0c
But, instead of using grunt lint it should call npm run lint
What do you think about this approach @bbert ?
@dsilhavy fyi

Fine, I prefer this approach (postinstall)

Have you sublmitted this code in any PR?

Yes i've submitted this PR #3253 . But is still not merged :(
How would you like to proceed on this?

We can merge yours first, then I will update ts PR

Ok, cool. I will pull out this out of the huge PR and make a separate/specific PR. This makes things faster.

@bbert As discussed, we have merged the git hook creation script and the postinstall instruction into development.
I think only thing you need now to do is base ontop of development and then change the githook.js script to run npm run lint instead the current grunt lint call.

OK thanks I'll do it

@bbert
Copy link
Contributor Author

bbert commented Apr 16, 2021

@mlasak I updated script githooks.js, please check.

Copy link
Contributor

@mlasak mlasak left a comment

Choose a reason for hiding this comment

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

this last changes lgtm

Copy link
Contributor

@mlasak mlasak left a comment

Choose a reason for hiding this comment

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

PR lgtm

@dsilhavy dsilhavy merged commit 34ea8b5 into Dash-Industry-Forum:development Apr 20, 2021
@bbert bbert deleted the webpack branch April 29, 2021 10:41
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.

3 participants