Merge pull request #1369 from jumpserver/dev

v4.10.2

Author: baijiangjie

.eslintrc.json

@@ -0,0 +1 @@
+ 

.gitignore

@@ -46,3 +46,4 @@ publish.sh
 luna.tar.gz
 luna/
 package-lock.json
+.angular

.prettierignore

@@ -0,0 +1,6 @@
+node_modules
+dist
+e2e
+.idea
+.vscode
+.angular

.prettierrc.cjs

@@ -0,0 +1,39 @@
+module.exports = {
+  // 指定最大换行长度
+  printWidth: 100,
+  // 缩进制表符宽度 | 空格数
+  tabWidth: 2,
+  // 使用制表符而不是空格缩进行 (true：制表符，false：空格)
+  useTabs: false,
+  // 结尾不用分号 (true：有，false：没有)
+  semi: true,
+  // 使用单引号 (true：单引号，false：双引号)
+  singleQuote: true,
+  // 在对象字面量中决定是否将属性名用引号括起来 可选值 "<as-needed|consistent|preserve>"
+  quoteProps: "as-needed",
+  // 在JSX中使用单引号而不是双引号 (true：单引号，false：双引号)
+  jsxSingleQuote: false,
+  // 多行时尽可能打印尾随逗号 可选值"<none|es5|all>"
+  trailingComma: "none",
+  // 在对象，数组括号与文字之间加空格 "{ foo: bar }" (true：有，false：没有)
+  bracketSpacing: true,
+  // 将 > 多行元素放在最后一行的末尾，而不是单独放在下一行 (true：放末尾，false：单独一行)
+  bracketSameLine: false,
+  // (x) => {} 箭头函数参数只有一个时是否要有小括号 (avoid：省略括号，always：不省略括号)
+  arrowParens: "avoid",
+  // 指定要使用的解析器，不需要写文件开头的 @prettier
+  requirePragma: false,
+  // 可以在文件顶部插入一个特殊标记，指定该文件已使用 Prettier 格式化
+  insertPragma: false,
+  // 用于控制文本是否应该被换行以及如何进行换行
+  proseWrap: "preserve",
+  // 在html中空格是否是敏感的 "css" - 遵守 CSS 显示属性的默认值， "strict" - 空格被认为是敏感的 ，"ignore" - 空格被认为是不敏感的
+  htmlWhitespaceSensitivity: "css",
+  // 控制在 Vue 单文件组件中 <script> 和 <style> 标签内的代码缩进方式
+  vueIndentScriptAndStyle: false,
+  // 换行符使用 lf 结尾是 可选值 "<auto|lf|crlf|cr>"
+  endOfLine: "auto",
+  // 这两个选项可用于格式化以给定字符偏移量（分别包括和不包括）开始和结束的代码 (rangeStart：开始，rangeEnd：结束)
+  rangeStart: 0,
+  rangeEnd: Infinity
+};

.vscode/launch.json

@@ -11,7 +11,7 @@
             "runtimeExecutable": "bash",
             "runtimeArgs": [
                 "-c",
-                "source ~/.zshrc && nvm use v16.20.2 && npm start"
+                "source ~/.zshrc && npm run dev"
             ],
         }
     ]

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "prettier.singleQuote": true
+  "prettier.singleQuote": true,
+  "angular.enable-strict-mode-prompt": false
 }

Dockerfile

@@ -1,5 +1,5 @@
 # Use base image to build the project avoid npm install every time
-FROM jumpserver/luna-base:20241113_102222 AS stage-build
+FROM jumpserver/luna-base:20250609_105214 AS stage-build
 
 ARG VERSION
 ENV VERSION=$VERSION
@@ -8,8 +8,8 @@ ADD . /data
 
 RUN sed -i "s@version =.*;@version = '${VERSION}';@g" src/environments/environment.prod.ts \
     && yarn build \
-    && cp -R src/assets/i18n luna/
+    && cp -R src/assets/i18n dist/luna/
 
 FROM nginx:1.24-bullseye
-COPY --from=stage-build /data/luna /opt/luna
+COPY --from=stage-build /data/dist/luna /opt/luna
 COPY nginx.conf /etc/nginx/conf.d/default.conf

angular.json

