feat: update docker-compose tar

.gitignore

@@ -9,8 +9,6 @@ node_modules/
 *.map
 .github/workflows/nodejs.yml
 
-app/**/*.js
-config/**/*.js
 app/**/*.map
 config/**/*.map
 dist/

README.md

@@ -7,12 +7,18 @@ Nebula Graph Studio (Studio for short) is a web-based visualization tool for Neb
 
 ## Development Quick Start
 
-### Set up nebula-graph-studio
+### set up studio and server at the same time
+```
+$ npm install
+$ npm run dev-all
+```
+
+### Set up nebula-graph-studio only
 ```
 $ npm install
 $ npm run dev
 ```
-### Set up go-server
+### Set up go-server only
 ```
 $ cd server
 $ go build -o server
@@ -25,18 +31,18 @@ $ nohup ./server &
 ```
 $ npm run install
 $ npm run build
+$ mv dist server/assets
 ```
 
-### 1. Build Web
+### 2. Build Server
 ```
-// remove default port 7001 in config/example-config.yaml first
 $ cd server
+// update default port 9000 to 7001 in config/example-config.yaml first
 $ go build -o server
 ```
 
 ### 3. Start
 ```
-$ mv dist server/assets
 $ nohup ./server &
 ```
 

config/server.js

@@ -0,0 +1,33 @@
+const path = require('path');
+const process = require('process');
+const fs = require('fs');
+const chalk = require('chalk');
+const { spawn, spawnSync } = require('child_process');
+const webpack = require('webpack');
+const openBrowser = require('react-dev-utils/openBrowser');
+const WebpackDevServer = require('webpack-dev-server');
+const config = require('./webpack.dev');
+
+const compiler = webpack(config);
+const portal = config.devServer.https ? 'https' : 'http';
+const port = config.devServer.port;
+const ip = config.devServer.host || '127.0.0.1';
+
+const goServerPath = path.resolve(process.cwd(), './server');
+
+const goServerProcess = spawn('go run main.go', { cwd: goServerPath, shell: true });
+goServerProcess.stdout.on('data', (data) => console.log(chalk.blue(`server::${data.toString().slice(0, -1)}`)));
+goServerProcess.on('close', () =>
+  console.log(chalk.red('\ngo server 启动失败，服务器将不可用，请切换到 server 目录调试异常\n'))
+);
+
+const server = new WebpackDevServer(config.devServer, compiler);
+server.startCallback(() => {
+  console.log(`Listening at localhost: ${port}`);
+  console.log('Opening your system browser...');
+  openBrowser(`${portal}://${ip}:${port}`);
+});
+
+process.on('exit', (code) => {
+  console.log(`process exits with code: ${code}`);
+});

config/webpack.base.ts → config/webpack.base.js

@@ -1,10 +1,9 @@
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import path, { resolve } from 'path';
-import webpack, { Configuration } from 'webpack';
-import Package from '../package.json';
-import AntdDayjsWebpackPlugin from 'antd-dayjs-webpack-plugin';
-
-const commonConfig: Configuration = {
+const path = require('path');
+const webpack = require('webpack');
+const AntdDayjsWebpackPlugin = require('antd-dayjs-webpack-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const Package = require('../package.json')
+const commonConfig = {
   entry: {
     app: [path.join(__dirname, '../app/index.tsx')],
   },
@@ -89,7 +88,7 @@ const commonConfig: Configuration = {
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: path.join(__dirname, '../app/index.html'),
-      favicon: resolve(__dirname, '../favicon.ico'),
+      favicon: path.resolve(__dirname, '../favicon.ico'),
       minify: {
         collapseWhitespace: true,
         removeComments: true,
@@ -121,4 +120,4 @@ const commonConfig: Configuration = {
   },
 };
 
-export default commonConfig;
+module.exports = commonConfig;

config/webpack.dev.ts → config/webpack.dev.js

@@ -1,8 +1,9 @@
-import path from 'path';
-import { mergeWithCustomize } from 'webpack-merge';
-import commonConfig from './webpack.base';
+const path = require('path');
+const merge = require('webpack-merge');
+const commonConfig = require('./webpack.base');
 
 const devConfig = {
+  mode: 'development',
   devtool: 'inline-source-map',
   entry: {
     app: [
@@ -27,6 +28,7 @@ const devConfig = {
 
   devServer: {
     port: 7001,
+    open: true,
     headers: { 'Access-Control-Allow-Origin': '*' },
     historyApiFallback: true,
     host: 'localhost',
@@ -61,7 +63,7 @@ const devConfig = {
   },
 };
 
-module.exports = mergeWithCustomize({
+module.exports = merge.mergeWithCustomize({
   customizeArray(_, b, key) {
     if (key === 'entry.app') {
       return b;

config/webpack.prod.ts → config/webpack.prod.js

@@ -1,12 +1,12 @@
-import { CleanWebpackPlugin } from 'clean-webpack-plugin';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import path from 'path';
-import webpack, { Configuration } from 'webpack';
-import merge from 'webpack-merge';
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const path = require('path');
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 
-import commonConfig from './webpack.base';
+const commonConfig = require('./webpack.base');
 
-const publicConfig: Configuration = {
+const publicConfig = {
   mode: 'production',
   output: {
     path: path.join(__dirname, '../dist/'),
@@ -33,8 +33,8 @@ const publicConfig: Configuration = {
     new CleanWebpackPlugin(),
 
     new MiniCssExtractPlugin({
-      filename: '[name].[hash].css',
-      chunkFilename: '[id].[hash].css',
+      filename: '[name].[fullhash].css',
+      chunkFilename: '[id].[fullhash].css',
     }),
   ],
 };

deployment/docker/README.md

@@ -0,0 +1,14 @@
+# Nebula Studio Docker Deploy
+
+### Package: 
+
+`tar -czf nebula-graph-studio-$VERSION.tar.gz
+
+### Use:
+
+```
+tar -xvf nebula-graph-studio-$VERSION.tar.gz
+cd nebula-graph-studio-$VERSION
+docker-compose pull
+docker-compose up -d
+```

deployment/docker/docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3.4'
+services:
+  web:
+    image: vesoft/nebula-graph-studio:v3.3.0-beta
+    environment:
+      USER: root
+      UPLOAD_DIR: ${MAPPING_DOCKER_DIR}
+    ports:
+      - 7001:7001
+    networks:
+      - nebula-web
+
+networks:
+  nebula-web: