github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

fix: rspack config sync

DarkPhoenix2704 2 weeks ago
parent
d8cdf9ffbf
commit
8875931e52
No known key found for this signature in database
GPG Key ID: 3F76B10622A07849
9 changed files with 66 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      packages/nocodb/docker/rspack.config.js
  2. 3
      packages/nocodb/package.json
  3. 5
      packages/nocodb/rspack.cli.config.js
  4. 5
      packages/nocodb/rspack.config.js
  5. 5
      packages/nocodb/rspack.dev.config.js
  6. 13
      packages/nocodb/rspack.local.config.js
  7. 15
      packages/nocodb/rspack.timely.config.js
  8. 5
      packages/nocodb/tsconfig.json
  9. 96
      pnpm-lock.yaml

13
packages/nocodb/docker/rspack.config.js
Unescape View File

@ -1,6 +1,5 @@
const path = require('path');
const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('../build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = {
entry: './src/run/dockerEntry.ts',
@ -40,7 +39,9 @@ module.exports = {
},
resolve: {
extensions: ['.tsx', '.ts', '.js', '.json'],
alias: resolveTsAliases(path.resolve('tsconfig.json')),
tsConfig: {
configFile: path.resolve('tsconfig.json'),
},
},
output: {
path: require('path').resolve('./docker'),
@ -62,9 +63,11 @@ module.exports = {
],
nodeEnv: false,
},
externals: [nodeExternals({
allowlist: ['nocodb-sdk']
})],
externals: [
nodeExternals({
allowlist: ['nocodb-sdk'],
}),
],
plugins: [
new rspack.EnvironmentPlugin({
EE: true,

3
packages/nocodb/package.json
Unescape View File

@ -32,7 +32,7 @@
"test": "jest --runInBand --forceExit",
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r @swc-node/register node_modules/.bin/jest --runInBand",
"test:debug": "node --inspect-brk -r @swc-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json",
"watch:run": "cross-env NODE_ENV=development NC_DISABLE_TELE=true rspack serve --config rspack.dev.config.js --entry src/run/docker",
"watch:run:mysql": "cross-env NODE_ENV=development NC_DISABLE_TELE=true rspack serve --config rspack.dev.config.js --entry src/run/dockerRunMysql",
@ -197,7 +197,6 @@
"run-script-webpack-plugin": "^0.2.0",
"supertest": "^6.3.4",
"ts-jest": "29.1.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.3.3"
}
}

5
packages/nocodb/rspack.cli.config.js
Unescape View File

@ -1,6 +1,5 @@
const path = require('path');
const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = {
@ -37,7 +36,9 @@ module.exports = {
})],
resolve: {
extensions: ['.tsx', '.ts', '.js', '.json'],
alias: resolveTsAliases(path.resolve('tsconfig.json')),
tsConfig: {
configFile: path.resolve('tsconfig.json'),
},
},
mode: 'production',
output: {

5
packages/nocodb/rspack.config.js
Unescape View File

@ -1,6 +1,5 @@
const path = require('path');
const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = {
@ -58,7 +57,9 @@ module.exports = {
})],
resolve: {
extensions: ['.tsx', '.ts', '.js', '.json'],
alias: resolveTsAliases(path.resolve('tsconfig.json')),
tsConfig: {
configFile: path.resolve('tsconfig.json'),
},
},
mode: 'production',
output: {

5
packages/nocodb/rspack.dev.config.js
Unescape View File

@ -1,7 +1,6 @@
const { join, resolve } = require('path');
const { rspack } = require('@rspack/core');
const { RunScriptWebpackPlugin } = require('run-script-webpack-plugin');
const {resolveTsAliases} = require("./build-utils/resolveTsAliases");
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const nodeExternals = require('webpack-node-externals');
@ -58,8 +57,8 @@ const baseDevConfig = {
],
resolve: {
extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
alias: {
...resolveTsAliases(resolve('tsconfig.json')),
tsConfig: {
configFile: resolve('tsconfig.json'),
},
},
optimization: {

13
packages/nocodb/rspack.local.config.js
Unescape View File

@ -1,6 +1,5 @@
const path = require('path');
const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = {
@ -54,12 +53,16 @@ module.exports = {
],
nodeEnv: false,
},
externals: [nodeExternals({
allowlist: ['nocodb-sdk']
})],
externals: [
nodeExternals({
allowlist: ['nocodb-sdk'],
}),
],
resolve: {
extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
alias: resolveTsAliases(path.resolve('tsconfig.json')),
tsConfig: {
configFile: path.resolve('tsconfig.json'),
},
},
mode: 'production',
output: {

15
packages/nocodb/rspack.timely.config.js
Unescape View File

@ -1,6 +1,5 @@
const path = require('path');
const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = {
@ -53,12 +52,16 @@ module.exports = {
],
nodeEnv: false,
},
externals: [nodeExternals({
allowlist: ['nocodb-sdk']
})],
externals: [
nodeExternals({
allowlist: ['nocodb-sdk'],
}),
],
resolve: {
extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
alias: resolveTsAliases(path.resolve('./tsconfig.json')),
tsConfig: {
configFile: path.resolve('tsconfig.json'),
},
},
mode: 'production',
output: {
@ -80,4 +83,4 @@ module.exports = {
}),
],
target: 'node',
};
};

5
packages/nocodb/tsconfig.json
Unescape View File

@ -1,9 +1,4 @@
{
"ts-node": {
"require": [
"tsconfig-paths/register"
]
},
"compilerOptions": {
"module": "commonjs",
"declaration": true,

96
pnpm-lock.yaml
Unescape View File

@ -1016,9 +1016,6 @@ importers:
ts-jest:
specifier: 29.1.2
version: 29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@20.11.30)(ts-node@10.9.2(@swc/core@1.9.2)(@swc/wasm@1.5.25)(@types/node@20.11.30)(typescript@5.4.5)))(typescript@5.4.5)
tsconfig-paths:
specifier: ^4.2.0
version: 4.2.0
typescript:
specifier: ~5.4.5
version: 5.4.5
@ -1076,7 +1073,7 @@ importers:
version: 5.0.7
ts-jest:
specifier: ^29.1.2
version: 29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0)(typescript@5.4.5)
version: 29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@20.11.30)(ts-node@10.9.2(@swc/core@1.9.2)(@swc/wasm@1.5.25)(@types/node@20.11.30)(typescript@5.4.5)))(typescript@5.4.5)
tsc-alias:
specifier: ^1.8.10
version: 1.8.10
@ -6317,10 +6314,6 @@ packages:
peerDependencies:
acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
acorn-walk@8.2.0:
resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
engines: {node: '>=0.4.0'}
acorn-walk@8.3.2:
resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
engines: {node: '>=0.4.0'}
@ -7110,7 +7103,6 @@ packages:
clickhouse@2.6.0:
resolution: {integrity: sha512-HC5OV99GJOup4qZsTuWWPpXlj+847Z0OeygDU2x22rNYost0V/vWapzFWYZdV/5iRbGMrhFQPOyQEzmGvoaWRQ==}
bundledDependencies: []
clipboardy@3.0.0:
resolution: {integrity: sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==}
@ -16936,7 +16928,7 @@ snapshots:
'@babel/traverse': 7.24.1
'@babel/types': 7.25.7
convert-source-map: 2.0.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@ -17206,7 +17198,7 @@ snapshots:
'@babel/helper-split-export-declaration': 7.22.6
'@babel/parser': 7.25.7
'@babel/types': 7.25.7
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@ -17530,7 +17522,7 @@ snapshots:
'@eslint/eslintrc@2.1.4':
dependencies:
ajv: 6.12.6
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
espree: 9.6.1
globals: 13.21.0
ignore: 5.3.1
@ -17634,7 +17626,7 @@ snapshots:
'@humanwhocodes/config-array@0.11.13':
dependencies:
'@humanwhocodes/object-schema': 2.0.1
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@ -21743,7 +21735,7 @@ snapshots:
'@typescript-eslint/type-utils': 6.21.0(eslint@8.56.0)(typescript@5.4.5)
'@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.4.5)
'@typescript-eslint/visitor-keys': 6.21.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
eslint: 8.56.0
graphemer: 1.4.0
ignore: 5.3.1
@ -21786,7 +21778,7 @@ snapshots:
'@typescript-eslint/types': 6.21.0
'@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.5)
'@typescript-eslint/visitor-keys': 6.21.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
eslint: 8.56.0
optionalDependencies:
typescript: 5.4.5
@ -21824,7 +21816,7 @@ snapshots:
dependencies:
'@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.5)
'@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@5.4.5)
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
eslint: 8.56.0
tsutils: 3.21.0(typescript@5.4.5)
optionalDependencies:
@ -21860,7 +21852,7 @@ snapshots:
dependencies:
'@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.5)
'@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.4.5)
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
eslint: 8.56.0
ts-api-utils: 1.0.2(typescript@5.4.5)
optionalDependencies:
@ -21878,7 +21870,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 5.62.0
'@typescript-eslint/visitor-keys': 5.62.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
globby: 11.1.0
is-glob: 4.0.3
semver: 7.6.3
@ -21920,7 +21912,7 @@ snapshots:
dependencies:
'@typescript-eslint/types': 6.21.0
'@typescript-eslint/visitor-keys': 6.21.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
globby: 11.1.0
is-glob: 4.0.3
minimatch: 9.0.3
@ -22960,9 +22952,6 @@ snapshots:
dependencies:
acorn: 8.11.3
acorn-walk@8.2.0:
optional: true
acorn-walk@8.3.2: {}
acorn@8.11.3: {}
@ -22975,13 +22964,13 @@ snapshots:
agent-base@6.0.2:
dependencies:
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
agent-base@7.1.0:
dependencies:
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
@ -24705,10 +24694,6 @@ snapshots:
dependencies:
ms: 2.1.3
debug@4.3.4:
dependencies:
ms: 2.1.2
debug@4.3.4(supports-color@5.5.0):
dependencies:
ms: 2.1.2
@ -25040,7 +25025,7 @@ snapshots:
base64id: 2.0.0
cookie: 0.4.2
cors: 2.8.5
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
engine.io-parser: 5.2.1
ws: 8.11.0
transitivePeerDependencies:
@ -25799,7 +25784,7 @@ snapshots:
ajv: 6.12.6
chalk: 4.1.2
cross-spawn: 7.0.3
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
doctrine: 3.0.0
escape-string-regexp: 4.0.0
eslint-scope: 7.2.2
@ -26258,7 +26243,7 @@ snapshots:
follow-redirects@1.15.6(debug@4.3.4):
optionalDependencies:
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
for-each@0.3.3:
dependencies:
@ -27005,7 +26990,7 @@ snapshots:
dependencies:
'@tootallnate/once': 1.1.2
agent-base: 6.0.2
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
optional: true
@ -27014,14 +26999,14 @@ snapshots:
dependencies:
'@tootallnate/once': 2.0.0
agent-base: 6.0.2
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
http-proxy-agent@7.0.0:
dependencies:
agent-base: 7.1.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
@ -27060,14 +27045,14 @@ snapshots:
https-proxy-agent@5.0.1:
dependencies:
agent-base: 6.0.2
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
https-proxy-agent@7.0.2:
dependencies:
agent-base: 7.1.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
@ -27272,7 +27257,7 @@ snapshots:
dependencies:
'@ioredis/commands': 1.2.0
cluster-key-slot: 1.1.2
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
denque: 2.1.0
lodash.defaults: 4.2.0
lodash.isarguments: 3.1.0
@ -27660,7 +27645,7 @@ snapshots:
istanbul-lib-source-maps@4.0.1:
dependencies:
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
istanbul-lib-coverage: 3.2.0
source-map: 0.6.1
transitivePeerDependencies:
@ -28269,7 +28254,7 @@ snapshots:
dependencies:
colorette: 2.0.19
commander: 9.5.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
escalade: 3.1.1
esm: 3.2.25
get-package-type: 0.1.0
@ -29383,7 +29368,7 @@ snapshots:
dependencies:
'@tediousjs/connection-string': 0.5.0
commander: 11.1.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
rfdc: 1.3.1
tarn: 3.0.2
tedious: 16.6.1
@ -32226,7 +32211,7 @@ snapshots:
socket.io-parser@4.2.4:
dependencies:
'@socket.io/component-emitter': 3.1.0
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
transitivePeerDependencies:
- supports-color
@ -32235,7 +32220,7 @@ snapshots:
accepts: 1.3.8
base64id: 2.0.0
cors: 2.8.5
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
engine.io: 6.5.2
socket.io-adapter: 2.5.2
socket.io-parser: 4.2.4
@ -32253,7 +32238,7 @@ snapshots:
socks-proxy-agent@6.2.1:
dependencies:
agent-base: 6.0.2
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
socks: 2.7.1
transitivePeerDependencies:
- supports-color
@ -32330,7 +32315,7 @@ snapshots:
spdy-transport@3.0.0:
dependencies:
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
detect-node: 2.1.0
hpack.js: 2.1.6
obuf: 1.1.2
@ -32341,7 +32326,7 @@ snapshots:
spdy@4.0.2:
dependencies:
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
handle-thing: 2.0.1
http-deceiver: 1.2.7
select-hose: 2.0.0
@ -32644,7 +32629,7 @@ snapshots:
dependencies:
component-emitter: 1.3.0
cookiejar: 2.1.4
debug: 4.3.4
debug: 4.3.4(supports-color@5.5.0)
fast-safe-stringify: 2.1.1
form-data: 4.0.0
formidable: 2.1.2
@ -32972,23 +32957,6 @@ snapshots:
'@jest/types': 29.6.3
babel-jest: 29.7.0(@babel/core@7.24.3)
ts-jest@29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0)(typescript@5.4.5):
dependencies:
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
jest: 29.7.0(@types/node@20.11.30)(ts-node@10.9.2(@swc/core@1.9.2)(@swc/wasm@1.5.25)(@types/node@20.11.30)(typescript@5.4.5))
jest-util: 29.6.3
json5: 2.2.3
lodash.memoize: 4.1.2
make-error: 1.3.6
semver: 7.5.4
typescript: 5.4.5
yargs-parser: 21.1.1
optionalDependencies:
'@babel/core': 7.24.3
'@jest/types': 29.6.3
babel-jest: 29.7.0(@babel/core@7.24.3)
ts-loader@9.5.1(typescript@5.6.2)(webpack@5.91.0(@swc/core@1.9.2)(esbuild@0.20.2)):
dependencies:
chalk: 4.1.2
@ -33020,7 +32988,7 @@ snapshots:
'@tsconfig/node16': 1.0.4
'@types/node': 20.11.30
acorn: 8.12.1
acorn-walk: 8.2.0
acorn-walk: 8.3.2
arg: 4.1.3
create-require: 1.1.1
diff: 4.0.2

Write Preview
Loading…
Cancel
Save