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

ISSUE: #30 - Migrate client-admin to Webpack #31

Merged
merged 9 commits into from
Dec 11, 2022
Merged

ISSUE: #30 - Migrate client-admin to Webpack #31

merged 9 commits into from
Dec 11, 2022

Conversation

brendanarnold
Copy link
Collaborator

Addresses Issue #30

  • Merge in upstream pol.is code
  • Gulp now removed from client-admin
  • Node version now set to 14 or above
  • Vulnerabilities reduced from 133 to 48
  • Also includes Farsi translation and updated to German

patcon and others added 9 commits December 2, 2022 10:36
@patcon @metasoarous
Migrate client-admin from gulp to webpack (compdemocracy#1242)
6316a22 
* First-pass gulp-to-webpack conversion.

* Update webpack-cli, and create prod/dev logic.

* Messy: leave uncompressed files in dev mode build.

* Shut off compression in dev mode more elegantly.

* Get docker build working.

* Fixed bundlewatch path to find client-admin files.

* Get rid of old webpack build scripts.

* Don't minify for dev build.

* Removed dep pkgs for s3 deploy.

* Added ability to use bundle analyzer plugin.

* Removed all unneeded files.

* Fixed up eslint issue with upgraded packages.

* Fixed bundlewatch CI script.

* Keep new client-admin bundle consistently named.

* Try running e2e tests against sslip.io instead of localhost.

* Escape the domainWhitelist strings as it was done before.

* Revert "Try running e2e tests against sslip.io instead of localhost."

This reverts commit 46722d0.

* Oops. Inversed the boolean for configs.

* Trying to debug index_admin.html issue.

* Added upterm for remote debugging.

* Ensure upterm runs on failures.

* Added publicPath to make script link absolute.

* Drop the embed.html test file into new home.

* Ensuring dev mode builds and dev server use same simplifications.

* Set up all routes to point to index.html. Added mention of future proxy.

* Removed debugging step from github actions.

* Tiny fixups to clean up PR.

* Only write headerJson files during prod build.

* Migrate from dist to more build as before.

* Removed unneeded config vars.

* Cleaned up webpack dev-mode logic.

* Went back to using dist folder to fix bundle-analyzer bug.

* Updated client-admin README. Removed badges. Removed deployment references.

* Cleaned up ignorefiles.

* Mention where builds happen.

* Use build instead of dist for client-admin build output

* switch to npm run build:prod in file-server/Dockerfile

* inject compiled js in html body for client-admin

* add/update webpack versions

Co-authored-by: Christopher Small <[email protected]>
@xeeg @colinmegill @patcon
Adding farsi translation (compdemocracy#1560)
4b760df 
* Adding farsi translation

* Update client-participation/js/strings.js

Co-authored-by: Patrick Connolly <[email protected]>

Co-authored-by: Colin Megill <[email protected]>
Co-authored-by: Patrick Connolly <[email protected]>
@SvenSt-BIE @dependabot @metasoarous
German language editing (compdemocracy#1552)
1287245 
* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)

Bumps node from 11.15.0-alpine to 18.9.0-alpine.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)

Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.1...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)

Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.5.7.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@7.4.2...7.5.7)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump got and nodemon in /server (compdemocracy#1539)

Removes [got](https://github.com/sindresorhus/got). It's no longer used after updating ancestor dependency [nodemon](https://github.com/remy/nodemon). These dependencies need to be updated together.


Removes `got`

Updates `nodemon` from 2.0.7 to 2.0.20
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](remy/nodemon@v2.0.7...v2.0.20)

---
updated-dependencies:
- dependency-name: got
  dependency-type: indirect
- dependency-name: nodemon
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump y18n from 3.2.1 to 3.2.2 in /client-report (compdemocracy#932)

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update de_de.js

Checked german language (native speaker). Corrected some inconsistencies and grammar errors.

* Update de_de.js

* Update de_de.js

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-admin (compdemocracy#1523)"

This reverts commit 0d1242f.

* Revert "Bump node from 11.15.0-alpine to 18.9.0-alpine in /client-report (compdemocracy#1525)"

This reverts commit 54ed279.

* Revert "Bump moment from 2.29.1 to 2.29.4 in /client-report (compdemocracy#1514)"

This reverts commit 4e7dd51.

* Revert "Bump ws from 7.4.2 to 7.5.7 in /client-admin (compdemocracy#1395)"

This reverts commit 0224f8e.

* Revert "Bump got and nodemon in /server (compdemocracy#1539)"

This reverts commit 0c18e1e.

* Revert "Bump minimist from 1.2.5 to 1.2.6 in /client-admin (compdemocracy#1384)"

This reverts commit 0e8263b.

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christopher Small <[email protected]>
@brendanarnold
Merge remote-tracking branch 'compdem/edge' into govuk/bug/30-migrate…
1487cd6 
…-client-admin-to-webpack
@brendanarnold
Update CHANGELOG
927f4cd
@brendanarnold
Remove boolean, DISABLE_PLANS and DISABLE_INTERCOM
5d8582a
@brendanarnold
Tidied up package.json
b68fa41
@brendanarnold
Remove advice on cache clear - not needed for NPM > 5
3b554f0
@brendanarnold
Rebuilt package-lock for e2e to fix tests
bfb78ce
@brendanarnold brendanarnold marked this pull request as ready for review December 11, 2022 18:22
@brendanarnold brendanarnold merged commit e6a18eb into govuk/main Dec 11, 2022
@brendanarnold brendanarnold changed the title ISSUE:#30 - Migrate client-admin to Webpack ISSUE: #30 - Migrate client-admin to Webpack Jan 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@brendanarnold @patcon @xeeg @SvenSt-BIE