feat: upgrade to yarn2 and improve compilation step

.github/workflows/dhis2-verify-lib.yml

@@ -1,8 +1,6 @@
 name: 'dhis2: verify (lib)'
 
-on:
-    push:
-        branches:
+on: push
 
 env:
     GIT_AUTHOR_NAME: '@dhis2-bot'
@@ -27,12 +25,15 @@ jobs:
             - uses: actions/cache@v2
               id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
               with:
-                  path: '**/node_modules'
+                  path: |
+                      .yarn/**
+                      **/node_modules
+                      .pnp.js
                   key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
 
             - name: Install
               if: steps.yarn-cache.outputs.cache-hit != 'true'
-              run: yarn install --frozen-lockfile
+              run: yarn install --immutable
 
     build:
         runs-on: ubuntu-latest
@@ -47,7 +48,10 @@ jobs:
             - uses: actions/cache@v2
               id: yarn-cache
               with:
-                  path: '**/node_modules'
+                  path: |
+                      .yarn/**
+                      **/node_modules
+                      .pnp.js
                   key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
 
             - name: Build
@@ -58,12 +62,13 @@ jobs:
                   name: lib-build
                   path: |
                       **/build
+                      cli/assets
                       !**/node_modules
                   retention-days: 1
 
     lint:
         runs-on: ubuntu-latest
-        needs: [install]
+        needs: [install, build]
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
         steps:
             - uses: actions/checkout@v2
@@ -74,18 +79,25 @@ jobs:
             - uses: actions/cache@v2
               id: yarn-cache
               with:
-                  path: '**/node_modules'
+                  path: |
+                      .yarn/**
+                      **/node_modules
+                      .pnp.js
                   key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
 
-            - name: Build
-              run: yarn build
+            - uses: actions/download-artifact@v2
+              with:
+                  name: lib-build
+
+            - name: Generate i18n
+              run: yarn i18n:generate
 
             - name: Lint
               run: yarn lint
 
     test:
         runs-on: ubuntu-latest
-        needs: [install]
+        needs: [install, build]
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
         steps:
             - uses: actions/checkout@v2
@@ -96,15 +108,51 @@ jobs:
             - uses: actions/cache@v2
               id: yarn-cache
               with:
-                  path: '**/node_modules'
+                  path: |
+                      .yarn/**
+                      **/node_modules
+                      .pnp.js
                   key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
 
+            - uses: actions/download-artifact@v2
+              with:
+                  name: lib-build
+
+            - name: Generate i18n
+              run: yarn i18n:generate
+
             - name: Test
               run: yarn test
 
+    build-example:
+        runs-on: ubuntu-latest
+        needs: [install, build]
+        if: "!contains(github.event.head_commit.message, '[skip ci]')"
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: 12.x
+
+            - uses: actions/cache@v2
+              id: yarn-cache
+              with:
+                  path: |
+                      .yarn/**
+                      **/node_modules
+                      .pnp.js
+                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+
+            - uses: actions/download-artifact@v2
+              with:
+                  name: lib-build
+
+            - name: Build example
+              run: yarn build:example
+
     publish:
         runs-on: ubuntu-latest
-        needs: [build, lint, test]
+        needs: [build, lint, test, build-example]
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
         steps:
             - uses: actions/checkout@v2
@@ -119,4 +167,4 @@ jobs:
                   name: lib-build
 
             - name: Publish to NPM
-              run: npx @dhis2/cli-utils release --publish npm
+              run: yarn dlx --package @dhis2/cli-utils d2-utils release --publish npm

.gitignore

@@ -2,8 +2,6 @@
 
 # dependencies
 node_modules
-.pnp
-.pnp.js
 
 # testing
 **/coverage
@@ -29,4 +27,15 @@ cli/assets
 
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log*
+
+.eslintcache
+
+# yarn2
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "search.exclude": {
+        "**/.yarn": true,
+    }
+}

.yarn/patches/@dhis2-cli-style.diff

