Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
filip131311 committed Feb 25, 2025
2 parents 392f762 + 955e5bf commit 405b92e
Show file tree
Hide file tree
Showing 45 changed files with 2,126 additions and 132 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/lint-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- uses: actions/checkout@v4
with:
repository: software-mansion-labs/vscode-js-debug
path: packages/vscode-js-debug
- name: Enforce HTTPS for submodules
run: git config --global url."https://github.com/".insteadOf "[email protected]:"

- name: Setup node
uses: actions/setup-node@v4
Expand All @@ -39,7 +37,7 @@ jobs:

- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
run: npm i
run: npm ci

- name: Lint extension
working-directory: ${{ env.WORKING_DIRECTORY }}
Expand Down
91 changes: 91 additions & 0 deletions .github/workflows/publish-extension.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: Publish vscode-extension
on:
workflow_dispatch:
inputs:
prerelease:
description: 'Pre-release'
default: false
type: boolean
publish_macos:
description: 'macOS'
default: true
type: boolean
publish_windows:
description: 'Windows'
default: false
type: boolean
publish_linux:
description: 'Linux'
default: false
type: boolean
ref:
description: 'The branch, tag or SHA to checkout'
default: 'main'
type: string

jobs:
build-and-publish:
runs-on: ubuntu-latest

steps:
- name: Set targets
id: set_targets
run: |
targets=""
if ${{ github.event.inputs.publish_macos }}; then
targets="$targets darwin-x64 darwin-arm64"
fi
if ${{ github.event.inputs.publish_windows }}; then
targets="$targets win32-x64"
fi
if ${{ github.event.inputs.publish_linux }}; then
targets="$targets linux-x64"
fi
if [ -z "$targets" ]; then
echo "No targets specified"
exit 1
fi
echo "Publishing for targets: $targets"
echo "::set-output name=targets::$targets"
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.ref }}

- name: Enforce HTTPS for submodules
run: git config --global url."https://github.com/".insteadOf "[email protected]:"

- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: npm
cache-dependency-path: packages/vscode-extension/package-lock.json

- name: Change directory
run: cd packages/vscode-extension

- name: Install dependencies
run: npm ci

- name: Build and publish to Visual Studio Marketplace
uses: HaaLeo/publish-vscode-extension@v1
id: vs_marketplace_publish
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
target: ${{ steps.set_targets.outputs.targets }}
pat: ${{ secrets.VSCODE_MARKETPLACE_TOKEN }}
preRelease: ${{ github.event.inputs.prerelease }}
registryUrl: https://marketplace.visualstudio.com

- name: Publish to Open VSX Registry
uses: HaaLeo/publish-vscode-extension@v1
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
target: ${{ steps.set_targets.outputs.targets }}
pat: ${{ secrets.OPENVSX_MARKETPLACE_TOKEN }}
preRelease: ${{ github.event.inputs.prerelease }}
extensionFile: ${{ steps.vs_marketplace_publish.outputs.vsixPath }}
8 changes: 3 additions & 5 deletions .github/workflows/typecheck-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- uses: actions/checkout@v4
with:
repository: software-mansion-labs/vscode-js-debug
path: packages/vscode-js-debug
- name: Enforce HTTPS for submodules
run: git config --global url."https://github.com/".insteadOf "[email protected]:"

- name: Setup node
uses: actions/setup-node@v4
Expand All @@ -39,7 +37,7 @@ jobs:

- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
run: npm i
run: npm ci

- name: Typecheck extension
working-directory: ${{ env.WORKING_DIRECTORY }}
Expand Down
4 changes: 4 additions & 0 deletions packages/docs/docs/guides/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,7 @@ Radon IDE supports a wide range of themes, but it's not possible to support all
If you're using a theme that doesn't look good with Radon IDE, please open an issue on the [Radon IDE GitHub repository](https://github.com/software-mansion/radon-ide/issues/new/choose) and we'll try to fix it. Menawhile you can use built-in themes. Radon IDE comes with dedicated light and dark themes.

<img width="698" alt="change-theme-type" src="/img/docs/change_theme_type.png" className="shadow-image"/>

### -sec-num- Node version is not supported

Radon IDE uses node version inherited from a shell run in the application root, and checks if it satisfies `react-native` minimum requirements. If you have a specific setup that uses node version from outside this range or you want to narrow down the scope of compatible versions for your internal needs, you can do so by specifying `engines` field of your applications `package.json`. If you have a problem installing a compatible node version, we recommend using a tool like [nvm](https://github.com/nvm-sh/nvm).
Binary file added packages/vscode-extension/assets/font-icons.woff2
Binary file not shown.
19 changes: 19 additions & 0 deletions packages/vscode-extension/font-icons/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Custom Icons bundled as a font

This directory contains the icons that are bundled as a font in the `assets/font-icons` directory.

Some custom icons that are used by the extensions cannot be provided as SVGs because they are not styled according to the editor themes.

This is specifically the case for icons used by "menus" extension point as defined in `package.json`.

Icons bundled as a font can be referenced in the extension configuration using the `$(icon-id)` syntax.

## Adding new icons

In order to add new icons to the font, you can use the following steps:

1. Add SVG version of the icon to the `font-icons` directory. Keep the size and format consistent with the existing icons and with VSCode guidelines (i.e. https://code.visualstudio.com/api/references/contribution-points#Command-icon-specifications).
2. Add the icon to the `fantasticon.config.json` file and assign a codepoint.
3. Run `npm run build:icons` to build the font.
4. List the new icon in `package.json` under `contributes.icons` section, assign a name and use the codepoint of the icon as the `fontCharacter` value. Use `"radon-"` prefix for the icon name to avoid it colliding with other icons.
5. Commit the icon, updated woff2 font file, and the updates to the `package.json` file.
10 changes: 10 additions & 0 deletions packages/vscode-extension/font-icons/fantasticon.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"inputDir": "./font-icons/",
"outputDir": "./assets/",
"fontTypes": ["woff2"],
"assetTypes": [],
"name": "font-icons",
"codepoints": {
"off": "0xE001"
}
}
4 changes: 4 additions & 0 deletions packages/vscode-extension/font-icons/off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions packages/vscode-extension/lib/wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -395,14 +395,12 @@ export function AppWrapper({ children, initialProps, fabric }) {
appKey,
navigationPlugins: navigationPlugins.map((plugin) => plugin.name),
});
devtoolsAgent._bridge.send("RNIDE_devtoolPluginsChanged", {
plugins: Array.from(devtoolPlugins.values()),
});
devtoolPluginsChanged = () => {
devtoolsAgent._bridge.send("RNIDE_devtoolPluginsChanged", {
plugins: Array.from(devtoolPlugins.values()),
});
};
devtoolPluginsChanged();
return () => {
devtoolPluginsChanged = undefined;
};
Expand Down
1 change: 1 addition & 0 deletions packages/vscode-extension/media/create-new-device.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<video src="./create-new-device.mp4" autoPlay muted loop></video>
Binary file not shown.
1 change: 1 addition & 0 deletions packages/vscode-extension/media/explore-features.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<video src="./explore-features.mp4" autoPlay muted loop></video>
Binary file not shown.
1 change: 1 addition & 0 deletions packages/vscode-extension/media/open-ide-panel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<video src="./open-ide-panel.mp4" autoPlay muted loop></video>
Binary file not shown.
12 changes: 12 additions & 0 deletions packages/vscode-extension/media/radon-bubble.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<video src="./wait-for-project-to-build.mp4" autoPlay muted loop></video>
Binary file not shown.
Loading

0 comments on commit 405b92e

Please sign in to comment.