Browse Source

fix: gtihub actions

DarkPhoenix2704 3 weeks ago
parent
commit
8c288d4ed9
No known key found for this signature in database
GPG Key ID: 3F76B10622A07849
  1. 2
      .github/workflows/release-timely-docker.yml
  2. 9
      packages/nocodb/rspack.cli.config.js
  3. 14
      packages/nocodb/rspack.config.js
  4. 20
      packages/nocodb/rspack.dev.config.js
  5. 14
      packages/nocodb/rspack.local.config.js
  6. 14
      packages/nocodb/rspack.timely.config.js

2
.github/workflows/release-timely-docker.yml

@ -104,7 +104,7 @@ jobs:
run: | run: |
# build nocodb ( pack nocodb-sdk and nc-gui ) # build nocodb ( pack nocodb-sdk and nc-gui )
cd packages/nocodb && cd packages/nocodb &&
EE=true pnpm exec webpack --config webpack.timely.config.js && EE=true pnpm exec rspack --config rspack.timely.config.js &&
# remove bundled libraries (nocodb-sdk, knex-snowflake) # remove bundled libraries (nocodb-sdk, knex-snowflake)
pnpm uninstall --save-prod nocodb-sdk pnpm uninstall --save-prod nocodb-sdk

9
packages/nocodb/rspack.cli.config.js

