chore: update alpha branch (#815)

dhis2 · Aug 22, 2023 · ca24fcc · ca24fcc
2 parents 5a7cd50 + 6733572
commit ca24fcc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 ### Bug Fixes
 
+* 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))
 * 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))

diff --git a/adapter/package.json b/adapter/package.json
@@ -21,6 +21,11 @@
         "build"
     ],
     "dependencies": {
+        "@dhis2/pwa": "10.3.10",
+        "moment": "^2.24.0"
+    },
+    "devDependencies": {
+        "@dhis2/cli-app-scripts": "10.3.10",
         "@dhis2/pwa": "10.4.0-alpha.3",
         "moment": "^2.24.0",
         "post-robot": "^10.0.46"

diff --git 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'),