Merge branch 'master' into update_gha
This commit is contained in:
		
						commit
						83e0807549
					
				
							
								
								
									
										12
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/dependabot.yml
									
									
									
									
										vendored
									
									
								
							@ -6,23 +6,27 @@ updates:
 | 
			
		||||
      interval: daily
 | 
			
		||||
    open-pull-requests-limit: 10
 | 
			
		||||
    ignore:
 | 
			
		||||
      - update-types: ["version-update:semver-major"]
 | 
			
		||||
      - dependency-name: "*"
 | 
			
		||||
        update-types: ["version-update:semver-major"]
 | 
			
		||||
  - package-ecosystem: npm
 | 
			
		||||
    directory: "/frontend"
 | 
			
		||||
    schedule:
 | 
			
		||||
      interval: daily
 | 
			
		||||
    open-pull-requests-limit: 10
 | 
			
		||||
    ignore:
 | 
			
		||||
      - update-types: ["version-update:semver-major"]
 | 
			
		||||
      - dependency-name: "*"
 | 
			
		||||
        update-types: ["version-update:semver-major"]
 | 
			
		||||
  - package-ecosystem: docker
 | 
			
		||||
    directory: "/docker/backend"
 | 
			
		||||
    schedule:
 | 
			
		||||
      interval: daily
 | 
			
		||||
    ignore:
 | 
			
		||||
      - update-types: ["version-update:semver-major"]
 | 
			
		||||
      - dependency-name: "*"
 | 
			
		||||
        update-types: ["version-update:semver-major"]
 | 
			
		||||
  - package-ecosystem: "github-actions"
 | 
			
		||||
    directory: "/"
 | 
			
		||||
    schedule:
 | 
			
		||||
      interval: daily
 | 
			
		||||
    ignore:
 | 
			
		||||
      - update-types: ["version-update:semver-major"]
 | 
			
		||||
      - dependency-name: "*"
 | 
			
		||||
        update-types: ["version-update:semver-major"]
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										31
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										31
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							@ -31,6 +31,7 @@
 | 
			
		||||
        "bootstrap": "~4.6.1",
 | 
			
		||||
        "browserify": "^17.0.0",
 | 
			
		||||
        "clipboard": "^2.0.11",
 | 
			
		||||
        "cypress": "^12.1.0",
 | 
			
		||||
        "domino": "^2.1.6",
 | 
			
		||||
        "echarts": "~5.4.0",
 | 
			
		||||
        "echarts-gl": "^2.0.9",
 | 
			
		||||
@ -57,8 +58,8 @@
 | 
			
		||||
        "typescript": "~4.6.4"
 | 
			
		||||
      },
 | 
			
		||||
      "optionalDependencies": {
 | 
			
		||||
        "@cypress/schematic": "~2.3.0",
 | 
			
		||||
        "cypress": "^11.2.0",
 | 
			
		||||
        "@cypress/schematic": "^2.4.0",
 | 
			
		||||
        "cypress": "^12.1.0",
 | 
			
		||||
        "cypress-fail-on-console-error": "~4.0.2",
 | 
			
		||||
        "cypress-wait-until": "^1.7.2",
 | 
			
		||||
        "mock-socket": "~9.1.5",
 | 
			
		||||
@ -3225,9 +3226,9 @@
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@cypress/schematic": {
 | 
			
		||||
      "version": "2.3.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.3.0.tgz",
 | 
			
		||||
      "integrity": "sha512-LBKX20MUUYF2Xu+1+KpVbLCoMvt2Osa80yQfonduVsLJ/p8JxtLHqufuf/ryJp9Gm9R5sDfk/YhHL+rB7a+gsg==",
 | 
			
		||||
      "version": "2.4.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.4.0.tgz",
 | 
			
		||||
      "integrity": "sha512-aor8hQ+gMXqx/ASdo7CUGo/sMEWwwfSRsLr99rM2GjvW+pZnCKKTnRG4UPf8Ro9SevLJj7KRZAZWxa5MAkJzZA==",
 | 
			
		||||
      "optional": true,
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "@angular-devkit/architect": "^0.1402.1",
 | 
			
		||||
@ -7019,9 +7020,9 @@
 | 
			
		||||
      "peer": true
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/cypress": {
 | 
			
		||||
      "version": "11.2.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz",
 | 
			
		||||
      "integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==",
 | 
			
		||||
      "version": "12.1.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.1.0.tgz",
 | 
			
		||||
      "integrity": "sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==",
 | 
			
		||||
      "hasInstallScript": true,
 | 
			
		||||
      "optional": true,
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
@ -7072,7 +7073,7 @@
 | 
			
		||||
        "cypress": "bin/cypress"
 | 
			
		||||
      },
 | 
			
		||||
      "engines": {
 | 
			
		||||
        "node": ">=12.0.0"
 | 
			
		||||
        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/cypress-fail-on-console-error": {
 | 
			
		||||
@ -19345,9 +19346,9 @@
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "@cypress/schematic": {
 | 
			
		||||
      "version": "2.3.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.3.0.tgz",
 | 
			
		||||
      "integrity": "sha512-LBKX20MUUYF2Xu+1+KpVbLCoMvt2Osa80yQfonduVsLJ/p8JxtLHqufuf/ryJp9Gm9R5sDfk/YhHL+rB7a+gsg==",
 | 
			
		||||
      "version": "2.4.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.4.0.tgz",
 | 
			
		||||
      "integrity": "sha512-aor8hQ+gMXqx/ASdo7CUGo/sMEWwwfSRsLr99rM2GjvW+pZnCKKTnRG4UPf8Ro9SevLJj7KRZAZWxa5MAkJzZA==",
 | 
			
		||||
      "optional": true,
 | 
			
		||||
      "requires": {
 | 
			
		||||
        "@angular-devkit/architect": "^0.1402.1",
 | 
			
		||||
@ -22282,9 +22283,9 @@
 | 
			
		||||
      "peer": true
 | 
			
		||||
    },
 | 
			
		||||
    "cypress": {
 | 
			
		||||
      "version": "11.2.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz",
 | 
			
		||||
      "integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==",
 | 
			
		||||
      "version": "12.1.0",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.1.0.tgz",
 | 
			
		||||
      "integrity": "sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==",
 | 
			
		||||
      "optional": true,
 | 
			
		||||
      "requires": {
 | 
			
		||||
        "@cypress/request": "^2.88.10",
 | 
			
		||||
 | 
			
		||||
@ -109,8 +109,8 @@
 | 
			
		||||
    "typescript": "~4.6.4"
 | 
			
		||||
  },
 | 
			
		||||
  "optionalDependencies": {
 | 
			
		||||
    "@cypress/schematic": "~2.3.0",
 | 
			
		||||
    "cypress": "^11.2.0",
 | 
			
		||||
    "@cypress/schematic": "^2.4.0",
 | 
			
		||||
    "cypress": "^12.1.0",
 | 
			
		||||
    "cypress-fail-on-console-error": "~4.0.2",
 | 
			
		||||
    "cypress-wait-until": "^1.7.2",
 | 
			
		||||
    "mock-socket": "~9.1.5",
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user