From 0f08a6f1b3a9ac285216307103c5e54f09191aef Mon Sep 17 00:00:00 2001 From: Lais Portugal Date: Thu, 1 Aug 2024 16:36:32 +0100 Subject: [PATCH] Additional changes: studio-desktop --- desktop/electronBuilderConfig.js | 2 +- desktop/main/index.ts | 2 +- desktop/package.json | 2 +- desktop/preload/index.ts | 2 +- desktop/quicklook/index.ts | 2 +- desktop/renderer/index.ts | 6 ++--- desktop/webpack.config.ts | 12 +++++----- packages/suite-desktop/package.json | 2 +- .../suite-desktop/src/main/getDevModeIcon.ts | 2 +- yarn.lock | 24 +++++++++---------- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/desktop/electronBuilderConfig.js b/desktop/electronBuilderConfig.js index 8c180e4b20f..553d5e42cf4 100644 --- a/desktop/electronBuilderConfig.js +++ b/desktop/electronBuilderConfig.js @@ -4,7 +4,7 @@ const { makeElectronBuilderConfig, -} = require("@lichtblick/studio-desktop/src/electronBuilderConfig"); +} = require("@lichtblick/suite-desktop/src/electronBuilderConfig"); const path = require("path"); module.exports = makeElectronBuilderConfig({ diff --git a/desktop/main/index.ts b/desktop/main/index.ts index 704626c9a42..0984763a0ce 100644 --- a/desktop/main/index.ts +++ b/desktop/main/index.ts @@ -2,6 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { main } from "@lichtblick/studio-desktop/src/main"; +import { main } from "@lichtblick/suite-desktop/src/main"; void main(); diff --git a/desktop/package.json b/desktop/package.json index 7e90f851746..aaadbcf6570 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -6,7 +6,7 @@ "@lichtblick/den": "workspace:*", "@lichtblick/log": "workspace:*", "@lichtblick/studio-base": "workspace:*", - "@lichtblick/studio-desktop": "workspace:*", + "@lichtblick/suite-desktop": "workspace:*", "electron": "25.8.4", "playwright": "1.37.1", "webpack": "5.93.0" diff --git a/desktop/preload/index.ts b/desktop/preload/index.ts index 49925d33f28..3f67ad803e2 100644 --- a/desktop/preload/index.ts +++ b/desktop/preload/index.ts @@ -2,6 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { main } from "@lichtblick/studio-desktop/src/preload"; +import { main } from "@lichtblick/suite-desktop/src/preload"; main(); diff --git a/desktop/quicklook/index.ts b/desktop/quicklook/index.ts index f4b96e3de5e..997bf4bed9f 100644 --- a/desktop/quicklook/index.ts +++ b/desktop/quicklook/index.ts @@ -2,6 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { main } from "@lichtblick/studio-desktop/src/quicklook"; +import { main } from "@lichtblick/suite-desktop/src/quicklook"; main(); diff --git a/desktop/renderer/index.ts b/desktop/renderer/index.ts index c893c8e0c61..518d674ca66 100644 --- a/desktop/renderer/index.ts +++ b/desktop/renderer/index.ts @@ -3,9 +3,9 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { AppSetting } from "@lichtblick/studio-base"; -import { Storage } from "@lichtblick/studio-desktop/src/common/types"; -import { main as rendererMain } from "@lichtblick/studio-desktop/src/renderer/index"; -import NativeStorageAppConfiguration from "@lichtblick/studio-desktop/src/renderer/services/NativeStorageAppConfiguration"; +import { Storage } from "@lichtblick/suite-desktop/src/common/types"; +import { main as rendererMain } from "@lichtblick/suite-desktop/src/renderer/index"; +import NativeStorageAppConfiguration from "@lichtblick/suite-desktop/src/renderer/services/NativeStorageAppConfiguration"; const isDevelopment = process.env.NODE_ENV === "development"; diff --git a/desktop/webpack.config.ts b/desktop/webpack.config.ts index 67436450aa3..8fa1c0d9730 100644 --- a/desktop/webpack.config.ts +++ b/desktop/webpack.config.ts @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { WebpackConfigParams } from "@lichtblick/studio-desktop/src/WebpackConfigParams"; -import { webpackDevServerConfig } from "@lichtblick/studio-desktop/src/webpackDevServerConfig"; -import { webpackMainConfig } from "@lichtblick/studio-desktop/src/webpackMainConfig"; -import { webpackPreloadConfig } from "@lichtblick/studio-desktop/src/webpackPreloadConfig"; -import { webpackQuicklookConfig } from "@lichtblick/studio-desktop/src/webpackQuicklookConfig"; -import { webpackRendererConfig } from "@lichtblick/studio-desktop/src/webpackRendererConfig"; +import { WebpackConfigParams } from "@lichtblick/suite-desktop/src/WebpackConfigParams"; +import { webpackDevServerConfig } from "@lichtblick/suite-desktop/src/webpackDevServerConfig"; +import { webpackMainConfig } from "@lichtblick/suite-desktop/src/webpackMainConfig"; +import { webpackPreloadConfig } from "@lichtblick/suite-desktop/src/webpackPreloadConfig"; +import { webpackQuicklookConfig } from "@lichtblick/suite-desktop/src/webpackQuicklookConfig"; +import { webpackRendererConfig } from "@lichtblick/suite-desktop/src/webpackRendererConfig"; import path from "path"; import packageJson from "../package.json"; diff --git a/packages/suite-desktop/package.json b/packages/suite-desktop/package.json index 211a066ef5d..74c2587b511 100644 --- a/packages/suite-desktop/package.json +++ b/packages/suite-desktop/package.json @@ -1,5 +1,5 @@ { - "name": "@lichtblick/studio-desktop", + "name": "@lichtblick/suite-desktop", "license": "MPL-2.0", "private": true, "main": "./src/index.tsx", diff --git a/packages/suite-desktop/src/main/getDevModeIcon.ts b/packages/suite-desktop/src/main/getDevModeIcon.ts index 1c63996c9ad..b9fea717a34 100644 --- a/packages/suite-desktop/src/main/getDevModeIcon.ts +++ b/packages/suite-desktop/src/main/getDevModeIcon.ts @@ -16,7 +16,7 @@ export default function getDevModeIcon(): NativeImage | undefined { path.resolve( __dirname, "..", - require.resolve("@lichtblick/studio-desktop/src/main"), + require.resolve("@lichtblick/suite-desktop/src/main"), "../../../resources/icon/icon.png", ), ); diff --git a/yarn.lock b/yarn.lock index 94273c825ba..f6712055db2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3534,9 +3534,18 @@ __metadata: languageName: unknown linkType: soft -"@lichtblick/studio-desktop@workspace:*, @lichtblick/studio-desktop@workspace:packages/suite-desktop": +"@lichtblick/studio@workspace:*, @lichtblick/studio@workspace:packages/studio": + version: 0.0.0-use.local + resolution: "@lichtblick/studio@workspace:packages/studio" + dependencies: + "@foxglove/tsconfig": 2.0.0 + typescript: 5.3.3 + languageName: unknown + linkType: soft + +"@lichtblick/suite-desktop@workspace:*, @lichtblick/suite-desktop@workspace:packages/suite-desktop": version: 0.0.0-use.local - resolution: "@lichtblick/studio-desktop@workspace:packages/suite-desktop" + resolution: "@lichtblick/suite-desktop@workspace:packages/suite-desktop" dependencies: "@actions/exec": 1.1.1 "@actions/tool-cache": 2.0.1 @@ -3589,15 +3598,6 @@ __metadata: languageName: unknown linkType: soft -"@lichtblick/studio@workspace:*, @lichtblick/studio@workspace:packages/studio": - version: 0.0.0-use.local - resolution: "@lichtblick/studio@workspace:packages/studio" - dependencies: - "@foxglove/tsconfig": 2.0.0 - typescript: 5.3.3 - languageName: unknown - linkType: soft - "@lichtblick/suite-web@workspace:*, @lichtblick/suite-web@workspace:packages/suite-web": version: 0.0.0-use.local resolution: "@lichtblick/suite-web@workspace:packages/suite-web" @@ -11059,7 +11059,7 @@ __metadata: "@lichtblick/den": "workspace:*" "@lichtblick/log": "workspace:*" "@lichtblick/studio-base": "workspace:*" - "@lichtblick/studio-desktop": "workspace:*" + "@lichtblick/suite-desktop": "workspace:*" electron: 25.8.4 playwright: 1.37.1 webpack: 5.93.0