@ -1,6 +1,7 @@
const path = require('path'); const path = require('path');
const { rspack } = require('@rspack/core'); const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases'); const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = { module.exports = {
entry: './src/cli.ts', entry: './src/cli.ts',
@ -31,13 +32,7 @@ module.exports = {
], ],
nodeEnv: false, nodeEnv: false,
}, },
externals: { externals: [nodeExternals()],
'nocodb-sdk': 'nocodb-sdk',
'pg-query-stream': 'pg-query-stream',
'better-sqlite3': 'better-sqlite3',
oracledb: 'oracledb',
'pg-native': 'pg-native',
},
resolve: { resolve: {
extensions: ['.tsx', '.ts', '.js', '.json'], extensions: ['.tsx', '.ts', '.js', '.json'],
alias: resolveTsAliases(path.resolve('tsconfig.json')), alias: resolveTsAliases(path.resolve('tsconfig.json')),

14
packages/nocodb/rspack.config.js

@ -1,6 +1,7 @@
const path = require('path'); const path = require('path');
const { rspack } = require('@rspack/core'); const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases'); const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = { module.exports = {
entry: './src/index.ts', entry: './src/index.ts',
@ -52,18 +53,7 @@ module.exports = {
], ],
nodeEnv: false, nodeEnv: false,
}, },
externals: { externals: [nodeExternals()],
'@nestjs/microservices': '@nestjs/microservices',
'@nestjs/microservices/microservices-module':
'@nestjs/microservices/microservices-module',
sharp: 'commonjs sharp',
'nocodb-sdk': 'nocodb-sdk',
'pg-query-stream': 'pg-query-stream',
'better-sqlite3': 'better-sqlite3',
oracledb: 'oracledb',
'pg-native': 'pg-native',
'@nestjs/graphql': '@nestjs/graphql',
},
resolve: { resolve: {
extensions: ['.tsx', '.ts', '.js', '.json'], extensions: ['.tsx', '.ts', '.js', '.json'],
alias: resolveTsAliases(path.resolve('tsconfig.json')), alias: resolveTsAliases(path.resolve('tsconfig.json')),

20
packages/nocodb/rspack.dev.config.js

@ -1,9 +1,9 @@
const { join, resolve } = require('path'); const { join, resolve } = require('path');
const { rspack } = require('@rspack/core'); const { rspack } = require('@rspack/core');
const NodeExternals = require('webpack-node-externals');
const { RunScriptWebpackPlugin } = require('run-script-webpack-plugin'); const { RunScriptWebpackPlugin } = require('run-script-webpack-plugin');
const {resolveTsAliases} = require("./build-utils/resolveTsAliases"); const {resolveTsAliases} = require("./build-utils/resolveTsAliases");
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const nodeExternals = require('webpack-node-externals');
const baseDevConfig = { const baseDevConfig = {
mode: 'development', mode: 'development',
@ -52,23 +52,9 @@ const baseDevConfig = {
], ],
}, },
externals: [ externals: [
NodeExternals({ nodeExternals({
allowlist: ['webpack/hot/poll?1000'], allowlist: ['webpack/hot/poll?1000'],
}), })
{
'@nestjs/microservices': '@nestjs/microservices',
'@nestjs/microservices/microservices-module':
'@nestjs/microservices/microservices-module',
sharp: 'commonjs sharp',
'nocodb-sdk': 'nocodb-sdk',
'pg-query-stream': 'pg-query-stream',
'better-sqlite3': 'better-sqlite3',
oracledb: 'oracledb',
'pg-native': 'pg-native',
'@nestjs/graphql': '@nestjs/graphql',
pg: 'commonjs pg',
knex: 'commonjs knex',
},
], ],
resolve: { resolve: {
extensions: ['.tsx', '.ts', '.js', '.json', '.node'], extensions: ['.tsx', '.ts', '.js', '.json', '.node'],

14
packages/nocodb/rspack.local.config.js

@ -1,6 +1,7 @@
const path = require('path'); const path = require('path');
const { rspack } = require('@rspack/core'); const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases'); const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = { module.exports = {
entry: './src/run/local.ts', entry: './src/run/local.ts',
@ -53,18 +54,7 @@ module.exports = {
], ],
nodeEnv: false, nodeEnv: false,
}, },
externals: { externals: [nodeExternals()],
'@nestjs/microservices': '@nestjs/microservices',
'@nestjs/microservices/microservices-module':
'@nestjs/microservices/microservices-module',
sharp: 'commonjs sharp',
'nocodb-sdk': 'nocodb-sdk',
'pg-query-stream': 'pg-query-stream',
'better-sqlite3': 'better-sqlite3',
oracledb: 'oracledb',
'pg-native': 'pg-native',
'@nestjs/graphql': '@nestjs/graphql',
},
resolve: { resolve: {
extensions: ['.tsx', '.ts', '.js', '.json', '.node'], extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
alias: resolveTsAliases(path.resolve('tsconfig.json')), alias: resolveTsAliases(path.resolve('tsconfig.json')),

14
packages/nocodb/rspack.timely.config.js

@ -1,6 +1,7 @@
const path = require('path'); const path = require('path');
const { rspack } = require('@rspack/core'); const { rspack } = require('@rspack/core');
const { resolveTsAliases } = require('./build-utils/resolveTsAliases'); const { resolveTsAliases } = require('./build-utils/resolveTsAliases');
const nodeExternals = require('webpack-node-externals');
module.exports = { module.exports = {
entry: './src/run/timely.ts', entry: './src/run/timely.ts',
@ -52,18 +53,7 @@ module.exports = {
], ],
nodeEnv: false, nodeEnv: false,
}, },
externals: { externals: [nodeExternals()],
'@nestjs/microservices': '@nestjs/microservices',
'@nestjs/microservices/microservices-module':
'@nestjs/microservices/microservices-module',
sharp: 'commonjs sharp',
'nocodb-sdk': 'nocodb-sdk',
'pg-query-stream': 'pg-query-stream',
'better-sqlite3': 'better-sqlite3',
oracledb: 'oracledb',
'pg-native': 'pg-native',
'@nestjs/graphql': '@nestjs/graphql',
},
resolve: { resolve: {
extensions: ['.tsx', '.ts', '.js', '.json', '.node'], extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
alias: resolveTsAliases(path.resolve('./tsconfig.json')), alias: resolveTsAliases(path.resolve('./tsconfig.json')),

Loading…
Cancel
Save