Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
9c81f35
feat: support pnpm and other package managers
kabaros Jul 23, 2025
4d95368
chore(release): cut 12.7.0-alpha.1 [skip release]
dhis2-bot Jul 23, 2025
1d889ff
fix: correct cli-app-script link
kabaros Jul 23, 2025
9187716
chore(release): cut 12.7.0-alpha.2 [skip release]
dhis2-bot Jul 23, 2025
2fb963f
fix: default to pnpm as a package manager
kabaros Jul 23, 2025
7dcca0c
chore(release): cut 12.7.0-alpha.3 [skip release]
dhis2-bot Jul 23, 2025
ac9aa78
fix: change hoist options for phantom app-shell dependencies
kabaros Jul 24, 2025
5242730
chore(release): cut 12.7.0-alpha.4 [skip release]
dhis2-bot Jul 24, 2025
9e692bc
fix: add styled-jsx to hoisted dependencies
kabaros Jul 24, 2025
4c36791
chore(release): cut 12.7.0-alpha.5 [skip release]
dhis2-bot Jul 24, 2025
e971c3d
fix: change cli option for package manager to boolean '--pnpm'
kabaros Jul 24, 2025
290043d
chore(release): cut 12.7.0-alpha.6 [skip release]
dhis2-bot Jul 24, 2025
2b54a06
fix: default args to undefined not 'false' to avoid conflict
kabaros Jul 24, 2025
382fbac
chore(release): cut 12.7.0-alpha.7 [skip release]
dhis2-bot Jul 24, 2025
e0cda6d
fix: recommend the use of 'pnpm' as a warning on init command
kabaros Jul 24, 2025
8bbd017
chore(release): cut 12.7.0-alpha.8 [skip release]
dhis2-bot Jul 24, 2025
e480586
fix: capitalise log messages
kabaros Jul 24, 2025
e1c1a5f
chore(release): cut 12.7.0-alpha.9 [skip release]
dhis2-bot Jul 24, 2025
2975d2e
fix: ensure npm works as well as pnpm
kabaros Jul 24, 2025
223350e
fix: ensure app-shell symlink is created to avoid race conditon
kabaros Jul 24, 2025
f55bc5e
test: fix failing test
kabaros Jul 24, 2025
878865c
chore(release): cut 12.7.0-alpha.10 [skip release]
dhis2-bot Jul 24, 2025
fe2d496
fix: race condition with symlinks
kabaros Jul 24, 2025
1708b32
chore(release): cut 12.7.0-alpha.11 [skip release]
dhis2-bot Jul 24, 2025
acb4ac0
fix: add corepack packageManager field
kabaros Jul 24, 2025
266c30b
chore(release): cut 12.7.0-alpha.12 [skip release]
dhis2-bot Jul 24, 2025
824618d
Merge remote-tracking branch 'origin/master' into alpha
kabaros Jul 24, 2025
78a2e69
fix: force alpha release to npm
kabaros Jul 24, 2025
5e48c97
chore(release): cut 12.7.0-alpha.13 [skip release]
dhis2-bot Jul 24, 2025
cc8b7f5
fix: expose init command in the package
kabaros Jul 25, 2025
6f34e5a
chore(release): cut 12.7.0-alpha.14 [skip release]
dhis2-bot Jul 25, 2025
fa91bc5
fix: hoist dependencies needed for plugins and PWAs
kabaros Jul 28, 2025
dbd079e
chore(release): cut 12.7.0-alpha.15 [skip release]
dhis2-bot Jul 28, 2025
8e360a9
Merge remote-tracking branch 'origin/master' into alpha
kabaros Jul 28, 2025
79392dc
chore(release): cut 12.8.0-alpha.1 [skip release]
dhis2-bot Jul 28, 2025
ca36333
fix: allow passing a reporter to init command
kabaros Oct 29, 2025
152c3d3
chore(release): cut 12.8.0-alpha.2 [skip release]
dhis2-bot Oct 29, 2025
6028374
fix: Revert "fix: allow passing a reporter to init command
kabaros Oct 29, 2025
e2e260e
chore(release): cut 12.8.0-alpha.3 [skip release]
dhis2-bot Oct 29, 2025
c064fdc
Merge remote-tracking branch 'origin' into alpha
kabaros Jan 13, 2026
49f6c89
chore(release): cut 12.11.0-alpha.1 [skip release]
dhis2-bot Jan 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,115 changes: 497 additions & 618 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/app-adapter",
"version": "12.10.1",
"version": "12.11.0-alpha.1",
"repository": {
"type": "git",
"url": "https://github.com/amcgee/dhis2-app-platform",
Expand All @@ -21,11 +21,11 @@
"build"
],
"dependencies": {
"@dhis2/pwa": "12.10.1",
"@dhis2/pwa": "12.11.0-alpha.1",
"moment": "^2.24.0"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "12.10.1",
"@dhis2/cli-app-scripts": "12.11.0-alpha.1",
"@testing-library/react": "^16.0.1",
"@testing-library/dom": "^10.4.0",
"enzyme": "^3.11.0",
Expand Down
3 changes: 2 additions & 1 deletion cli/config/templates/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"version": "1.0.0",
"description": "",
"license": "BSD-3-Clause",
"private": true
"private": true,
"packageManager": "yarn@1.22.22"
}
17 changes: 17 additions & 0 deletions cli/config/templates/common/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# These hoists are needed for @dhis2/app-shell since it uses directly some libraries that were hoisted by yarn 1
# This is a better alternative than pnpm's shamefullyHoist https://pnpm.io/settings#shamefullyhoist until we update the way that @dhis2/app-shell works
publicHoistPattern:
- "@dhis2/ui"
- "typeface-roboto"
- "@dhis2/app-adapter"
- "prop-types"
- "@dhis2/d2-i18n"
- "post-robot"
- "styled-jsx"
- "@dhis2/app-adapter"
- "@dhis2/pwa"

onlyBuiltDependencies:
- "@dhis2/cli-helpers-engine"
- core-js-pure
- esbuild
8 changes: 6 additions & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/cli-app-scripts",
"version": "12.10.1",
"version": "12.11.0-alpha.1",
"engines": {
"node": "^18.0.0 || >=20.0.0"
},
Expand All @@ -15,6 +15,10 @@
"access": "public"
},
"main": "src/index.js",
"exports": {
".": "./src/index.js",
"./init": "./src/commands/init.js"
},
"files": [
"bin",
"config",
Expand All @@ -32,7 +36,7 @@
"@babel/preset-env": "^7.27.2",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.27.1",
"@dhis2/app-shell": "12.10.1",
"@dhis2/app-shell": "12.11.0-alpha.1",
"@dhis2/cli-helpers-engine": "^3.2.2",
"@jest/core": "^27.0.6",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
Expand Down
Loading
Loading