Merge pull request #2191 from balena-os/update-knex-sqlite

Update knex and sqlite to latest versions
This commit is contained in:
flowzone-app[bot] 2023-08-21 16:16:38 +00:00 committed by GitHub
commit dfc602afcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1406 additions and 2333 deletions

View File

@ -5,9 +5,12 @@ module.exports = function (source) {
return ( return (
source source
.toString() .toString()
// IMPORTANT: this is known to work with knex v0.95.15. It will most likely break // IMPORTANT: this is known to work with knex v2.5.0. It will most likely break
// if knex is upgraded. This is really a hack and should be replaced by a more sustainable // if knex is upgraded. This is really a hack and should be replaced by a more sustainable
// webpack configuration. // webpack configuration.
.replace('importFile(_path)', "require('./migrations/'+migration.file)") .replace(
'importFile(_path)',
"require('./migrations/'+migrationsInfo.file)",
)
); );
}; };

3723
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -36,7 +36,7 @@
"got": "^12.5.3", "got": "^12.5.3",
"mdns-resolver": "^1.0.0", "mdns-resolver": "^1.0.0",
"semver": "^7.3.2", "semver": "^7.3.2",
"sqlite3": "^5.0.11", "sqlite3": "^5.1.6",
"systeminformation": "^5.6.10" "systeminformation": "^5.6.10"
}, },
"engines": { "engines": {
@ -101,7 +101,7 @@
"io-ts": "^2.2.10", "io-ts": "^2.2.10",
"io-ts-reporters": "^1.2.2", "io-ts-reporters": "^1.2.2",
"json-mask": "^0.3.9", "json-mask": "^0.3.9",
"knex": "^0.95.15", "knex": "^2.5.1",
"lint-staged": "^13.0.3", "lint-staged": "^13.0.3",
"livepush": "^3.5.1", "livepush": "^3.5.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",

View File

@ -19,6 +19,7 @@ var externalModules = [
'oracledb', 'oracledb',
'pg-query-stream', 'pg-query-stream',
'tedious', 'tedious',
'better-sqlite3',
/mssql\/.*/, /mssql\/.*/,
'osx-temperature-sensor', 'osx-temperature-sensor',
'@balena/systemd', '@balena/systemd',
@ -104,8 +105,8 @@ module.exports = function (env) {
include: [ include: [
new RegExp( new RegExp(
_.escapeRegExp( _.escapeRegExp(
// this is the path as of knex@0.95.15 // this is the path as of knex@2.5.1
path.join('knex', 'lib', 'migrations', 'migrate', 'sources'), path.join('knex', 'lib', 'migrations', 'common'),
), ),
), ),
], ],