@@ -3,129 +3,129 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "WebTerminal": {
+    "Luna": {
       "root": "",
       "sourceRoot": "src",
       "projectType": "application",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular/build:application",
           "options": {
             "outputPath": "dist",
+            "optimization": false,
+            "progress": true,
+            "statsJson": false,
+            "aot": false,
+            "sourceMap": true,
+            "namedChunks": true,
             "index": "src/index.html",
-            "main": "src/main.ts",
+            "browser": "src/main.ts",
+            "polyfills": ["src/polyfills.ts"],
+            "allowedCommonJsDependencies": [
+              "crypto-js",
+              "events",
+              "buffer",
+              "@xterm/xterm",
+              "@xterm/addon-fit",
+              "jquery",
+              "xterm-theme"
+            ],
             "tsConfig": "src/tsconfig.app.json",
-            "polyfills": "src/polyfills.ts",
+            "stylePreprocessorOptions": {
+              "includePaths": ["src", "src/sass", "node_modules"]
+            },
             "preserveSymlinks": true,
             "assets": [
               "src/assets",
               "src/static",
-              "src/favicon.ico"
-            ],
-            "styles": [
-              "node_modules/animate.css/animate.min.css",
-              "node_modules/xterm/dist/xterm.css",
-              "node_modules/ngx-toastr/toastr.css",
-              "src/sass/style.scss",
-              "src/styles.css",
-              "src/theme.scss",
-              "node_modules/asciinema-player/resources/public/css/asciinema-player.css"
+              "src/favicon.ico",
+              {
+                "glob": "**/*",
+                "input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
+                "output": "/assets/"
+              }
             ],
+            "styles": ["src/sass/ant.less", "src/sass/styles.scss"],
             "scripts": [
-              "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/xterm/dist/xterm.js",
-              "node_modules/@ztree/ztree_v3/js/jquery.ztree.all.min.js",
-              "node_modules/@ztree/ztree_v3/js/jquery.ztree.exhide.min.js",
-              "node_modules/asciinema-player/resources/public/js/asciinema-player.js"
+              "jquery/dist/jquery.min.js",
+              "@ztree/ztree_v3/js/jquery.ztree.all.min.js",
+              "@ztree/ztree_v3/js/jquery.ztree.exhide.min.js",
+              "asciinema-player/dist/bundle/asciinema-player.min.js"
             ]
           },
           "configurations": {
             "production": {
               "optimization": true,
               "outputHashing": "all",
+              "baseHref": "/luna/",
+              "outputPath": {
+                "base": "dist",
+                "browser": "luna"
+              },
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "5mb",
+                  "maximumError": "6mb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
                 }
               ]
+            },
+            "hmr": {
+              "optimization": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
           }
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular/build:dev-server",
           "options": {
-            "browserTarget": "WebTerminal:build"
+            "buildTarget": "Luna:build",
+            "proxyConfig": "proxy.conf.json"
           },
           "configurations": {
             "production": {
-              "browserTarget": "WebTerminal:build:production"
+              "buildTarget": "Luna:build:production"
+            },
+            "hmr": {
+              "buildTarget": "Luna:build:hmr"
             }
           }
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "builder": "@angular/build:extract-i18n",
           "options": {
-            "browserTarget": "WebTerminal:build"
-          }
-        },
-        "test": {
-          "builder": "@angular-devkit/build-angular:karma",
-          "options": {
-            "main": "src/test.ts",
-            "karmaConfig": "./karma.conf.js",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "scripts": [
-              "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/xterm/dist/xterm.js",
-              "node_modules/@ztree/ztree_v3/js/jquery.ztree.all.min.js",
-              "node_modules/@ztree/ztree_v3/js/jquery.ztree.exhide.min.js"
-            ],
-            "styles": [
-              "node_modules/animate.css/animate.min.css",
-              "node_modules/xterm/dist/xterm.css",
-              "src/sass/style.scss",
-              "src/styles.css"
-            ],
-            "assets": [
-              "src/assets",
-              "src/static",
-              "src/theme/default",
-              "src/favicon.ico"
-            ]
+            "buildTarget": "Luna:build"
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         }
       }
     }
   },
-  "defaultProject": "Luna",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"
     }
+  },
+  "cli": {
+    "analytics": "b781fa7d-691a-46cd-bb02-23fe8532f7d6"
   }
 }