Browse Source

Merge branch 'develop' into refactor/timezone-locale

pull/5601/head
Wing-Kam Wong 2 years ago
parent
commit
54caf7678d
  1. 2
      packages/nc-gui/package-lock.json
  2. 2
      packages/nc-lib-gui/package.json
  3. 4
      packages/nocodb-sdk/package-lock.json
  4. 4
      packages/nocodb-sdk/package.json
  5. 20
      packages/nocodb/package-lock.json
  6. 5
      packages/nocodb/package.json
  7. 7
      packages/nocodb/src/run/docker.ts

2
packages/nc-gui/package-lock.json generated

@ -110,7 +110,7 @@
}
},
"../nocodb-sdk": {
"version": "0.106.1",
"version": "0.107.0-beta.0",
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",

2
packages/nc-lib-gui/package.json

@ -1,6 +1,6 @@
{
"name": "nc-lib-gui",
"version": "0.106.1",
"version": "0.107.0-beta.0",
"description": "NocoDB GUI",
"author": {
"name": "NocoDB",

4
packages/nocodb-sdk/package-lock.json generated

@ -1,12 +1,12 @@
{
"name": "nocodb-sdk",
"version": "0.106.1",
"version": "0.107.0-beta.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nocodb-sdk",
"version": "0.106.1",
"version": "0.107.0-beta.0",
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",

4
packages/nocodb-sdk/package.json

@ -1,6 +1,6 @@
{
"name": "nocodb-sdk",
"version": "0.106.1",
"version": "0.107.0-beta.0",
"description": "NocoDB SDK",
"main": "build/main/index.js",
"typings": "build/main/index.d.ts",
@ -63,4 +63,4 @@
"prettier": {
"singleQuote": true
}
}
}

20
packages/nocodb/package-lock.json generated

@ -1,12 +1,12 @@
{
"name": "nocodb",
"version": "0.106.1",
"version": "0.107.0-beta.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nocodb",
"version": "0.106.1",
"version": "0.107.0-beta.0",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@google-cloud/storage": "^5.7.2",
@ -75,7 +75,7 @@
"mysql2": "^3.2.0",
"nanoid": "^3.1.20",
"nc-help": "^0.2.87",
"nc-lib-gui": "0.106.0",
"nc-lib-gui": "0.107.0-beta.0",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",
@ -148,7 +148,7 @@
}
},
"../nocodb-sdk": {
"version": "0.106.1",
"version": "0.107.0-beta.0",
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",
@ -13016,9 +13016,9 @@
}
},
"node_modules/nc-lib-gui": {
"version": "0.106.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0.tgz",
"integrity": "sha512-BZDheNWKi+iKo5MfOKaxmYT6piNQ3K6SgrH3lH5PhTGzjN9dM+xs0Y+Wgo8r8rjNQj6pNEB17IuMZK3amCntxQ==",
"version": "0.107.0-beta.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.107.0-beta.0.tgz",
"integrity": "sha512-MyfFETnqNwDtkIbu9NRhNOXsLz0M/8wMGeP92ei8oodr0m++zwdM6lcpd6KeCz5AO+sNWQDMwN8MnWh+12dEQg==",
"dependencies": {
"express": "^4.17.1"
}
@ -28204,9 +28204,9 @@
}
},
"nc-lib-gui": {
"version": "0.106.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.106.0.tgz",
"integrity": "sha512-BZDheNWKi+iKo5MfOKaxmYT6piNQ3K6SgrH3lH5PhTGzjN9dM+xs0Y+Wgo8r8rjNQj6pNEB17IuMZK3amCntxQ==",
"version": "0.107.0-beta.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.107.0-beta.0.tgz",
"integrity": "sha512-MyfFETnqNwDtkIbu9NRhNOXsLz0M/8wMGeP92ei8oodr0m++zwdM6lcpd6KeCz5AO+sNWQDMwN8MnWh+12dEQg==",
"requires": {
"express": "^4.17.1"
}

5
packages/nocodb/package.json

@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.106.1",
"version": "0.107.0-beta.0",
"description": "NocoDB Backend",
"main": "dist/bundle.js",
"author": {
@ -31,6 +31,7 @@
"test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json",
"watch:run": "cross-env NC_DISABLE_TELE=true EE=true nodemon -e ts,js -w ./src -x \"ts-node src/run/docker --log-error --project tsconfig.json\"",
"watch:run:playwright": "rm -f ./test_noco.db; cross-env DATABASE_URL=sqlite:./test_noco.db PLAYWRIGHT_TEST=true NC_DISABLE_TELE=true EE=true nodemon -e ts,js -w ./src -x \"ts-node src/run/testDocker --log-error --project tsconfig.json\"",
"watch:run:playwright:quick": "rm -f ./test_noco.db; cp ../../tests/playwright/fixtures/noco_0_91_7.db ./test_noco.db; cross-env DATABASE_URL=sqlite:./test_noco.db NC_DISABLE_TELE=true EE=true nodemon -e ts,js -w ./src -x \"ts-node src/run/docker --log-error --project tsconfig.json\"",
"watch:run:playwright:pg:cyquick": "rm -f ./test_noco.db; cp ../../tests/playwright/fixtures/noco_0_91_7.db ./test_noco.db; cross-env NC_DISABLE_TELE=true EE=true nodemon -e ts,js -w ./src -x \"ts-node src/run/dockerRunPG_CyQuick.ts --log-error --project tsconfig.json\"",
@ -105,7 +106,7 @@
"mysql2": "^3.2.0",
"nanoid": "^3.1.20",
"nc-help": "^0.2.87",
"nc-lib-gui": "0.106.0",
"nc-lib-gui": "0.107.0-beta.0",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",

7
packages/nocodb/src/run/docker.ts

@ -17,13 +17,6 @@ server.set('view engine', 'ejs');
process.env[`DEBUG`] = 'xc*';
// (async () => {
// await nocobuild(server);
// const httpServer = server.listen(process.env.PORT || 8080, async () => {
// console.log('Server started');
// });
// })().catch((e) => console.log(e));
(async () => {
const httpServer = server.listen(process.env.PORT || 8080, async () => {
server.use(await Noco.init({}, httpServer, server));

Loading…
Cancel
Save