fix: upgrade packadges #1256
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| import js from "@eslint/js"; | ||
| import tseslint from "@typescript-eslint/eslint-plugin"; | ||
| import tsparser from "@typescript-eslint/parser"; | ||
| import vueParser from "vue-eslint-parser"; | ||
| import vuePlugin from "eslint-plugin-vue"; | ||
| import prettierPlugin from "eslint-plugin-prettier"; | ||
| import prettierConfig from "@vue/eslint-config-prettier"; | ||
| import globals from "globals"; | ||
|
|
||
| export default [ | ||
| js.configs.recommended, | ||
|
|
||
| ...vuePlugin.configs["flat/recommended"], | ||
|
|
||
| { | ||
| ignores: [ | ||
| "**/node_modules/**", | ||
| "**/dist/**", | ||
| "**/build/**", | ||
| "**/.vite/**", | ||
| "**/custom_components_dist/**", | ||
| ], | ||
| }, | ||
|
|
||
| { | ||
| files: [ | ||
| "**/*.vue", | ||
| "**/*.ts", | ||
| "**/*.js", | ||
| "**/*.jsx", | ||
| "**/*.cjs", | ||
| "**/*.mjs", | ||
| ], | ||
|
|
||
| languageOptions: { | ||
| parser: vueParser, | ||
| parserOptions: { | ||
| parser: tsparser, | ||
| ecmaVersion: 2020, | ||
| sourceType: "module", | ||
| }, | ||
| globals: { | ||
| ...globals.browser, | ||
| ...globals.node, | ||
| // Additional browser APIs that may not be in globals.browser | ||
| MediaStreamConstraints: "readonly", | ||
| RequestInit: "readonly", | ||
| }, | ||
| }, | ||
|
|
||
| plugins: { | ||
| "@typescript-eslint": tseslint, | ||
| vue: vuePlugin, | ||
| prettier: prettierPlugin, | ||
| }, | ||
|
|
||
| rules: { | ||
| indent: "off", | ||
| "no-unused-vars": "off", | ||
|
|
||
| "@typescript-eslint/no-unused-vars": [ | ||
| "warn", | ||
| { | ||
| args: "all", | ||
| argsIgnorePattern: "^_", | ||
| caughtErrors: "all", | ||
| caughtErrorsIgnorePattern: "^_", | ||
| destructuredArrayIgnorePattern: "^_", | ||
| varsIgnorePattern: "^_", | ||
| ignoreRestSiblings: true, | ||
| }, | ||
| ], | ||
| "@typescript-eslint/no-explicit-any": "warn", | ||
|
|
||
| "prettier/prettier": [ | ||
| 2, | ||
| { | ||
| useTabs: true, | ||
| endOfLine: "auto", | ||
| }, | ||
| ], | ||
|
|
||
| "no-console": "error", | ||
| }, | ||
| }, | ||
|
|
||
| prettierConfig, | ||
| ]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -536,9 +536,10 @@ onUnmounted(() => { | |
| .mainGrid { | ||
| width: 100vw; | ||
| height: 100vh; | ||
| grid-template-columns: auto minmax(0, 1fr); | ||
| grid-template-rows: var(--builderTopBarHeight) minmax(0, 1fr); | ||
| display: grid; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .builderHeader { | ||
|
|
@@ -549,9 +550,18 @@ onUnmounted(() => { | |
|
|
||
| .sidebar { | ||
| grid-column: 1 / 2; | ||
| grid-row: 2 / 3; | ||
|
Collaborator
There was a problem hiding this comment. Previously, is this one set incorrectly?
Collaborator
Author
There was a problem hiding this comment. Yes,
Collaborator
There was a problem hiding this comment. @as-flow is this something needed for shared blueprints?
Collaborator
There was a problem hiding this comment. I guess that break preview mode & Vault UI 
|
||
| min-height: 0; | ||
| min-width: 48px; | ||
| max-width: 288px; | ||
| width: fit-content; | ||
| padding: 0; | ||
| border-radius: 0; | ||
| border-left: none; | ||
| border-top: none; | ||
| border-bottom: none; | ||
|
Comment on lines
+559
to
+562
Collaborator
Author
There was a problem hiding this comment. after upgrade I found that we need changes there and avoid UI issues so I've added some fixes and implements. |
||
| border-right: 1px solid var(--builderIntenseSeparatorColor); | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .builderMain { | ||
|
|
@@ -561,8 +571,18 @@ onUnmounted(() => { | |
| height: 100%; | ||
| } | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. I think we use this one, will this be covered by this
Collaborator
Author
There was a problem hiding this comment. Good catch! The code actually uses |
||
| .builderMainWrapper { | ||
|
Collaborator
There was a problem hiding this comment. Where do we use this new class?
Collaborator
Author
There was a problem hiding this comment. The |
||
| grid-column: 2 / 3; | ||
| grid-row: 2 / 3; | ||
| min-width: 0; | ||
| min-height: 0; | ||
| width: 100%; | ||
| height: 100%; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .builderMainWrapper--fullWidth { | ||
| grid-column: 1 / -1 !important; | ||
| } | ||
|
|
||
| .rendererWrapper { | ||
|
|
@@ -593,11 +613,6 @@ onUnmounted(() => { | |
| --notificationsDisplacement: calc(var(--builderSettingsWidth) + 24px); | ||
| } | ||
|
|
||
| .collaborationTracker, | ||
| .insertionLabelTracker { | ||
| z-index: 3; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,28 @@ | ||
| import * as monaco from "monaco-editor"; | ||
| import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker"; | ||
| import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker"; | ||
| import cssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker"; | ||
| import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker"; | ||
| import tsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker"; | ||
|
|
||
| // @ts-ignore | ||
| self.MonacoEnvironment = { | ||
| getWorker(_: unknown, label: string) { | ||
| if (label === "json") { | ||
| return new jsonWorker(); | ||
| } | ||
| if (label === "css" || label === "scss" || label === "less") { | ||
| return new cssWorker(); | ||
| } | ||
| if (label === "html" || label === "handlebars" || label === "razor") { | ||
| return new htmlWorker(); | ||
| } | ||
| if (label === "typescript" || label === "javascript") { | ||
| return new tsWorker(); | ||
| } | ||
| return new editorWorker(); | ||
| }, | ||
| }; | ||
|
|
||
| // @ts-expect-error - Monaco TypeScript API may have changed in TypeScript 5.9 | ||
| monaco.languages.typescript.typescriptDefaults.setEagerModelSync(true); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The color scheme changes make the scrollbar black