ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-31 16:35:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #817 from balena-io/balena-sync

Browse Source 
Switch from resin-sync to balena-sync, update knex, sqlite3, lodash, coffee-coverage
This commit is contained in:
Pablo Carranza Vélez 2018-12-12 14:08:44 -03:00 committed by GitHub
commit 057f62fcbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1075 additions and 1968 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardcode-migrations.js
View File

@ -4,6 +4,6 @@
module.exports = function (source) { module.exports = function (source) {
return source return source
.toString() .toString()
.replace(/require\(_path2\.default\.join\(_?this\._absoluteConfigDir\(\), name\)\);/g, "require('./migrations/' + name);")
.replace("require(directory + '/' + name);", "require('./migrations/' + name);") .replace("require(directory + '/' + name);", "require('./migrations/' + name);")
.replace("require(_path2.default.join(this._absoluteConfigDir(), name));", "require('./migrations/' + name);")
} }

3016
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
package.json
View File

@ -23,7 +23,7 @@
}, },
"private": "true", "private": "true",
"dependencies": { "dependencies": {
"sqlite3": "^3.1.0" "sqlite3": "^4.0.4"
}, },
"engines": { "engines": {
"node": "^6.13.1" "node": "^6.13.1"
@ -59,10 +59,10 @@
"husky": "^1.1.3", "husky": "^1.1.3",
"istanbul": "^0.4.5", "istanbul": "^0.4.5",
"json-mask": "^0.3.8", "json-mask": "^0.3.8",
"knex": "~0.12.3", "knex": "~0.15.2",
"lint-staged": "^8.0.4", "lint-staged": "^8.0.4",
"lockfile": "^1.0.1", "lockfile": "^1.0.1",
"lodash": "^4.16.3", "lodash": "^4.17.5",
"log-timestamp": "^0.1.2", "log-timestamp": "^0.1.2",
"memoizee": "^0.4.1", "memoizee": "^0.4.1",
"mixpanel": "^0.10.1", "mixpanel": "^0.10.1",
@ -73,11 +73,10 @@
"network-checker": "^0.1.1", "network-checker": "^0.1.1",
"pinejs-client": "^2.4.0", "pinejs-client": "^2.4.0",
"prettier": "^1.14.3", "prettier": "^1.14.3",
"register-coffee-coverage": "0.0.1",
"request": "^2.51.0", "request": "^2.51.0",
"resin-lint": "^2.0.1", "resin-lint": "^2.0.1",
"resin-register-device": "^3.0.0", "resin-register-device": "^3.0.0",
"resin-sync": "^9.3.0", "balena-sync": "^10.0.0",
"resumable-request": "^2.0.0", "resumable-request": "^2.0.0",
"rwlock": "^5.0.0", "rwlock": "^5.0.0",
"shell-quote": "^1.6.1", "shell-quote": "^1.6.1",

10
src/migrations/20181907164000-endpoint-specific-logschannel.js
View File

@ -26,9 +26,13 @@ exports.up = function (knex, Promise) {
.tap(() => { .tap(() => {
// take the logsChannelSecret, and the apiEndpoint config field, // take the logsChannelSecret, and the apiEndpoint config field,
// and store them in a new table // and store them in a new table
return knex.schema.createTableIfNotExists('logsChannelSecret', (t) => { return knex.schema.hasTable('logsChannelSecret').then((exists) => {
t.string('backend'); if (!exists) {
t.string('secret'); return knex.schema.createTable('logsChannelSecret', (t) => {
t.string('backend');
t.string('secret');
});
}
}); });
}) })
.then((config) => { .then((config) => {

2
sync.js
View File

@ -11,7 +11,7 @@
fs = require('fs'); fs = require('fs');
doSync = require('resin-sync').sync('local-resin-os-device').sync; doSync = require('balena-sync').sync('local-resin-os-device').sync;
// Avoid a super confusing error where the cwd doesn't exist // Avoid a super confusing error where the cwd doesn't exist
dir = __dirname + '/dist'; dir = __dirname + '/dist';

4
webpack.config.js
View File

@ -16,7 +16,9 @@ var externalModules = [
'strong-oracle', 'strong-oracle',
'oracle', 'oracle',
'oracledb', 'oracledb',
'pg-query-stream' 'pg-query-stream',
'tedious',
/mssql\/.*/
] ]
var requiredModules = [] var requiredModules = []