Skip to content

Commit 1264a8e

Browse files
hanshuaihanshuai
authored
Merge pull request lowcoder-org#277 from sarike/chore-build
fix build error
2 parents 172a756 + b0d87b8 commit 1264a8e

File tree

3 files changed

+192
-4
lines changed

3 files changed

+192
-4
lines changed

‎server/node-service/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
"dev": "nodemon --files src/server.ts",
1111
"start": "node ./build/src/server.js",
1212
"test": "jest",
13-
"build": "rm -rf build/ && yarn test && tsc && cp -r src/static build/src/static"
13+
"build": "rm -rf build/ && tsc && yarn run copy",
14+
"copy": "copyfiles -u 1 src/**/*.!(ts|test.ts) build/src"
1415
},
1516
"devDependencies": {
1617
"@types/jest": "^29.2.4",
18+
"copyfiles": "^2.4.1",
1719
"jest": "^29.3.1",
1820
"nock": "^13.3.0",
1921
"nodemon": "^2.0.20",

‎server/node-service/src/plugins/index.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { DataSourcePlugin, DataSourcePluginFactory } from "openblocks-sdk/dataSource";
2-
import helloWorldPlugin from "./hello-world";
32
import s3Plugin from "./s3";
43
import n8nPlugin from "./n8n";
54
import openApiPlugin from "./openApi";
@@ -12,8 +11,7 @@ import athenaPlugin from "./athena";
1211
import lambdaPlugin from "./lambda";
1312
import googleCloudStorage from "./googleCloudStorage";
1413

15-
const plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
16-
// helloWorldPlugin,
14+
let plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
1715
s3Plugin,
1816
openApiPlugin,
1917
n8nPlugin,
@@ -27,4 +25,9 @@ const plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
2725
googleCloudStorage,
2826
];
2927

28+
try {
29+
plugins = require("../ee/plugins").default;
30+
console.info("using ee plugins");
31+
} catch {}
32+
3033
export default plugins;

‎server/node-service/yarn.lock

Lines changed: 183 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5750,13 +5750,38 @@ __metadata:
57505750
languageName: node
57515751
linkType: hard
57525752

5753+
"copyfiles@npm:^2.4.1":
5754+
version: 2.4.1
5755+
resolution: "copyfiles@npm:2.4.1"
5756+
dependencies:
5757+
glob: ^7.0.5
5758+
minimatch: ^3.0.3
5759+
mkdirp: ^1.0.4
5760+
noms: 0.0.0
5761+
through2: ^2.0.1
5762+
untildify: ^4.0.0
5763+
yargs: ^16.1.0
5764+
bin:
5765+
copyfiles: copyfiles
5766+
copyup: copyfiles
5767+
checksum: aea69873bb99cc5f553967660cbfb70e4eeda198f572a36fb0f748b36877ff2c90fd906c58b1d540adbad8afa8ee82820172f1c18e69736f7ab52792c12745a7
5768+
languageName: node
5769+
linkType: hard
5770+
57535771
"core-js-pure@npm:^3.25.1":
57545772
version: 3.27.1
57555773
resolution: "core-js-pure@npm:3.27.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fcore-js-pure%2F-%2Fcore-js-pure-3.27.1.tgz"
57565774
checksum: 571ff8ffc00cba7c1937e70b502a382317d450ef3a38835b0dc4a6a9645ce9853c10a90f71a2027901fb52690a7ba702396f29e125d1b9d6ae3e277db1bcdf57
57575775
languageName: node
57585776
linkType: hard
57595777

5778+
"core-util-is@npm:~1.0.0":
5779+
version: 1.0.3
5780+
resolution: "core-util-is@npm:1.0.3"
5781+
checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
5782+
languageName: node
5783+
linkType: hard
5784+
57605785
"create-require@npm:^1.1.0":
57615786
version: 1.1.1
57625787
resolution: "create-require@npm:1.1.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fcreate-require%2F-%2Fcreate-require-1.1.1.tgz"
@@ -6635,6 +6660,20 @@ __metadata:
66356660
languageName: node
66366661
linkType: hard
66376662