@@ -0,0 +1,77 @@
+diff --git a/src/utils/run.js b/src/utils/run.js
+index c1347e03ddc5809405b2734c373438e08d89539a..5960280186fa7ba1edcf107f6ad916cf0eaa43c7 100644
+--- a/src/utils/run.js
++++ b/src/utils/run.js
+@@ -1,7 +1,6 @@
+ const path = require('path')
++const fs = require('fs')
+ const spawn = require('cross-spawn')
+-const findup = require('find-up')
+-const { PACKAGE_ROOT } = require('./paths.js')
+
+ exports.spawn = (cmd, args, opts) =>
+     spawn.sync(cmd, args, {
+@@ -19,17 +18,12 @@ exports.run = (cmd, { args, opts }, callback) => {
+     )
+ }
+
+-exports.bin = (cmd, { args, opts }, callback) => {
+-    const nodemodules = findup.sync('node_modules', {
+-        cwd: PACKAGE_ROOT,
+-        type: 'directory',
+-        allowSymlinks: true,
+-    })
+-
+-    const binCmd = path.join(nodemodules, '.bin', cmd)
++exports.bin = (packageName, { bin, args, opts }, callback) => {
++    const binFile = findBin(packageName, bin)
++    const yarnArgs = ['node', binFile, ...args]
+
+     return handleRun(
+-        spawn.sync(binCmd, args, {
++        spawn.sync('yarn', yarnArgs, {
+             stdio: 'inherit',
+             ...opts,
+         }),
+@@ -37,6 +31,41 @@ exports.bin = (cmd, { args, opts }, callback) => {
+     )
+ }
+
++function findBin(packageName, bin) {
++    let pkg
++    try {
++        pkg = require(`${packageName}/package.json`)
++    } catch (e) {
++        throw new Error(`Cannot resolve package ${packageName}`)
++    }
++    const pkgRoot = path.dirname(require.resolve(`${packageName}/package.json`))
++
++    const binName = bin || packageName
++    let binFile
++    if (typeof pkg.bin === 'string') {
++        if (binName === packageName) {
++            binFile = pkg.bin
++        }
++    } else {
++        binFile = pkg.bin[binName]
++    }
++
++    if (!binFile) {
++        throw new Error(
++            `No bin entry for ${binName} found in package ${packageName}`
++        )
++    }
++
++    binFile = path.join(pkgRoot, binFile)
++    if (!fs.existsSync(binFile)) {
++        throw new Error(
++            `Bin entry ${binName} in package ${packageName} points to a file which does not exist (${binFile})`
++        )
++    }
++
++    return binFile
++}
++
+ function handleRun(result, callback) {
+     if (result.error) {
+         throw result.error

.yarnrc.yml

@@ -0,0 +1,7 @@
+yarnPath: .yarn/releases/yarn-2.4.0.cjs
+packageExtensions:
+    '@dhis2/cli-utils@*':
+        dependencies:
+            '@semantic-release/error': '*'
+            aggregate-error: '*'
+            glob: '*'

adapter/package.json

@@ -17,12 +17,19 @@
         "build"
     ],
     "dependencies": {
-        "moment": "^2.24.0"
+        "moment": "^2.24.0",
+        "prop-types": "^15.7.2"
     },
     "devDependencies": {
+        "@dhis2/app-runtime": "^2.6.1",
         "@dhis2/cli-app-scripts": "5.5.0",
+        "@dhis2/d2-i18n": "^1.0.6",
+        "@dhis2/ui": "^5.7.8",
         "enzyme": "^3.11.0",
-        "enzyme-adapter-react-16": "^1.15.5"
+        "enzyme-adapter-react-16": "^1.15.5",
+        "react": "^16",
+        "react-dom": "^16",
+        "styled-jsx": "^3.3.2"
     },
     "scripts": {
         "build": "d2-app-scripts build",
@@ -34,7 +41,6 @@
         "@dhis2/ui": "^5",
         "classnames": "^2",
         "moment": "^2",
-        "prop-types": "^15",
         "react": "^16.8",
         "react-dom": "^16.8",
         "styled-jsx": "^3"

adapter/src/utils/useLocale.js

@@ -14,7 +14,9 @@ const simplifyLocale = locale => {
 
 const setGlobalLocale = locale => {
     if (locale !== 'en' && locale !== 'en-us') {
-        import(`moment/locale/${locale}`).catch(() => {
+        import(
+            /* webpackChunkName: 'moment-[request]' */ `moment/locale/${locale}`
+        ).catch(() => {
             /* ignore */
         })
     }

cli/.eslintignore

@@ -0,0 +1 @@
+assets

cli/.gitignore

@@ -0,0 +1 @@
+assets/shell.js

cli/config/rollup.config.js

@@ -12,7 +12,7 @@ const visualize = require('rollup-plugin-visualizer')
 const { reporter, chalk } = require('@dhis2/cli-helpers-engine')
 const extensions = ['.js', '.jsx', '.ts', '.tsx']
 
-const standardLibs = require('@dhis2/app-shell/package.json').dependencies
+const standardLibs = require('../assets/shell/package.json').dependencies
 
 // Exclude local app-shell dependencies
 Object.entries(standardLibs).forEach(([dep, version]) => {

cli/package.json

@@ -18,7 +18,8 @@
     "files": [
         "bin",
         "config",
-        "src"
+        "src",
+        "assets"
     ],
     "dependencies": {
         "@babel/core": "^7.6.2",
@@ -32,7 +33,6 @@
         "@babel/preset-env": "^7.9.0",
         "@babel/preset-react": "^7.0.0",
         "@babel/preset-typescript": "^7.6.0",
-        "@dhis2/app-shell": "5.5.0",
         "@dhis2/cli-helpers-engine": "^1.5.0",
         "archiver": "^3.1.1",
         "axios": "^0.20.0",
@@ -65,5 +65,9 @@
     },
     "bin": {
         "d2-app-scripts": "./bin/d2-app-scripts"
+    },
+    "scripts": {
+        "build": "yarn node ./scripts/bundle-shell.js ../shell ./assets/shell",
+        "prepack": "yarn build"
     }
 }

cli/scripts/bundle-shell.js

@@ -0,0 +1,36 @@
+/*
+ *  This utility node script is used to copy the current shell into this package for bundled publication
+ */
+
+const fs = require('fs-extra')
+const { reporter } = require('@dhis2/cli-helpers-engine')
+
+const bundleShell = (shellDir, shellAssetPath) => {
+    fs.removeSync(shellAssetPath)
+
+    fs.copySync(shellDir, shellAssetPath, {
+        filter: src => !src.match(`^${shellDir}/(node_modules|build)($|/.*)`),
+    })
+}
+
+const shellDir = process.argv[2]
+const shellAssetPath = process.argv[3]
+
+if (!shellDir || !shellAssetPath) {
+    reporter.error(
+        `Usage: yarn node ${process.argv[1]} <shellDir> <shellAssetPath>`
+    )
+    process.exit(1)
+}
+
+if (!fs.existsSync(shellDir) || !fs.statSync(shellDir).isDirectory()) {
+    reporter.error(`Path ${shellDir} does not exist or is not a directory`)
+    process.exit(2)
+}
+
+reporter.info('Bundling shell asset...')
+
+bundleShell(shellDir, shellAssetPath)
+
+reporter.info('Done!')
+process.exit(0)