Deps/upgrade deps

.appveyor.yml

@@ -11,7 +11,7 @@ environment:
       - BUILD_JOB: "scenarios_build"
 
 install:
-  - ps: Install-Product node 14.15.4 x64
+  - ps: Install-Product node 14.17.6 x64
   - cmd: appveyor-retry yarn install:all
   - cmd: appveyor-retry yarn bootstrap:remote
 

.eslintrc.yml

@@ -4,6 +4,8 @@ extends:
   - plugin:node/recommended
 rules:
   node/shebang: off
+  no-param-reassign: off
+  spaced-comment: off
 settings:
   node:
     allowModules:

.flowconfig

@@ -2,10 +2,8 @@
 <PROJECT_ROOT>/build/.*
 <PROJECT_ROOT>/coverage/.*
 <PROJECT_ROOT>/tmp/.*
-<PROJECT_ROOT>/node_modules/ach/.*
-<PROJECT_ROOT>/node_modules/config-chain/test/broken.json
-<PROJECT_ROOT>/node_modules/elm-test/.*
-<PROJECT_ROOT>/node_modules/jsverify/.*
+<PROJECT_ROOT>/node_modules/resolve/.*
+<PROJECT_ROOT>/node_modules/yargs/.*
 
 [include]
 

.github/actions/build-and-publish/action.yaml

@@ -30,17 +30,9 @@ runs:
         APPLE_ID_PASSWORD: "${{ inputs.apple-id-password }}"
       run: |
         if [ "${{ runner.os }}" == "Linux" ]; then
-          docker run --rm \
-            $(env | \
-              grep -Eo '^[^\s=]*(NODE_|ELECTRON_|YARN_|NPM_|CI|GITHUB_|CSC_|_TOKEN|_KEY)[^\s=]*' | \
-              sed 's/^/-e /;/^$/d' | \
-              paste -sd ' ' \
-            ) \
-            -v ${PWD}:/project \
-            -v ~/.cache/electron:/root/.cache/electron \
-            -v ~/.cache/electron-builder:/root/.cache/electron-builder \
-            electronuserland/builder:12 \
-            /bin/bash -c "yarn dist:all"
-        else
-          yarn dist:all
+          # Install build dependencies:
+          # - `libopenjp2-tools` for the basic build
+          # - the others for cross-compiling 32 bit apps on a 64 bit machine
+          sudo apt install --no-install-recommends -y libopenjp2-tools gcc-multilib g++-multilib
         fi
+        yarn dist:all

.github/workflows/linux.yaml

@@ -21,7 +21,7 @@ env:
   NODE_ENV: "test"
   COZY_DESKTOP_HEARTBEAT: "1000"
   DISPLAY: ":99.0"
-  NODE_VERSION: "14.16.0"
+  NODE_VERSION: "14.17.6"
   GO_VERSION: "1.17"
   COUCHDB_VERSION: "2.3.1"
 

.github/workflows/macos.yaml

@@ -22,7 +22,7 @@ env:
   NODE_ENV: "test"
   COZY_DESKTOP_HEARTBEAT: "1000"
   DISPLAY: ":99.0"
-  NODE_VERSION: "14.16.0"
+  NODE_VERSION: "14.17.6"
   GO_VERSION: "1.17"
   COUCHDB_VERSION: "2.3.1"
 

.mocharc.json

@@ -0,0 +1,17 @@
+{
+  "color": true,
+  "slow": "150",
+  "timeout": "20000",
+  "reporter": "spec",
+  "require": [
+    "./core/globals",
+    "should",
+    "should-sinon",
+    "./test/support/assertions/change",
+    "./test/support/assertions/fileContents",
+    "./test/support/assertions/pending",
+    "./test/support/assertions/timestamp",
+    "./test/support/stacktraces"
+  ],
+  "recursive": true
+}

babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['cozy-app']
+}

core/app.js

@@ -10,7 +10,7 @@ const _ = require('lodash')
 const os = require('os')
 const path = require('path')
 const url = require('url')
-const uuid = require('uuid/v4')
+const uuid = require('uuid').v4
 const https = require('https')
 const { createGzip } = require('zlib')
 const semver = require('semver')
@@ -33,6 +33,7 @@ const { LOG_FILE, LOG_FILENAME } = logger
 const sentry = require('./utils/sentry')
 const { sendToTrash } = require('./utils/fs')
 const notes = require('./utils/notes')
+const web = require('./utils/web')
 
 /*::
 import type EventEmitter from 'events'
@@ -436,6 +437,10 @@ class App {
   findNote(filePath /*: string */) {
     return notes.findNote(filePath, this)
   }
