diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b45d336eb9..975276b338 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,9 @@ jobs: - name: Update Addon run: ./update.sh ${{secrets.TOKEN}} ${{matrix.os}} + - name: Update Deps + run: npm run build:deps + - name: Build Front uses: samuelmeuli/action-electron-builder@v1 with: diff --git a/electron.js b/electron.js index 9cf4874f62..b11aeeac27 100644 --- a/electron.js +++ b/electron.js @@ -7,6 +7,9 @@ const path = require('path'); const os = require('os'); const log = require('electron-log'); const storage = require('electron-json-storage'); +const fs = require('fs'); +const readChunk = require('read-chunk'); +const fileType = require('file-type'); let userPath = app.getPath('userData'); let waitLibraryPromise; diff --git a/package.json b/package.json index b18d71e850..7c1d4a04ee 100644 --- a/package.json +++ b/package.json @@ -177,108 +177,69 @@ "dist/anytypeHelper.exe", "dist/anytypeHelper", "!node_modules/**/*", - "node_modules/builder-util-runtime", - "node_modules/js-yaml", - "node_modules/graceful-fs", - "node_modules/semver", - "node_modules/electron", - "node_modules/universalify", - "node_modules/semver", - "node_modules/fs-extra", - "node_modules/electron-updater", - "node_modules/fs-extra", - "node_modules/js-yaml", - "node_modules/semver", - "node_modules/electron-log", - "node_modules/google-protobuf", - "node_modules/js-yaml", - "node_modules/fs-extra", - "node_modules/js-yaml", - "node_modules/semver", - "node_modules/electron-log", - "node_modules/google-protobuf", - "node_modules/electron-updater", - "node_modules/jsonfile", - "node_modules/fs-extra", - "node_modules/js-yaml", - "node_modules/semver", - "node_modules/electron-updater", - "node_modules/minimatch", - "node_modules/path-is-absolute", - "node_modules/electron-util", - "node_modules/builder-util-runtime", - "node_modules/debug", - "node_modules/builder-util-runtime", - "node_modules/fs-extra", - "node_modules/at-least-node", - "node_modules/fs-extra", - "node_modules/js-yaml", - "node_modules/semver", - "node_modules/electron-updater", - "node_modules/lodash", - "node_modules/glob", - "node_modules/fs.realpath", - "node_modules/glob", - "node_modules/wrappy", - "node_modules/once", - "node_modules/signal-exit", - "node_modules/electron-util", - "node_modules/new-github-issue-url", - "node_modules/electron-util", - "node_modules/electron-is-dev", - "node_modules/electron-util", - "node_modules/debug", - "node_modules/ms", - "node_modules/debug", - "node_modules/supports-color", - "node_modules/has-flag", - "node_modules/builder-util-runtime", - "node_modules/sax", - "node_modules/graceful-fs", - "node_modules/fs-extra", - "node_modules/jsonfile", - "node_modules/fs-extra", - "node_modules/js-yaml", - "node_modules/esprima", - "node_modules/js-yaml", - "node_modules/lazy-val", - "node_modules/semver", - "node_modules/electron-updater", - "node_modules/lodash.isequal", - "node_modules/electron-updater", - "node_modules/builder-util-runtime", - "node_modules/electron-updater", - "node_modules/electron-dl", - "node_modules/unused-filename", - "node_modules/path-exists", - "node_modules/modify-filename", - "node_modules/pupa", - "node_modules/ext-name", - "node_modules/ext-list", - "node_modules/mime-db", - "node_modules/sort-keys-length", - "node_modules/sort-keys", - "node_modules/is-plain-obj", - "node_modules/electron-log", - "node_modules/electron-json-storage", "node_modules/async", - "node_modules/rimraf", - "node_modules/fs.realpath", - "node_modules/brace-expansion", - "node_modules/concat-map", + "node_modules/at-least-node", "node_modules/balanced-match", - "node_modules/inherits", - "node_modules/glob", - "node_modules/inflight", - "node_modules/mkdirp", - "node_modules/write-file-atomic", - "node_modules/imurmurhash", - "node_modules/signal-exit", - "node_modules/electron-json-storage", - "node_modules/lockfile", - "node_modules/grpc-web", "node_modules/bindings", - "node_modules/file-uri-to-path" + "node_modules/brace-expansion", + "node_modules/builder-util-runtime", + "node_modules/concat-map", + "node_modules/debug", + "node_modules/electron", + "node_modules/electron-dl", + "node_modules/electron-is-dev", + "node_modules/electron-json-storage", + "node_modules/electron-log", + "node_modules/electron-updater", + "node_modules/electron-util", + "node_modules/esprima", + "node_modules/ext-list", + "node_modules/ext-name", + "node_modules/file-type", + "node_modules/file-uri-to-path", + "node_modules/fs-extra", + "node_modules/fs.realpath", + "node_modules/glob", + "node_modules/google-protobuf", + "node_modules/graceful-fs", + "node_modules/grpc-web", + "node_modules/has-flag", + "node_modules/imurmurhash", + "node_modules/inflight", + "node_modules/inherits", + "node_modules/is-plain-obj", + "node_modules/js-yaml", + "node_modules/jsonfile", + "node_modules/lazy-val", + "node_modules/lockfile", + "node_modules/lodash", + "node_modules/lodash.isequal", + "node_modules/mime-db", + "node_modules/minimatch", + "node_modules/mkdirp", + "node_modules/modify-filename", + "node_modules/ms", + "node_modules/new-github-issue-url", + "node_modules/once", + "node_modules/p-finally", + "node_modules/p-try", + "node_modules/path-exists", + "node_modules/path-is-absolute", + "node_modules/pify", + "node_modules/pupa", + "node_modules/read-chunk", + "node_modules/rimraf", + "node_modules/sax", + "node_modules/semver", + "node_modules/signal-exit", + "node_modules/sort-keys", + "node_modules/sort-keys-length", + "node_modules/supports-color", + "node_modules/universalify", + "node_modules/unused-filename", + "node_modules/with-open-file", + "node_modules/wrappy", + "node_modules/write-file-atomic" ], "dmg": { "sign": false diff --git a/save-node-deps.js b/save-node-deps.js index d57cebdf9b..98e346dc50 100644 --- a/save-node-deps.js +++ b/save-node-deps.js @@ -10,18 +10,17 @@ stdin.on('data', function(chunk) { }); stdin.on('end', function() { - let lines = data.split('\n'); + let lines = data.split('\n').sort(); let baseDepsFile = fs.readFileSync('package.deps.json'); let baseDepsJSON = JSON.parse(baseDepsFile); let packageFile = fs.readFileSync('package.json'); let packageJSON = JSON.parse(packageFile); - + + lines = [ ...new Set(lines) ]; + packageJSON.build.files = baseDepsJSON.concat(lines).filter(function (el) { return el != ""; }); let jsonS = JSON.stringify(packageJSON, null, '\t'); fs.writeFileSync('package.json', jsonS); -}); - - - +}); \ No newline at end of file diff --git a/src/ts/lib/dispatcher.tsx b/src/ts/lib/dispatcher.tsx index 74e5442766..4ac24b1296 100644 --- a/src/ts/lib/dispatcher.tsx +++ b/src/ts/lib/dispatcher.tsx @@ -39,7 +39,9 @@ class Dispatcher { bindings.setEventHandler(handler); /// #else let serverAddr = window.require('electron').remote.getGlobal('serverAddr'); - console.log("serverAddr "+serverAddr); + + console.log('Server address: ', serverAddr); + this.service = new Service.ClientCommandsClient(serverAddr, null, null); this.stream = this.service.listenEvents(new Commands.Empty(), null); diff --git a/src/ts/lib/util.tsx b/src/ts/lib/util.tsx index 4b37650bad..f62e8c50be 100644 --- a/src/ts/lib/util.tsx +++ b/src/ts/lib/util.tsx @@ -6,13 +6,13 @@ const escapeStringRegexp = require('escape-string-regexp'); const { ipcRenderer } = window.require('electron'); const raf = require('raf'); const $ = require('jquery'); -const loadImage = window.require('blueimp-load-image'); +const loadImage = require('blueimp-load-image'); const fs = window.require('fs'); const readChunk = window.require('read-chunk'); const fileType = window.require('file-type'); const Constant = require('json/constant.json'); const os = window.require('os'); -const sprintf = window.require('sprintf-kit')({ +const sprintf = require('sprintf-kit')({ d: require('sprintf-kit/modifiers/d'), s: require('sprintf-kit/modifiers/s'), f: require('sprintf-kit/modifiers/f'), @@ -157,7 +157,6 @@ class Util { let buffer = readChunk.sync(path, 0, stat.size); let type = fileType(buffer); let file = new File([ new Blob([ buffer ]) ], fn[fn.length - 1], { type: type.mime }); - return file; };