Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dhis2/app-platform
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v11.3.1
Choose a base ref
...
head repository: dhis2/app-platform
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jun 4, 2024

  1. feat: parse pluginType from d2 config to add to manifest.webapp (#849)

    * feat: parse pluginType from d2 config to add to manifest.webapp
    
    * feat: validate pluginType to be all-caps
    
    * docs: update for required format
    
    * fix: update validation
    
    * docs: update pluginType docs
    KaiVandivier authored Jun 4, 2024
    Copy the full SHA
    c1dae23 View commit details
  2. chore(release): cut 11.4.0 [skip release]

    # [11.4.0](v11.3.1...v11.4.0) (2024-06-04)
    
    ### Features
    
    * parse pluginType from d2 config to add to manifest.webapp ([#849](#849)) ([c1dae23](c1dae23))
    dhis2-bot committed Jun 4, 2024
    Copy the full SHA
    2c46f91 View commit details

Commits on Jun 6, 2024

  1. Copy the full SHA
    13af3b5 View commit details
  2. chore(release): cut 11.4.1 [skip release]

    ## [11.4.1](v11.4.0...v11.4.1) (2024-06-06)
    
    ### Bug Fixes
    
    * clean up for plugins [LIBS-620] ([#851](#851)) ([13af3b5](13af3b5))
    dhis2-bot committed Jun 6, 2024
    Copy the full SHA
    c6bba2e View commit details
  3. feat: replace CRA with Vite [LIBS-598] (#847)

    * feat: serve app with Vite
    
    * fix: leave compilation to Vite to enable HMR and .jsx files
    
    * chore: remove log
    
    * fix: convert app shell files to .jsx
    
    * feat: build apps with Vite
    
    * chore: clean up config
    
    * fix: still compile for libs for now
    
    * fix: dynamic import & bundle splitting of moment locales
    
    * chore: bump required Node versions
    BREAKING CHANGE: Supported Node versions are 18.x or 20+
    
    * ci: upgrade Node version
    
    * fix: always add PWA_ENABLED to app env for better static analysis
    
    * chore: pause precache manifest injection
    
    * fix: building SW without CRA
    
    * chore: comment update
    
    * fix: group moment locales in their own dir
    
    * refactor: clean up precache injection
    
    * fix: locale utils and handling moment in jest
    
    * fix: compile correctly after merging changes
    
    * chore: comment in compile.js
    
    * chore: some clean-up
    
    * chore: comments
    
    * fix: use port 3000 for the dev server
    
    * fix: improve moment locale chunk naming
    
    * chore: remove CRA
    
    * fix: use mjs build of Vite
    
    * fix: bump cli-style for CRA fix
    
    * feat: use interactive dev server output from Vite
    
    * fix: make dev server port configurable
    
    * chore: remove old index.html
    
    * fix: env tweaks
    KaiVandivier authored Jun 6, 2024
    Copy the full SHA
    3dd0e59 View commit details
  4. chore(release): cut 12.0.0-alpha.1 [skip release]

    # [12.0.0-alpha.1](v11.2.2...v12.0.0-alpha.1) (2024-06-06)
    
    ### Features
    
    * replace CRA with Vite [LIBS-598] ([#847](#847)) ([3dd0e59](3dd0e59))
    
    ### BREAKING CHANGES
    
    * Supported Node versions are 18.x or 20+
    
    * ci: upgrade Node version
    
    * fix: always add PWA_ENABLED to app env for better static analysis
    
    * chore: pause precache manifest injection
    
    * fix: building SW without CRA
    
    * chore: comment update
    
    * fix: group moment locales in their own dir
    
    * refactor: clean up precache injection
    
    * fix: locale utils and handling moment in jest
    
    * fix: compile correctly after merging changes
    
    * chore: comment in compile.js
    
    * chore: some clean-up
    
    * chore: comments
    
    * fix: use port 3000 for the dev server
    
    * fix: improve moment locale chunk naming
    
    * chore: remove CRA
    
    * fix: use mjs build of Vite
    
    * fix: bump cli-style for CRA fix
    
    * feat: use interactive dev server output from Vite
    
    * fix: make dev server port configurable
    
    * chore: remove old index.html
    
    * fix: env tweaks
    dhis2-bot committed Jun 6, 2024
    Copy the full SHA
    c01de62 View commit details

Commits on Jun 17, 2024

  1. Copy the full SHA
    59bae7e View commit details

Commits on Jun 18, 2024

  1. Copy the full SHA
    2fb4272 View commit details
  2. chore(release): cut 11.4.2 [skip release]

    ## [11.4.2](v11.4.1...v11.4.2) (2024-06-18)
    
    ### Bug Fixes
    
    * do not encode username, password ([#852](#852)) ([2fb4272](2fb4272))
    dhis2-bot committed Jun 18, 2024
    Copy the full SHA
    9bdb7dd View commit details

Commits on Jun 20, 2024

  1. docs: fix docs for docusaurus

    Topener authored and kabaros committed Jun 20, 2024
    Copy the full SHA
    80336e1 View commit details
  2. Copy the full SHA
    5789973 View commit details
  3. Merge pull request #853 from dhis2/catch-up-alpha-12-with-master

    chore: catch up alpha 12 with master
    KaiVandivier authored Jun 20, 2024
    Copy the full SHA
    430debe View commit details
  4. chore: update to latest dhis2 ui

    Flaminia Cavallo authored and Flaminia Cavallo committed Jun 20, 2024
    Copy the full SHA
    c91a011 View commit details
  5. chore(release): cut 12.0.0-alpha.2 [skip release]

    # [12.0.0-alpha.2](v12.0.0-alpha.1...v12.0.0-alpha.2) (2024-06-20)
    
    ### Bug Fixes
    
    * clean up for plugins [LIBS-620] ([#851](#851)) ([13af3b5](13af3b5))
    * do not encode username, password ([#852](#852)) ([2fb4272](2fb4272))
    * don't start plugins for apps without a plugin entrypoint ([#850](#850)) ([a89d4cf](a89d4cf))
    
    ### Features
    
    * parse pluginType from d2 config to add to manifest.webapp ([#849](#849)) ([c1dae23](c1dae23))
    * start plugin and app separately [LIBS-391] [LIBS-392] ([#848](#848)) ([82003e7](82003e7))
    dhis2-bot committed Jun 20, 2024
    Copy the full SHA
    9cf797c View commit details

Commits on Jun 24, 2024

  1. Merge pull request #855 from dhis2/upgrade-ui-library

    chore: update to latest dhis2 ui
    flaminic authored Jun 24, 2024
    Copy the full SHA
    874ac44 View commit details
  2. fix: small text change in changelog

    Flaminia Cavallo authored and Flaminia Cavallo committed Jun 24, 2024
    Copy the full SHA
    824dd2f View commit details
  3. Merge pull request #857 from dhis2/small-text-fix

    fix: small text change in changelog
    flaminic authored Jun 24, 2024
    Copy the full SHA
    485b93c View commit details
  4. chore(release): cut 11.4.3 [skip release]

    ## [11.4.3](v11.4.2...v11.4.3) (2024-06-24)
    
    ### Bug Fixes
    
    * small text change in changelog ([824dd2f](824dd2f))
    dhis2-bot committed Jun 24, 2024
    Copy the full SHA
    835b887 View commit details
  5. Copy the full SHA
    de252fe View commit details
  6. chore(release): cut 11.5.0 [skip release]

    # [11.5.0](v11.4.3...v11.5.0) (2024-06-24)
    
    ### Features
    
    * cleanup plugin error boundary [UX-136] ([#856](#856)) ([de252fe](de252fe))
    dhis2-bot committed Jun 24, 2024
    Copy the full SHA
    949ea83 View commit details

Commits on Jul 1, 2024

  1. Copy the full SHA
    1f717f3 View commit details
  2. chore(release): cut 11.5.1 [skip release]

    ## [11.5.1](v11.5.0...v11.5.1) (2024-07-01)
    
    ### Bug Fixes
    
    * fixed dimensions plugins [LIBS-634] ([#858](#858)) ([1f717f3](1f717f3))
    dhis2-bot committed Jul 1, 2024
    Copy the full SHA
    0d7d4de View commit details

Commits on Jul 3, 2024

  1. feat: parse additional namespaces from d2.config.js and add to `man…

    …ifest.webapp` [LIBS-638] (#860)
    
    * feat: add `additionalNamespaces` config to manifest.webapp
    
    * docs: additional namespaces
    
    * docs: fix typo
    KaiVandivier authored Jul 3, 2024
    Copy the full SHA
    62782fe View commit details
  2. chore(release): cut 11.6.0 [skip release]

    # [11.6.0](v11.5.1...v11.6.0) (2024-07-03)
    
    ### Features
    
    * parse additional namespaces from `d2.config.js` and add to `manifest.webapp` [LIBS-638]  ([#860](#860)) ([62782fe](62782fe))
    dhis2-bot committed Jul 3, 2024
    Copy the full SHA
    a757d82 View commit details

Commits on Jul 5, 2024

  1. fix(alerts): ensure hiding works correctly and alerts are not re-adde…

    …d [DHIS2-15438] (#859)
    
    * chore: add bug reproduction test case
    
    * fix: ensure hiding works correctly and alerts are not re-added
    
    * chore: fix typos
    
    * chore: import useAlerts from app-runtime
    
    ---------
    
    Co-authored-by: Kai Vandivier <49666798+KaiVandivier@users.noreply.github.com>
    HendrikThePendric and KaiVandivier authored Jul 5, 2024
    Copy the full SHA
    6b11fff View commit details
  2. chore(release): cut 11.6.1 [skip release]

    ## [11.6.1](v11.6.0...v11.6.1) (2024-07-05)
    
    ### Bug Fixes
    
    * **alerts:** ensure hiding works correctly and alerts are not re-added [DHIS2-15438] ([#859](#859)) ([6b11fff](6b11fff))
    dhis2-bot committed Jul 5, 2024
    Copy the full SHA
    82f05d5 View commit details

Commits on Jul 8, 2024

  1. Copy the full SHA
    c8331ac View commit details
  2. chore(release): cut 12.0.0-alpha.3 [skip release]

    # [12.0.0-alpha.3](v12.0.0-alpha.2...v12.0.0-alpha.3) (2024-07-08)
    
    ### Bug Fixes
    
    * **alerts:** ensure hiding works correctly and alerts are not re-added [DHIS2-15438] ([#859](#859)) ([6b11fff](6b11fff))
    * fixed dimensions plugins [LIBS-634] ([#858](#858)) ([1f717f3](1f717f3))
    * small text change in changelog ([824dd2f](824dd2f))
    
    ### Features
    
    * cleanup plugin error boundary [UX-136] ([#856](#856)) ([de252fe](de252fe))
    * parse additional namespaces from `d2.config.js` and add to `manifest.webapp` [LIBS-638]  ([#860](#860)) ([62782fe](62782fe))
    dhis2-bot committed Jul 8, 2024
    Copy the full SHA
    95129e9 View commit details

Commits on Jul 10, 2024

  1. Copy the full SHA
    01a3160 View commit details
  2. chore(release): cut 11.6.2 [skip release]

    ## [11.6.2](v11.6.1...v11.6.2) (2024-07-10)
    
    ### Bug Fixes
    
    * plugin boundary retry if plugin logic is skipped ([#862](#862)) ([01a3160](01a3160))
    dhis2-bot committed Jul 10, 2024
    Copy the full SHA
    97964a2 View commit details

Commits on Jul 16, 2024

  1. Copy the full SHA
    d0e433b View commit details
  2. chore(release): cut 11.6.3 [skip release]

    ## [11.6.3](v11.6.2...v11.6.3) (2024-07-16)
    
    ### Bug Fixes
    
    * **deps:** update i18next-scanner version to support old plurals format again ([#861](#861)) ([d0e433b](d0e433b))
    dhis2-bot committed Jul 16, 2024
    Copy the full SHA
    763aba7 View commit details

Commits on Jul 19, 2024

  1. Copy the full SHA
    84a5a59 View commit details
  2. chore(release): cut 11.6.4 [skip release]

    ## [11.6.4](v11.6.3...v11.6.4) (2024-07-19)
    
    ### Bug Fixes
    
    * use i18next-scanner v3 for better i18next compatibility ([#864](#864)) ([84a5a59](84a5a59))
    dhis2-bot committed Jul 19, 2024
    Copy the full SHA
    47c9dd1 View commit details

Commits on Jul 23, 2024

  1. Copy the full SHA
    bd6cfc0 View commit details
  2. chore(release): cut 11.7.0 [skip release]

    # [11.7.0](v11.6.4...v11.7.0) (2024-07-23)
    
    ### Features
    
    * update boilerplate app code for init command [LIBS-644] ([#866](#866)) ([bd6cfc0](bd6cfc0))
    dhis2-bot committed Jul 23, 2024
    Copy the full SHA
    6c96827 View commit details
  3. Copy the full SHA
    411afc7 View commit details
  4. chore(release): cut 12.0.0-alpha.4 [skip release]

    # [12.0.0-alpha.4](v12.0.0-alpha.3...v12.0.0-alpha.4) (2024-07-23)
    
    ### Bug Fixes
    
    * use i18next-scanner v3 for better i18next compatibility ([#864](#864)) ([84a5a59](84a5a59))
    * **deps:** update i18next-scanner version to support old plurals format again ([#861](#861)) ([d0e433b](d0e433b))
    * plugin boundary retry if plugin logic is skipped ([#862](#862)) ([01a3160](01a3160))
    
    ### Features
    
    * update boilerplate app code for init command [LIBS-644] ([#866](#866)) ([bd6cfc0](bd6cfc0))
    dhis2-bot committed Jul 23, 2024
    Copy the full SHA
    197f58a View commit details

Commits on Jul 25, 2024

  1. feat: handle plugins with Vite [LIBS-610] (#863)

    * chore: update yarn.lock
    
    * refactor: use Vite Node API for starting apps
    
    * chore: extend gitignore
    
    * feat: use Vite Node API to build apps
    
    * feat: build & serve plugins with Vite
    
    * chore: clean up unused "start app or plugin" logic
    
    * chore: clean up old plugin code (yay!)
    
    * chore: update pwa example app to jsx extensions
    
    * chore: one more JSX
    
    * feat: make building apps and plugins independent
    
    * chore: update vite dependency location
    
    * fix(deploy): support deploying plugins without an app
    
    * chore: comment
    
    * fix: default config type
    
    * fix: solve clunky exit from start script with ctrl-C
    
    * fix: handle undefined defaults
    
    * fix: leaner caching in dev (wip)
    
    * fix: handling 400+ & 500+ responses
    
    * refactor: move strategies to new file
    
    * fix: dev caching strategy
    
    * refactor: inject `isPlugin` var at bootstrap time
    
    * chore: delete unused static vite config
    
    * chore: performance cost comment
    
    * fix: print build error
    
    * chore: comment
    
    * fix: init boilerplate with .jsx extensions
    
    * refactor: reorganize init boilerplate
    
    * fix: smaller env for SW
    
    * feat: improved logging
    
    * feat: add host option to start command
    
    * refactor: config parsing
    
    * docs: add docs for --force option on start
    
    * chore: improve comment
    KaiVandivier authored Jul 25, 2024
    Copy the full SHA
    ca5be0d View commit details
  2. chore(release): cut 12.0.0-alpha.5 [skip release]

    # [12.0.0-alpha.5](v12.0.0-alpha.4...v12.0.0-alpha.5) (2024-07-25)
    
    ### Features
    
    * handle plugins with Vite [LIBS-610] ([#863](#863)) ([ca5be0d](ca5be0d))
    dhis2-bot committed Jul 25, 2024
    Copy the full SHA
    7cc9afb View commit details

Commits on Aug 12, 2024

  1. feat(init): set direction: 'auto' and import locales for new apps [LI…

    …BS-645] (#867)
    
    * feat: add direction: 'auto' to new apps' config
    
    * feat: import locales from boilerplate entrypoint
    KaiVandivier authored Aug 12, 2024
    Copy the full SHA
    4eda4a9 View commit details
  2. chore(release): cut 12.0.0-alpha.6 [skip release]

    # [12.0.0-alpha.6](v12.0.0-alpha.5...v12.0.0-alpha.6) (2024-08-12)
    
    ### Features
    
    * **init:** set direction: 'auto' and import locales for new apps [LIBS-645] ([#867](#867)) ([4eda4a9](4eda4a9))
    dhis2-bot committed Aug 12, 2024
    Copy the full SHA
    71d1f67 View commit details

Commits on Aug 15, 2024

  1. Copy the full SHA
    0233949 View commit details
  2. Copy the full SHA
    5f4683c View commit details

Commits on Aug 16, 2024

  1. Merge pull request #870 from dhis2/libs-635-initial-fixes

    feat: hmr for .js files; fix file server for fonts [LIBS-635]
    KaiVandivier authored Aug 16, 2024
    Copy the full SHA
    3e39373 View commit details
  2. chore(release): cut 12.0.0-alpha.7 [skip release]

    # [12.0.0-alpha.7](v12.0.0-alpha.6...v12.0.0-alpha.7) (2024-08-16)
    
    ### Bug Fixes
    
    * allow serving files from cwd node_modules ([0233949](0233949))
    
    ### Features
    
    * enable HMR for .js files ([5f4683c](5f4683c))
    dhis2-bot committed Aug 16, 2024
    Copy the full SHA
    b5bdfe6 View commit details

Commits on Aug 27, 2024

  1. Copy the full SHA
    74a2165 View commit details
  2. chore(release): cut 11.7.1 [skip release]

    ## [11.7.1](v11.7.0...v11.7.1) (2024-08-27)
    
    ### Bug Fixes
    
    * update app-runtime dependency ([74a2165](74a2165))
    dhis2-bot committed Aug 27, 2024
    Copy the full SHA
    694edde View commit details
  3. fix: base url env & refactor [LIBS-635] (#872)

    * fix: missing base URL from env; refactor env and shell bootstrap
    
    * fix: add public URL default
    
    * fix: new env format for start script
    
    * chore: clean up unused files
    
    * fix: base url prefix
    
    * refactor: parameter format
    
    * chore: last comment
    KaiVandivier authored Aug 27, 2024
    Copy the full SHA
    7f19259 View commit details
  4. chore(release): cut 12.0.0-alpha.8 [skip release]

    # [12.0.0-alpha.8](v12.0.0-alpha.7...v12.0.0-alpha.8) (2024-08-27)
    
    ### Bug Fixes
    
    * base url env & refactor [LIBS-635] ([#872](#872)) ([7f19259](7f19259))
    dhis2-bot committed Aug 27, 2024
    Copy the full SHA
    4f88ba2 View commit details
Showing with 6,111 additions and 5,957 deletions.
  1. +7 −2 .eslintignore
  2. +1 −1 .github/workflows/dhis2-deploy-netlify.yml
  3. +11 −7 .github/workflows/dhis2-verify-lib.yml
  4. +41 −0 .github/workflows/generate-and-upload-bom.yml
  5. +1 −0 .gitignore
  6. +267 −1 CHANGELOG.md
  7. +8 −5 adapter/i18n/en.pot
  8. +11 −11 adapter/package.json
  9. +73 −67 adapter/src/components/Alerts.js
  10. +3 −1 adapter/src/components/AppWrapper.js
  11. +45 −5 adapter/src/components/ErrorBoundary.js
  12. +2 −2 adapter/src/components/LoginModal.js
  13. +3 −1 adapter/src/components/ServerVersionProvider.js
  14. +125 −137 adapter/src/components/__tests__/Alerts.test.js
  15. +13 −1 adapter/src/components/styles/Button.style.js
  16. +23 −4 adapter/src/components/styles/ErrorBoundary.style.js
  17. +1 −1 adapter/src/index.js
  18. +4 −3 adapter/src/utils/localeUtils.js
  19. +8 −8 adapter/src/utils/useLocale.test.js
  20. +0 −55 cli/config/d2.pwa.config.js
  21. +25 −0 cli/config/d2ConfigDefaults.js
  22. +17 −0 cli/config/d2ConfigDefaults.typescript.js
  23. +0 −35 cli/config/init.entrypoint.js
  24. +3 −0 cli/config/jest.config.js
  25. +193 −0 cli/config/makeViteConfig.mjs
  26. +0 −307 cli/config/plugin.webpack.config.js
  27. +9 −0 cli/config/templates/common/App.module.css
  28. 0 cli/config/{init.README.md → templates/common/README.md}
  29. 0 cli/config/{init.package.json → templates/common/package.json}
  30. +21 −0 cli/config/templates/init-typescript/App.test.tsx
  31. +1 −1 cli/config/{d2.config.app.js → templates/init-typescript/d2.config.app.ts}
  32. +9 −0 cli/config/templates/init-typescript/d2.config.lib.ts
  33. +37 −0 cli/config/templates/init-typescript/entrypoint.tsx
  34. +8 −0 cli/config/templates/init-typescript/global.d.ts
  35. +4 −0 cli/config/templates/init-typescript/modules.d.ts
  36. +13 −0 cli/config/templates/init-typescript/tsconfig.json
  37. +7 −6 cli/config/{init.App.test.js → templates/init/App.test.jsx}
  38. +11 −0 cli/config/templates/init/d2.config.app.js
  39. +1 −1 cli/config/{ → templates/init}/d2.config.lib.js
  40. +33 −0 cli/config/templates/init/entrypoint.jsx
  41. +12 −7 cli/package.json
  42. +51 −26 cli/src/commands/build.js
  43. +10 −2 cli/src/commands/deploy.js
  44. +63 −17 cli/src/commands/init.js
  45. +6 −0 cli/src/commands/migrate.js
  46. +333 −0 cli/src/commands/migrate/js-to-jsx.js
  47. +79 −59 cli/src/commands/start.js
  48. +1 −1 cli/src/commands/test.js
  49. +1 −1 cli/src/lib/{shell/bootstrap.js → bootstrapShell.js}
  50. +32 −14 cli/src/lib/compiler/compile.js
  51. +16 −5 cli/src/lib/compiler/entrypoints.js
  52. +9 −1 cli/src/lib/constructAppUrl.js
  53. +106 −0 cli/src/lib/env/getEnv.js
  54. +22 −12 cli/src/lib/{pwa → env}/getPWAEnvVars.js
  55. +7 −0 cli/src/lib/env/index.js
  56. 0 cli/src/lib/{ → env}/loadEnvFiles.js
  57. +10 −11 cli/src/lib/generateManifests.js
  58. +0 −26 cli/src/lib/getOriginalEntrypoints.js
  59. +62 −0 cli/src/lib/parseAdditionalNamespaces.js
  60. +79 −0 cli/src/lib/parseAdditionalNamespaces.test.js
  61. +25 −20 cli/src/lib/parseConfig.js
  62. +58 −20 cli/src/lib/paths.js
  63. +0 −56 cli/src/lib/plugin/build.js
  64. +0 −7 cli/src/lib/plugin/index.js
  65. +0 −40 cli/src/lib/plugin/start.js
  66. +3 −2 cli/src/lib/publishVersion.js
  67. +18 −26 cli/src/lib/pwa/compileServiceWorker.js
  68. +0 −2 cli/src/lib/pwa/index.js
  69. +13 −12 cli/src/lib/pwa/injectPrecacheManifest.js
  70. +0 −53 cli/src/lib/shell/env.js
  71. +0 −51 cli/src/lib/shell/index.js
  72. +4 −0 docs/_sidebar.md
  73. +56 −20 docs/config/d2-config-js-reference.md
  74. +1 −1 docs/config/environment.md
  75. +345 −0 docs/migration/v12.md
  76. +25 −22 docs/pwa/pwa.md
  77. +4 −0 docs/scripts/build.md
  78. +6 −3 docs/scripts/init.md
  79. +128 −0 docs/scripts/migrate/js-to-jsx.md
  80. +15 −7 docs/scripts/start.md
  81. +4 −3 examples/pwa-app/d2.config.js
  82. +3 −3 examples/pwa-app/package.json
  83. +2 −2 examples/pwa-app/src/{App.js → App.jsx}
  84. +1 −1 examples/pwa-app/src/App.test.js
  85. 0 examples/pwa-app/src/components/{LoadingMask.js → LoadingMask.jsx}
  86. 0 examples/pwa-app/src/components/{RequestTester.js → RequestTester.jsx}
  87. +2 −2 examples/pwa-app/src/components/{SectionWrapper.js → SectionWrapper.jsx}
  88. 0 examples/pwa-app/src/components/{VisualizationsList.js → VisualizationsList.jsx}
  89. +12 −1 examples/simple-app/d2.config.js
  90. +3 −3 examples/simple-app/package.json
  91. +2 −9 examples/simple-app/src/{Alerter.js → Alerter.jsx}
  92. +6 −0 examples/simple-app/src/Alerter.module.css
  93. +7 −4 examples/simple-app/src/{App.js → App.jsx}
  94. +2 −1 cli/config/init.App.module.css → examples/simple-app/src/App.module.css
  95. +0 −14 examples/simple-app/src/App.style.js
  96. +2 −2 package.json
  97. +5 −6 pwa/package.json
  98. +86 −0 pwa/src/service-worker/other-strategies.js
  99. +15 −57 pwa/src/service-worker/set-up-service-worker.js
  100. +1 −6 pwa/src/service-worker/utils.js
  101. +14 −20 shell/{public → }/index.html
  102. +10 −15 shell/package.json
  103. +4 −0 shell/{public → }/plugin.html
  104. +12 −7 shell/src/{App.js → App.jsx}
  105. +0 −9 shell/src/App.test.js
  106. +10 −0 shell/src/App.test.jsx
  107. 0 shell/src/D2App/{app.js → app.jsx}
  108. 0 shell/src/{Plugin.js → Plugin.jsx}
  109. +90 −50 shell/src/{PluginLoader.js → PluginLoader.jsx}
  110. +0 −32 shell/src/PluginOuterErrorBoundary.js
  111. +76 −0 shell/src/PluginOuterErrorBoundary.jsx
  112. +0 −14 shell/src/index.js
  113. +15 −0 shell/src/index.jsx
  114. +0 −14 shell/src/plugin.index.js
  115. +15 −0 shell/src/plugin.index.jsx
  116. +3,073 −4,496 yarn.lock
9 changes: 7 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/cli/assets
**/locales/index.js
cli/config/init.entrypoint.js
cli/config/init.App.test.js
# These are to avoid lint errors like 'cannot find module App.jsx'
cli/config/templates/init/entrypoint.jsx
cli/config/templates/init/App.test.jsx
cli/config/templates/init-typescript/entrypoint.tsx
cli/config/templates/init-typescript/App.test.tsx
cli/config/templates/init-typescript/global.d.ts
cli/config/templates/init-typescript/modules.d.ts
2 changes: 1 addition & 1 deletion .github/workflows/dhis2-deploy-netlify.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 18.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
18 changes: 11 additions & 7 deletions .github/workflows/dhis2-verify-lib.yml
Original file line number Diff line number Diff line change
@@ -21,15 +21,15 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 18.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile

- name: Build
run: yarn build

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: lib-build
path: |
@@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 18.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile
@@ -59,9 +59,9 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 18.x

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: lib-build

@@ -81,15 +81,19 @@ jobs:
token: ${{env.GH_TOKEN}}
- uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 18.x

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: lib-build

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile

# If npm > v7, the semantic release action below modifies yarn.lock
# upon release (since it runs `npm version ___`)
- run: npm install -g npm@^6

- uses: dhis2/action-semantic-release@master
with:
publish-npm: true
41 changes: 41 additions & 0 deletions .github/workflows/generate-and-upload-bom.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: 'This workflow creates bill of material and uploads it to Dependency-Track each night'

on:
schedule:
- cron: '0 0 * * *'

concurrency:
group: ${{ github.workflow}}-${{ github.ref }}
cancel-in-progress: true

defaults:
run:
shell: bash

jobs:
create-bom:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18.x

- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: Generate BOMs
run: |
npm install -g @cyclonedx/cdxgen
cdxgen -o sbom.json
- name: Upload SBOM to DependencyTrack
env:
DEPENDENCY_TRACK_API: 'https://dt.security.dhis2.org/api/v1/bom'
run: |
curl -X POST "$DEPENDENCY_TRACK_API" \
--fail-with-body \
-H "Content-Type: multipart/form-data" \
-H "X-Api-Key: ${{ secrets.DEPENDENCYTRACK_APIKEY }}" \
-F "project=127b6ae4-8387-4e81-822d-f6a788150de4" \
-F "bom=@sbom.json"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ cli/assets

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
Loading