Browse Source

Merge pull request #9240 from nocodb/chore/comment-remove

chore: comment remove & target local nocodb-sdk
pull/9241/head
Pranav C 3 months ago committed by GitHub
parent
commit
0d8e793cce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      .github/workflows/release-npm.yml
  2. 2
      packages/nc-gui/package.json
  3. 2
      packages/nocodb/package.json
  4. 1
      packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts
  5. 4
      pnpm-lock.yaml

6
.github/workflows/release-npm.yml

@ -61,12 +61,12 @@ jobs:
fi fi
echo $NOCODB_SDK_PKG_NAME echo $NOCODB_SDK_PKG_NAME
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js && targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js &&
pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile --ignore-workspace && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build && pnpm --filter=${NOCODB_SDK_PKG_NAME} publish --no-git-checks && # pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile --ignore-workspace && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build && pnpm --filter=${NOCODB_SDK_PKG_NAME} publish --no-git-checks &&
sleep 90 && # sleep 90 &&
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js && targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js &&
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNcGuiVersion.js && targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNcGuiVersion.js &&
pnpm --filter=nc-gui install --ignore-scripts --no-frozen-lockfile && pnpm --filter=nc-gui install --ignore-scripts --no-frozen-lockfile &&
# targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} pnpm --filter=nc-gui run build:copy:publish --no-git-checks && targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} pnpm --filter=nc-gui run build:copy:publish --no-git-checks &&
sleep 90 && sleep 90 &&
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNcGui.js && cd packages/nocodb && pnpm run obfuscate:build:publish --no-git-checks targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNcGui.js && cd packages/nocodb && pnpm run obfuscate:build:publish --no-git-checks
env: env:

2
packages/nc-gui/package.json

@ -79,7 +79,7 @@
"marked": "^4.3.0", "marked": "^4.3.0",
"monaco-editor": "^0.50.0", "monaco-editor": "^0.50.0",
"monaco-sql-languages": "^0.11.0", "monaco-sql-languages": "^0.11.0",
"nocodb-sdk": "0.253.0", "nocodb-sdk": "workspace:^",
"papaparse": "^5.4.1", "papaparse": "^5.4.1",
"parse-github-url": "^1.0.2", "parse-github-url": "^1.0.2",
"pdfobject": "^2.3.0", "pdfobject": "^2.3.0",

2
packages/nocodb/package.json

@ -125,7 +125,7 @@
"nc-help": "0.3.4", "nc-help": "0.3.4",
"nc-lib-gui": "0.253.0", "nc-lib-gui": "0.253.0",
"nestjs-throttler-storage-redis": "^0.4.4", "nestjs-throttler-storage-redis": "^0.4.4",
"nocodb-sdk": "0.253.0", "nocodb-sdk": "workspace:^",
"nodemailer": "^6.9.13", "nodemailer": "^6.9.13",
"object-hash": "^3.0.0", "object-hash": "^3.0.0",
"object-sizeof": "^2.6.4", "object-sizeof": "^2.6.4",

1
packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts

@ -176,7 +176,6 @@ export class ImportService {
: true), : true),
); );
// create table with static columns
const table = const table =
param.existingModel || param.existingModel ||
(await this.tablesService.tableCreate(context, { (await this.tablesService.tableCreate(context, {

4
pnpm-lock.yaml

@ -167,7 +167,7 @@ importers:
specifier: ^0.11.0 specifier: ^0.11.0
version: 0.11.0 version: 0.11.0
nocodb-sdk: nocodb-sdk:
specifier: 0.253.0 specifier: workspace:^
version: link:../nocodb-sdk version: link:../nocodb-sdk
papaparse: papaparse:
specifier: ^5.4.1 specifier: ^5.4.1
@ -712,7 +712,7 @@ importers:
specifier: ^0.4.4 specifier: ^0.4.4
version: 0.4.4(@nestjs/common@10.3.8)(@nestjs/core@10.3.8)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1) version: 0.4.4(@nestjs/common@10.3.8)(@nestjs/core@10.3.8)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1)
nocodb-sdk: nocodb-sdk:
specifier: 0.253.0 specifier: workspace:^
version: link:../nocodb-sdk version: link:../nocodb-sdk
nodemailer: nodemailer:
specifier: ^6.9.13 specifier: ^6.9.13

Loading…
Cancel
Save