chore: update react-scripts and cli-style

dhis2 · Oct 30, 2020 · 3000b18 · 3000b18
1 parent 3edcce2
commit 3000b18
Show file tree

Hide file tree

Showing 9 changed files with 8,258 additions and 4,230 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,5 @@
 /cli/assets
 **/locales/index.js
+cli/config/init.entrypoint.js
+cli/config/init.App.test.js
+
diff --git a/cli/src/lib/bundleApp.js b/cli/src/lib/bundleApp.js
@@ -12,20 +12,20 @@ module.exports = (inDir, outFile) => {
             zlib: { level: 9 },
         })
 
-        output.on('close', function() {
+        output.on('close', function () {
             reporter.print(chalk.dim(`Total size: ${archive.pointer()} bytes`))
             resolve()
         })
 
-        archive.on('warning', function(err) {
+        archive.on('warning', function (err) {
             if (err.code === 'ENOENT') {
                 reporter.warn('[bundler]', err)
             } else {
                 reject(err)
             }
         })
 
-        archive.on('error', function(err) {
+        archive.on('error', function (err) {
             reject(err)
         })
 

diff --git a/cli/src/lib/compiler/compileLibrary.js b/cli/src/lib/compiler/compileLibrary.js
@@ -109,7 +109,7 @@ const compileLibrary = async ({ config, paths, mode, watch }) => {
                 }
             })
 
-            process.on('SIGINT', function() {
+            process.on('SIGINT', function () {
                 reporter.debug('Caught interrupt signal')
                 watcher.close()
             })

diff --git a/cli/src/lib/generateManifest.js b/cli/src/lib/generateManifest.js
@@ -17,7 +17,7 @@ module.exports = (paths, config, publicUrl) => {
             },
         },
         icons: {
-            '48': 'dhis2-app-icon.png',
+            48: 'dhis2-app-icon.png',
         },
         developer: config.author,
 

diff --git a/examples/simple-app/yarn.lock b/examples/simple-app/yarn.lock
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
         ]
     },
     "devDependencies": {
-        "@dhis2/cli-style": "^6.0.0",
+        "@dhis2/cli-style": "^7.2.1",
         "@dhis2/cli-utils-docsite": "^2.0.2",
         "concurrently": "^5.0.0"
     },

diff --git a/shell/.env b/shell/.env
@@ -1,2 +1 @@
 SKIP_PREFLIGHT_CHECK=true
-EXTEND_ESLINT=false
diff --git a/shell/package.json b/shell/package.json
@@ -21,7 +21,7 @@
         "prop-types": "^15.7.2",
         "react": "^16.8.6",
         "react-dom": "^16.8.6",
-        "react-scripts": "^3.3.0",
+        "react-scripts": "^4.0.0",
         "source-map-explorer": "^2.1.0",
         "styled-jsx": "^3.2.2",
         "typeface-roboto": "^0.0.75",

diff --git a/yarn.lock b/yarn.lock