Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Webstorm support #51

Merged
merged 3 commits into from
Oct 10, 2024
Merged

Webstorm support #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef83920
Change plugin dependencies to support all IDEs with the JavaScript pl…
nrayburn-tech Oct 9, 2024
581daa0
Update build to run verification against IntelliJ Ultimate and Webstorm
nrayburn-tech Oct 9, 2024
9717cd5
Fix the verify step to have unique file names when uploading verifica…
nrayburn-tech Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ jobs:
name: Verify plugin
needs: [ build ]
runs-on: ubuntu-latest
strategy:
matrix:
platformType: ['IU', 'WS']
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is so that we execute the verify step on both IntelliJ Ultimate and Webstorm. It ensures that the APIs we use in our plugin are compatible with both projects. I think we might also be able to only depend on Webstorm and assume that IntelliJ Ultimate contains everything from Webstorm and more.

I'm open to changing this PR around to function that way if that is the preferred approach.

steps:

# Free GitHub Actions Environment Disk Space
Expand Down Expand Up @@ -209,14 +212,14 @@ jobs:

# Run Verify Plugin task and IntelliJ Plugin Verifier tool
- name: Run Plugin Verification tasks
run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
run: ./gradlew verifyPlugin -PplatformType=${{ matrix.platformType }} -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}

# Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: pluginVerifier-result
name: pluginVerifier-result-${{ matrix.platformType }}
path: ${{ github.workspace }}/build/reports/pluginVerifier

# Prepare a draft release for GitHub Releases page for the manual verification
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ platformVersion = 2023.3.2
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
platformPlugins =
# Example: platformBundledPlugins = com.intellij.java
platformBundledPlugins =
platformBundledPlugins = JavaScript

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.10.2
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
<name>Oxc</name>
<vendor>iwanabethatguy</vendor>

<depends>com.intellij.modules.ultimate</depends>

<depends>com.intellij.modules.platform</depends>
<depends>JavaScript</depends>

<resource-bundle>messages.MyBundle</resource-bundle>


<applicationListeners>
<listener class="com.github.iwanabethatguy.oxcintellijplugin.listeners.MyApplicationActivationListener" topic="com.intellij.openapi.application.ApplicationActivationListener"/>
</applicationListeners>
Expand Down
Loading