+
+  findDocument(filePath /*: string */) {
+    return web.findDocument(filePath, this)
+  }
 }
 
 module.exports = {

core/ignore.js

@@ -48,7 +48,7 @@
  */
 
 const { basename, dirname, resolve } = require('path')
-const { matcher, makeRe } = require('micromatch')
+const { matcher } = require('micromatch')
 const fs = require('fs')
 
 const logger = require('./utils/logger')
@@ -117,11 +117,9 @@ function buildPattern(line /*: string */) /*: IgnorePattern */ {
   line = line.replace(/^\\/, '') // Remove leading escaping char
   line = line.replace(/( |\t)*$/, '') // Remove trailing spaces
   // Ignore case for case insensitive file-systems
-  if (process.platform === 'darwin' || process.platform === 'win32') {
-    line = makeRe(line, { nocase: true })
-  }
-  let pattern = {
-    match: matcher(line, {}),
+  const nocase = process.platform === 'darwin' || process.platform === 'win32'
+  const pattern = {
+    match: matcher(line, { nocase }),
     basename: noslash, // The pattern can match only the basename
     folder, // The pattern will only match a folder
     negate // The pattern is negated
@@ -131,9 +129,7 @@ function buildPattern(line /*: string */) /*: IgnorePattern */ {
 
 /** Parse many lines and build the corresponding pattern array */
 function buildPatternArray(lines /*: string[] */) /*: IgnorePattern[] */ {
-  return Array.from(lines)
-    .filter(isNotBlankOrComment)
-    .map(buildPattern)
+  return Array.from(lines).filter(isNotBlankOrComment).map(buildPattern)
 }
 
 function isNotBlankOrComment(line /*: string */) /*: boolean */ {

core/local/atom/dispatch.js

@@ -120,10 +120,12 @@ async function dispatchEvent(
     try {
       await actions[event.action + event.kind](event, opts)
       try {
-        const target = (await opts.pouch.db.changes({
-          limit: 1,
-          descending: true
-        })).last_seq
+        const target = (
+          await opts.pouch.db.changes({
+            limit: 1,
+            descending: true
+          })
+        ).last_seq
         opts.events.emit('sync-target', target)
       } catch (err) {
         log.warn({ err })

core/local/atom/filter_ignored.js

@@ -100,9 +100,13 @@ function movedToIgnoredPath(event /*: AtomEvent */) /*: AtomEvent */ {
     ...event,
     action: 'deleted'
   }
+
   _.set(deletedEvent, [STEP_NAME, 'movedToIgnoredPath'], deletedEvent.path)
-  deletedEvent.path = deletedEvent.oldPath
-  delete deletedEvent.oldPath
+
+  if (deletedEvent.oldPath) {
+    deletedEvent.path = deletedEvent.oldPath
+    delete deletedEvent.oldPath
+  }
 
   return deletedEvent
 }

core/local/atom/incomplete_fixer.js

@@ -269,9 +269,8 @@ function step(
           // (e.g. a temporary document now renamed), we'll want to make sure the old
           // document is removed to avoid having 2 documents with the same inode.
           // We can do this by keeping the completing renamed event.
-          const incompleteForExistingDoc /*: ?Metadata */ = await opts.pouch.byLocalPath(
-            item.event.path
-          )
+          const incompleteForExistingDoc /*: ?Metadata */ =
+            await opts.pouch.byLocalPath(item.event.path)
           if (
             incompleteForExistingDoc &&
             !incompleteForExistingDoc.trashed &&

core/local/checksumer.js

@@ -27,12 +27,12 @@ function computeChecksum(filePath /*: string */, callback /*: Callback */) {
   const stream = fs.createReadStream(filePath)
   const checksum = crypto.createHash('md5')
   checksum.setEncoding('base64')
-  stream.on('end', function() {
+  stream.on('end', function () {
     stopMeasure()
     checksum.end()
     callback(null, checksum.read())
   })
-  stream.on('error', function(err) {
+  stream.on('error', function (err) {
     stopMeasure()
     checksum.end()
     callback(err)
@@ -69,7 +69,7 @@ function init() /*: Checksumer */ {
   // Use a queue for checksums to avoid computing many checksums at the
   // same time. It's better for performance (hard disk are faster with
   // linear readings).
-  const queue = Promise.promisifyAll(async.queue(retryComputeChecksum))
+  const queue = async.queue(retryComputeChecksum)
 
   return {
     push(filePath /*: string */) /*: Promise<string> */ {