6663+
"glob@npm:^7.0.5":
6664+
version: 7.2.3
6665+
resolution: "glob@npm:7.2.3"
6666+
dependencies:
6667+
fs.realpath: ^1.0.0
6668+
inflight: ^1.0.4
6669+
inherits: 2
6670+
minimatch: ^3.1.1
6671+
once: ^1.3.0
6672+
path-is-absolute: ^1.0.0
6673+
checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
6674+
languageName: node
6675+
linkType: hard
6676+
66386677
"glob@npm:^7.1.3, glob@npm:^7.1.4":
66396678
version: 7.2.3
66406679
resolution: "glob@npm:7.2.3::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fglob%2F-%2Fglob-7.2.3.tgz"
@@ -6937,6 +6976,13 @@ __metadata:
69376976
languageName: node
69386977
linkType: hard
69396978

6979+
"inherits@npm:^2.0.1, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
6980+
version: 2.0.4
6981+
resolution: "inherits@npm:2.0.4"
6982+
checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
6983+
languageName: node
6984+
linkType: hard
6985+
69406986
"intl-messageformat@npm:^10.2.1":
69416987
version: 10.2.5
69426988
resolution: "intl-messageformat@npm:10.2.5::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fintl-messageformat%2F-%2Fintl-messageformat-10.2.5.tgz"
@@ -7078,6 +7124,20 @@ __metadata:
70787124
languageName: node
70797125
linkType: hard
70807126

7127+
"isarray@npm:0.0.1":
7128+
version: 0.0.1
7129+
resolution: "isarray@npm:0.0.1"
7130+
checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
7131+
languageName: node
7132+
linkType: hard
7133+
7134+
"isarray@npm:~1.0.0":
7135+
version: 1.0.0
7136+
resolution: "isarray@npm:1.0.0"
7137+
checksum: f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
7138+
languageName: node
7139+
linkType: hard
7140+
70817141
"isexe@npm:^2.0.0":
70827142
version: 2.0.0
70837143
resolution: "isexe@npm:2.0.0::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fisexe%2F-%2Fisexe-2.0.0.tgz"
@@ -8128,6 +8188,15 @@ __metadata:
81288188
languageName: node
81298189
linkType: hard
81308190

8191+
"minimatch@npm:^3.0.3":
8192+
version: 3.1.2
8193+
resolution: "minimatch@npm:3.1.2"
8194+
dependencies:
8195+
brace-expansion: ^1.1.7
8196+
checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a
8197+
languageName: node
8198+
linkType: hard
8199+
81318200
"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
81328201
version: 3.1.2
81338202
resolution: "minimatch@npm:3.1.2::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fminimatch%2F-%2Fminimatch-3.1.2.tgz"
@@ -8406,6 +8475,16 @@ __metadata:
84068475
languageName: node
84078476
linkType: hard
84088477

8478+
"noms@npm:0.0.0":
8479+
version: 0.0.0
8480+
resolution: "noms@npm:0.0.0"
8481+
dependencies:
8482+
inherits: ^2.0.1
8483+
readable-stream: ~1.0.31
8484+
checksum: a05f056dabf764c86472b6b5aad10455f3adcb6971f366cdf36a72b559b29310a940e316bca30802f2804fdd41707941366224f4cba80c4f53071512245bf200
8485+
languageName: node
8486+
linkType: hard
8487+
84098488
"nopt@npm:^6.0.0":
84108489
version: 6.0.0
84118490
resolution: "nopt@npm:6.0.0::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fnopt%2F-%2Fnopt-6.0.0.tgz"
@@ -8718,6 +8797,13 @@ __metadata:
87188797
languageName: node
87198798
linkType: hard
87208799

8800+
"process-nextick-args@npm:~2.0.0":
8801+
version: 2.0.1
8802+
resolution: "process-nextick-args@npm:2.0.1"
8803+
checksum: 1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf
8804+
languageName: node
8805+
linkType: hard
8806+
87218807
"promise-inflight@npm:^1.0.1":
87228808
version: 1.0.1
87238809
resolution: "promise-inflight@npm:1.0.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fpromise-inflight%2F-%2Fpromise-inflight-1.0.1.tgz"
@@ -8902,6 +8988,33 @@ __metadata:
89028988
languageName: node
89038989
linkType: hard
89048990

