Skip to content

Commit

Permalink
Additional changes: studio-desktop
Browse files Browse the repository at this point in the history
  • Loading branch information
laisspportugal committed Aug 1, 2024
1 parent de1de9a commit 0f08a6f
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion desktop/electronBuilderConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion desktop/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
2 changes: 1 addition & 1 deletion desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion desktop/preload/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
2 changes: 1 addition & 1 deletion desktop/quicklook/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
6 changes: 3 additions & 3 deletions desktop/renderer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
12 changes: 6 additions & 6 deletions desktop/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@lichtblick/studio-desktop",
"name": "@lichtblick/suite-desktop",
"license": "MPL-2.0",
"private": true,
"main": "./src/index.tsx",
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-desktop/src/main/getDevModeIcon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
),
);
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0f08a6f

Please sign in to comment.