diff --git a/CHANGELOG.md b/CHANGELOG.md index 7893ee41..3b1fd04a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,9 @@ -# [10.4.0-alpha.3](https://github.com/dhis2/app-platform/compare/v10.4.0-alpha.2...v10.4.0-alpha.3) (2023-08-10) +## [10.3.10](https://github.com/dhis2/app-platform/compare/v10.3.9...v10.3.10) (2023-08-21) ### Bug Fixes -* move precache route to reenable navigation handler on login redirects [LIBS-473] ([#809](https://github.com/dhis2/app-platform/issues/809)) ([1ff29b6](https://github.com/dhis2/app-platform/commit/1ff29b645ec07e0bcce76efedbc08f1b76014a42)) -* **pwa:** avoid crashing when SW is not available [LIBS-499] ([#807](https://github.com/dhis2/app-platform/issues/807)) ([b681022](https://github.com/dhis2/app-platform/commit/b68102248fad98303dd2c01d954f4430b1934a25)) -* omit `moment-locales` from precache ([#806](https://github.com/dhis2/app-platform/issues/806)) ([c8d5494](https://github.com/dhis2/app-platform/commit/c8d5494c5eaf6a2f021166d208a1cc289701a47a)) -* **cli:** fix envs to fix plugins in dev ([#799](https://github.com/dhis2/app-platform/issues/799)) ([ba29cea](https://github.com/dhis2/app-platform/commit/ba29ceacfe5a25d42a406f80a9896ccbc7bc82f8)) -* **plugins:** omit launch paths when unused [LIBS-477] ([#791](https://github.com/dhis2/app-platform/issues/791)) ([e49a51f](https://github.com/dhis2/app-platform/commit/e49a51fec39a323350c71d4e09caff836aab2262)) -* **pwa:** bump ui version for headerbar connection status [LIBS-315] ([#797](https://github.com/dhis2/app-platform/issues/797)) ([61ff0a4](https://github.com/dhis2/app-platform/commit/61ff0a49e63189d892403db8df24c57e170dac0a)) -* make loading placeholders transparent ([#795](https://github.com/dhis2/app-platform/issues/795)) ([6e64756](https://github.com/dhis2/app-platform/commit/6e64756325b366b413acbdce8dd0d6b70632d118)) -* **plugins:** inject precache manifest correctly ([#792](https://github.com/dhis2/app-platform/issues/792)) ([c0d172e](https://github.com/dhis2/app-platform/commit/c0d172ec362182ce978e43b16e9c411ec61e5039)) -* **pwa:** add config option to omit files from precache [LIBS-482] ([#793](https://github.com/dhis2/app-platform/issues/793)) ([d089dda](https://github.com/dhis2/app-platform/commit/d089dda25433ca52f84c42c9369fce95419e4f83)) +* support yarn.lock discovery on non-unix ([#811](https://github.com/dhis2/app-platform/issues/811)) ([22a6863](https://github.com/dhis2/app-platform/commit/22a6863c1b4a5d9c6c026c502a1b77dded318be7)) ## [10.3.9](https://github.com/dhis2/app-platform/compare/v10.3.8...v10.3.9) (2023-05-16) diff --git a/adapter/package.json b/adapter/package.json index a7bab0de..dc19b059 100644 --- a/adapter/package.json +++ b/adapter/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-adapter", - "version": "10.4.0-alpha.3", + "version": "10.3.10", "repository": { "type": "git", "url": "https://github.com/amcgee/dhis2-app-platform", @@ -21,12 +21,11 @@ "build" ], "dependencies": { - "@dhis2/pwa": "10.4.0-alpha.3", - "moment": "^2.24.0", - "post-robot": "^10.0.46" + "@dhis2/pwa": "10.3.10", + "moment": "^2.24.0" }, "devDependencies": { - "@dhis2/cli-app-scripts": "10.4.0-alpha.3", + "@dhis2/cli-app-scripts": "10.3.10", "@testing-library/react": "^12.0.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", diff --git a/cli/package.json b/cli/package.json index 1a53d141..38d23ce3 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/cli-app-scripts", - "version": "10.4.0-alpha.3", + "version": "10.3.10", "engines": { "node": ">=14" }, @@ -28,7 +28,7 @@ "@babel/preset-env": "^7.14.7", "@babel/preset-react": "^7.0.0", "@babel/preset-typescript": "^7.6.0", - "@dhis2/app-shell": "10.4.0-alpha.3", + "@dhis2/app-shell": "10.3.10", "@dhis2/cli-helpers-engine": "^3.2.0", "@jest/core": "^27.0.6", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4", diff --git a/cli/src/lib/paths.js b/cli/src/lib/paths.js index 4f6be61a..59aa52e6 100644 --- a/cli/src/lib/paths.js +++ b/cli/src/lib/paths.js @@ -7,20 +7,20 @@ const shellSource = path.dirname( ) const shellAppDirname = 'src/D2App' -const findYarnLock = (base) => { - if (base === '/') { +const findYarnLock = (base, rootDirectory) => { + if (base === rootDirectory) { return null } - const yarnLock = path.join(base, './yarn.lock') if (fs.existsSync(yarnLock)) { return yarnLock } - return findYarnLock(path.dirname(base)) + return findYarnLock(path.dirname(base), rootDirectory) } module.exports = (cwd = process.cwd()) => { const base = path.resolve(cwd) + const rootDirectory = path.parse(cwd).root const paths = { babelConfig: path.join(__dirname, '../../config/babel.config.js'), configDefaultsApp: path.join( @@ -44,7 +44,7 @@ module.exports = (cwd = process.cwd()) => { base, package: path.join(base, './package.json'), - yarnLock: findYarnLock(base), + yarnLock: findYarnLock(base, rootDirectory), dotenv: path.join(base, './.env'), config: path.join(base, './d2.config.js'), readme: path.join(base, './README.md'), diff --git a/examples/pwa-app/package.json b/examples/pwa-app/package.json index afb65445..eede0cdb 100644 --- a/examples/pwa-app/package.json +++ b/examples/pwa-app/package.json @@ -1,6 +1,6 @@ { "name": "pwa-app", - "version": "10.4.0-alpha.3", + "version": "10.3.10", "description": "", "license": "BSD-3-Clause", "private": true, diff --git a/examples/simple-app/package.json b/examples/simple-app/package.json index 75179f8f..3336b8d6 100644 --- a/examples/simple-app/package.json +++ b/examples/simple-app/package.json @@ -1,6 +1,6 @@ { "name": "simple-app", - "version": "10.4.0-alpha.3", + "version": "10.3.10", "repository": "https://github.com/amcgee/dhis2-app-platform", "author": "Austin McGee ", "license": "BSD-3-Clause", diff --git a/package.json b/package.json index 88e186c7..47dc55b4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "root", - "version": "10.4.0-alpha.3", + "version": "10.3.10", "private": true, "repository": { "type": "git", diff --git a/pwa/package.json b/pwa/package.json index b0b36462..7ea015a7 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/pwa", - "version": "10.4.0-alpha.3", + "version": "10.3.10", "description": "", "license": "BSD-3-Clause", "publishConfig": { @@ -13,7 +13,7 @@ "deploy": "d2-app-scripts deploy" }, "devDependencies": { - "@dhis2/cli-app-scripts": "10.4.0-alpha.3" + "@dhis2/cli-app-scripts": "10.3.10" }, "dependencies": { "idb": "^6.0.0", diff --git a/shell/package.json b/shell/package.json index 521e83b1..3a0698ba 100644 --- a/shell/package.json +++ b/shell/package.json @@ -1,6 +1,6 @@ { "name": "@dhis2/app-shell", - "version": "10.4.0-alpha.3", + "version": "10.3.10", "engines": { "node": ">=14" }, @@ -15,10 +15,10 @@ "access": "public" }, "dependencies": { - "@dhis2/app-adapter": "10.4.0-alpha.3", - "@dhis2/app-runtime": "^3.10.0-alpha.2", + "@dhis2/app-adapter": "10.3.10", + "@dhis2/app-runtime": "^3.9.0", "@dhis2/d2-i18n": "^1.1.1", - "@dhis2/pwa": "10.4.0-alpha.3", + "@dhis2/pwa": "10.3.10", "@dhis2/ui": "^8.12.3", "classnames": "^2.2.6", "moment": "^2.29.1",