8991+
"readable-stream@npm:~1.0.31":
8992+
version: 1.0.34
8993+
resolution: "readable-stream@npm:1.0.34"
8994+
dependencies:
8995+
core-util-is: ~1.0.0
8996+
inherits: ~2.0.1
8997+
isarray: 0.0.1
8998+
string_decoder: ~0.10.x
8999+
checksum: 85042c537e4f067daa1448a7e257a201070bfec3dd2706abdbd8ebc7f3418eb4d3ed4b8e5af63e2544d69f88ab09c28d5da3c0b77dc76185fddd189a59863b60
9000+
languageName: node
9001+
linkType: hard
9002+
9003+
"readable-stream@npm:~2.3.6":
9004+
version: 2.3.7
9005+
resolution: "readable-stream@npm:2.3.7"
9006+
dependencies:
9007+
core-util-is: ~1.0.0
9008+
inherits: ~2.0.3
9009+
isarray: ~1.0.0
9010+
process-nextick-args: ~2.0.0
9011+
safe-buffer: ~5.1.1
9012+
string_decoder: ~1.1.1
9013+
util-deprecate: ~1.0.1
9014+
checksum: e4920cf7549a60f8aaf694d483a0e61b2a878b969d224f89b3bc788b8d920075132c4b55a7494ee944c7b6a9a0eada28a7f6220d80b0312ece70bbf08eeca755
9015+
languageName: node
9016+
linkType: hard
9017+
89059018
"readdirp@npm:~3.6.0":
89069019
version: 3.6.0
89079020
resolution: "readdirp@npm:3.6.0::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Freaddirp%2F-%2Freaddirp-3.6.0.tgz"
@@ -9039,6 +9152,13 @@ __metadata:
90399152
languageName: node
90409153
linkType: hard
90419154

9155+
"safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
9156+
version: 5.1.2
9157+
resolution: "safe-buffer@npm:5.1.2"
9158+
checksum: f2f1f7943ca44a594893a852894055cf619c1fbcb611237fc39e461ae751187e7baf4dc391a72125e0ac4fb2d8c5c0b3c71529622e6a58f46b960211e704903c
9159+
languageName: node
9160+
linkType: hard
9161+
90429162
"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
90439163
version: 2.1.2
90449164
resolution: "safer-buffer@npm:2.1.2::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fsafer-buffer%2F-%2Fsafer-buffer-2.1.2.tgz"
@@ -9327,6 +9447,22 @@ __metadata:
93279447
languageName: node
93289448
linkType: hard
93299449

9450+
"string_decoder@npm:~0.10.x":
9451+
version: 0.10.31
9452+
resolution: "string_decoder@npm:0.10.31"
9453+
checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202
9454+
languageName: node
9455+
linkType: hard
9456+
9457+
"string_decoder@npm:~1.1.1":
9458+
version: 1.1.1
9459+
resolution: "string_decoder@npm:1.1.1"
9460+
dependencies:
9461+
safe-buffer: ~5.1.0
9462+
checksum: 9ab7e56f9d60a28f2be697419917c50cac19f3e8e6c28ef26ed5f4852289fe0de5d6997d29becf59028556f2c62983790c1d9ba1e2a3cc401768ca12d5183a5b
9463+
languageName: node
9464+
linkType: hard
9465+
93309466
"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
93319467
version: 6.0.1
93329468
resolution: "strip-ansi@npm:6.0.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fstrip-ansi%2F-%2Fstrip-ansi-6.0.1.tgz"
@@ -9468,6 +9604,7 @@ __metadata:
94689604
"@types/morgan": ^1.9.3
94699605
"@types/node": ^18.11.18
94709606
axios: ^1.2.0
9607+
copyfiles: ^2.4.1
94719608
dynamodb-data-types: ^4.0.1
94729609
express: ^4.18.2
94739610
express-async-errors: ^3.1.1
@@ -9538,6 +9675,16 @@ __metadata:
95389675
languageName: node
95399676
linkType: hard
95409677

