diff --git a/.gitignore b/.gitignore index cd2f82ea9f..4a19ff9466 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ mongod *.sln .history +/packages/nocodb/docker/main.js.LICENSE.txt diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 938fc95864..305d93981a 100644 --- a/packages/nc-lib-gui/package.json +++ b/packages/nc-lib-gui/package.json @@ -1,6 +1,6 @@ { "name": "nc-lib-gui", - "version": "0.1.226", + "version": "0.1.227", "description": "> TODO: description", "author": "“pranavxc” ", "homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme", diff --git a/packages/nocodb/docker/webpack.config.js b/packages/nocodb/docker/webpack.config.js index ff87e3551e..56f3740d0e 100644 --- a/packages/nocodb/docker/webpack.config.js +++ b/packages/nocodb/docker/webpack.config.js @@ -2,7 +2,7 @@ const nodeExternals = require('webpack-node-externals'); // const CopyPlugin = require('copy-webpack-plugin'); const webpack = require('webpack') const TerserPlugin = require('terser-webpack-plugin'); -const JavaScriptObfuscator = require('webpack-obfuscator'); +// const JavaScriptObfuscator = require('webpack-obfuscator'); module.exports = { entry: './docker/index.js', @@ -44,11 +44,11 @@ module.exports = { new webpack.EnvironmentPlugin([ 'EE' ]), - new JavaScriptObfuscator({ - rotateStringArray: true, - splitStrings: true, - splitStringsChunkLength: 6 - }, []), + // new JavaScriptObfuscator({ + // rotateStringArray: true, + // splitStrings: true, + // splitStringsChunkLength: 6 + // }, []), // new CopyPlugin({ // patterns: [ // "src/**/*.ejs" diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 331804148f..15f7cbed60 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.9.30", + "version": "0.9.31", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1282,16 +1282,6 @@ "@types/node": "*" } }, - "@vendia/serverless-express": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/@vendia/serverless-express/-/serverless-express-3.4.0.tgz", - "integrity": "sha512-/UAAbi9qRjUtjRISt5MJ1sfhtrHb26hqQ0nvE5qhMLsAdR5H7ErBwPD8Q/v2OENKm0iWsGwErIZEg7ebUeFDjQ==", - "dev": true, - "requires": { - "binary-case": "^1.0.0", - "type-is": "^1.6.16" - } - }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -2522,17 +2512,6 @@ } } }, - "aws-serverless-express": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/aws-serverless-express/-/aws-serverless-express-3.4.0.tgz", - "integrity": "sha512-YG9ZjAOI9OpwqDDWzkRc3kKJYJuR7gTMjLa3kAWopO17myoprxskCUyCEee+RKe34tcR4UNrVtgAwW5yDe74bw==", - "dev": true, - "requires": { - "@vendia/serverless-express": "^3.4.0", - "binary-case": "^1.0.0", - "type-is": "^1.6.16" - } - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -2551,12 +2530,6 @@ "follow-redirects": "^1.10.0" } }, - "azure-function-express": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/azure-function-express/-/azure-function-express-2.0.0.tgz", - "integrity": "sha512-e+IT8pZn9+JEUns497uf3NptlIQ8xTZWPDHz0/JLMNBFL/KwQ6ojOS1kWSQiah2NSLIB9O/n+wTkygYtS8Y++A==", - "dev": true - }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -6100,12 +6073,6 @@ "es6-symbol": "^3.1.1" } }, - "es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true - }, "es6-symbol": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", @@ -6462,28 +6429,6 @@ } } }, - "express-http-proxy": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/express-http-proxy/-/express-http-proxy-1.6.2.tgz", - "integrity": "sha512-soP7UXySFdLbeeMYL1foBkEoZj6HELq9BDAOCr1sLRpqjPaFruN5o6+bZeC+7U4USWIl4JMKEiIvTeKJ2WQdlQ==", - "dev": true, - "requires": { - "debug": "^3.0.1", - "es6-promise": "^4.1.1", - "raw-body": "^2.3.0" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, "express-status-monitor": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/express-status-monitor/-/express-status-monitor-1.3.3.tgz", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index db282722a4..61fa16ec69 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -184,13 +184,10 @@ "@webserverless/fc-express": "^0.1.4", "autocannon": "^6.5.0", "ava": "2.2.0", - "aws-serverless-express": "^3.3.8", - "azure-function-express": "^2.0.0", "chai": "^4.2.0", "codecov": "^3.5.0", "copyfiles": "^2.3.0", "cz-conventional-changelog": "^2.1.0", - "express-http-proxy": "^1.6.2", "gh-pages": "^2.0.1", "mocha": "^8.1.1", "nodemon": "^2.0.7", diff --git a/packages/nocodb/webpack.config.js b/packages/nocodb/webpack.config.js index 2514cb8e87..c4e704476f 100644 --- a/packages/nocodb/webpack.config.js +++ b/packages/nocodb/webpack.config.js @@ -2,8 +2,8 @@ const nodeExternals = require('webpack-node-externals'); const webpack = require('webpack'); // // const CopyPlugin = require('copy-webpack-plugin'); // -// const TerserPlugin = require('terser-webpack-plugin'); -const JavaScriptObfuscator = require('webpack-obfuscator'); +const TerserPlugin = require('terser-webpack-plugin'); +// const JavaScriptObfuscator = require('webpack-obfuscator'); const path = require('path'); module.exports = { entry: './src/lib/index.ts', @@ -24,8 +24,8 @@ module.exports = { }, optimization: { - minimize: false, //Update this to true or false - // minimizer: [new TerserPlugin()], + minimize: true, //Update this to true or false + minimizer: [new TerserPlugin()], nodeEnv:false }, externals: [nodeExternals()], @@ -46,11 +46,11 @@ module.exports = { new webpack.EnvironmentPlugin([ 'EE' ]), - new JavaScriptObfuscator({ - rotateStringArray: true, - splitStrings: true, - splitStringsChunkLength: 6 - }, []), + // new JavaScriptObfuscator({ + // rotateStringArray: true, + // splitStrings: true, + // splitStringsChunkLength: 6 + // }, []), ], target: 'node',