9678+
"through2@npm:^2.0.1":
9679+
version: 2.0.5
9680+
resolution: "through2@npm:2.0.5"
9681+
dependencies:
9682+
readable-stream: ~2.3.6
9683+
xtend: ~4.0.1
9684+
checksum: beb0f338aa2931e5660ec7bf3ad949e6d2e068c31f4737b9525e5201b824ac40cac6a337224856b56bd1ddd866334bbfb92a9f57cd6f66bc3f18d3d86fc0fe50
9685+
languageName: node
9686+
linkType: hard
9687+
95419688
"tmp@npm:^0.2.1":
95429689
version: 0.2.1
95439690
resolution: "tmp@npm:0.2.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Ftmp%2F-%2Ftmp-0.2.1.tgz"
@@ -9816,6 +9963,13 @@ __metadata:
98169963
languageName: node
98179964
linkType: hard
98189965

9966+
"untildify@npm:^4.0.0":
9967+
version: 4.0.0
9968+
resolution: "untildify@npm:4.0.0"
9969+
checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9
9970+
languageName: node
9971+
linkType: hard
9972+
98199973
"update-browserslist-db@npm:^1.0.9":
98209974
version: 1.0.10
98219975
resolution: "update-browserslist-db@npm:1.0.10::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fupdate-browserslist-db%2F-%2Fupdate-browserslist-db-1.0.10.tgz"
@@ -9856,6 +10010,13 @@ __metadata:
985610010
languageName: node
985710011
linkType: hard
985810012

10013+
"util-deprecate@npm:~1.0.1":
10014+
version: 1.0.2
10015+
resolution: "util-deprecate@npm:1.0.2"
10016+
checksum: 474acf1146cb2701fe3b074892217553dfcf9a031280919ba1b8d651a068c9b15d863b7303cb15bd00a862b498e6cf4ad7b4a08fb134edd5a6f7641681cb54a2
10017+
languageName: node
10018+
linkType: hard
10019+
985910020
"utils-merge@npm:1.0.1":
986010021
version: 1.0.1
986110022
resolution: "utils-merge@npm:1.0.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Futils-merge%2F-%2Futils-merge-1.0.1.tgz"
@@ -10019,6 +10180,13 @@ __metadata:
1001910180
languageName: node
1002010181
linkType: hard
1002110182

10183+
"xtend@npm:~4.0.1":
10184+
version: 4.0.2
10185+
resolution: "xtend@npm:4.0.2"
10186+
checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
10187+
languageName: node
10188+
linkType: hard
10189+
1002210190
"y18n@npm:^5.0.5":
1002310191
version: 5.0.8
1002410192
resolution: "y18n@npm:5.0.8::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fy18n%2F-%2Fy18n-5.0.8.tgz"
@@ -10068,6 +10236,21 @@ __metadata:
1006810236
languageName: node
1006910237
linkType: hard
1007010238

10239+
"yargs@npm:^16.1.0":
10240+
version: 16.2.0
10241+
resolution: "yargs@npm:16.2.0"
10242+
dependencies:
10243+
cliui: ^7.0.2
10244+
escalade: ^3.1.1
10245+
get-caller-file: ^2.0.5
10246+
require-directory: ^2.1.1
10247+
string-width: ^4.2.0
10248+
y18n: ^5.0.5
10249+
yargs-parser: ^20.2.2
10250+
checksum: b14afbb51e3251a204d81937c86a7e9d4bdbf9a2bcee38226c900d00f522969ab675703bee2a6f99f8e20103f608382936034e64d921b74df82b63c07c5e8f59
10251+
languageName: node
10252+
linkType: hard
10253+
1007110254
"yargs@npm:^16.2.0":
1007210255
version: 16.2.0
1007310256
resolution: "yargs@npm:16.2.0::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fyargs%2F-%2Fyargs-16.2.0.tgz"

0 commit comments

Comments
 (0)