Skip to content

Commit

Permalink
Merge branch 'master' into ts-incremental-parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
dummdidumm authored Nov 5, 2024
2 parents 8319aa2 + 02b6b06 commit 2c4ca3e
Show file tree
Hide file tree
Showing 1,622 changed files with 48,340 additions and 15,954 deletions.
6 changes: 0 additions & 6 deletions .eslintignore

This file was deleted.

31 changes: 0 additions & 31 deletions .eslintrc.js

This file was deleted.

41 changes: 0 additions & 41 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

66 changes: 66 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: "Bug report"
description: "Create a report to help us improve"
labels: ["bug"]

body:
- type: markdown
attributes:
value: |
Before you submit a bug, please make sure that:
- you have searched and found no existing open issue with the problem at hand
- you don't have `"files.associations": {"*.svelte": "html" }` inside your VSCode settings (if you can't remember ever doing that, you don't have that)
- you are using Svelte for VS Code (NOT the old "Svelte" extension by James Birtles) and have disabled all other Svelte-related extensions to reproduce the bug
- if it's a preprocessor related bug like "can't use typescript", did you setup `svelte-preprocess` and/or `svelte.config.js`? See the docs for more info.
- type: textarea
id: bug-description
attributes:
label: Describe the bug
description: "Bug description"
placeholder: "A clear and concise description of what the bug is."
validations:
required: true

- type: textarea
id: reproduction
attributes:
label: Reproduction
description: Steps to reproduce
placeholder: "For example, a code snippet that is treated in a way you don't expect."
validations:
required: true

- type: textarea
id: expectation
attributes:
label: Expected behaviour
placeholder: "A clear and concise description of what you expected to happen."
validations:
required: true

- type: textarea
id: system-info
attributes:
label: System Info
description: "Your operating system, editor, extension version etc."
value: |
- OS: [e.g. Windows]
- IDE: [e.g. VSCode, Atom]
validations:
required: true

- type: dropdown
id: package
attributes:
label: Which package is the issue about?
multiple: true
options:
- Svelte for VS Code extension
- svelte-language-server
- svelte2tsx
- svelte-check

- type: textarea
id: additional-context
attributes:
label: Additional Information, eg. Screenshots
24 changes: 0 additions & 24 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: "Feature request"
description: "Suggest an idea for this project"

body:
- type: textarea
id: description
attributes:
label: Description
description: "Is your feature request related to a problem? Please describe."
placeholder: "I'm always frustrated when..."
validations:
required: true

- type: textarea
id: proposed-solution
attributes:
label: Proposed solution
description: "Describe the solution you'd like"
placeholder: "A clear and concised description of what you want to happen."
validations:
required: true

- type: textarea
id: alternatives
attributes:
label: Alternatives
description: "Describe alternatives you've considered"

- type: textarea
id: additional-context
attributes:
label: Additional Information, eg. Screenshots
64 changes: 39 additions & 25 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,59 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: "12.x"
cache: yarn
node-version: "18.x"
cache: pnpm

# Get projects set up
- run: yarn install
- run: yarn bootstrap
- run: yarn build
- run: pnpm install
- run: pnpm bootstrap
- run: pnpm build

# Run any tests
- run: yarn test
- run: pnpm test
env:
CI: true

lint:
test-svelte5:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: "12.x"
cache: yarn
node-version: "18.x"
cache: pnpm

# Lets us use one-liner JSON manipulations the package.json files
- run: "npm install -g json"

# Get projects set up
- run: json -I -f package.json -e 'this.pnpm={"overrides":{"svelte":"^5.0.0-next.100"}}'
- run: pnpm install --no-frozen-lockfile
- run: pnpm bootstrap
- run: pnpm build

# Run any tests
- run: pnpm test
env:
CI: true

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
lint:
runs-on: ubuntu-latest

- uses: actions/cache@v1
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
node-version: "18.x"
cache: pnpm

# Get projects set up
- run: yarn install

- run: yarn lint
- run: pnpm install
- run: pnpm lint
49 changes: 0 additions & 49 deletions .github/workflows/Deploy.yml

This file was deleted.

30 changes: 18 additions & 12 deletions .github/workflows/DeployExtensionsProd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,43 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: "14.x"
node-version: "18.x"
registry-url: "https://registry.npmjs.org"
cache: yarn
cache: pnpm

# Ensure everything is compiling
- run: "yarn install"
- run: "yarn build"
- run: "pnpm install"
- run: "pnpm build"
- run: "pnpm bootstrap"

# Lets us use one-liner JSON manipulations the package.json files
- run: "npm install -g json"

# Setup the environment
- run: 'json -I -f packages/svelte-vscode/package.json -e "this.version=\`${{ github.ref }}\`.split(\`-\`).pop()"'
- run: json -I -f packages/svelte-vscode/package.json -e "this.version=\`${{ github.ref }}\`.split(\`-\`).pop()"

# To deploy we need isolated node_modules folders which yarn won't do because it is a workspace
# To deploy we need isolated node_modules folders which pnpm won't do because it is a workspace
# So, remove the workspace
- run: "rm package.json yarn.lock" # Re-run the yarn install outside of the workspace
- run: "rm package.json pnpm-workspace.yaml pnpm-lock.yaml"
- run: "rm -rf packages/svelte-vscode/node_modules" # pnpm version of stuff, needs to be removed
# ... and remove the workspace:* references
- run: json -I -f packages/svelte-vscode/package.json -e 'this.dependencies["svelte-language-server"]="*"'
- run: json -I -f packages/svelte-vscode/package.json -e 'this.dependencies["typescript-svelte-plugin"]="*"'

- run: |
cd packages/svelte-vscode
yarn install
npm install
# Just a hard constraint from the vscode marketplace's usage of azure tokens
echo "Once a year this expires, tell Orta to access https://dev.azure.com/ortatherox0608/_usersSettings/tokens (logging in with GitHub) to get a new one"
# Ship it
npx vsce publish --yarn -p $VSCE_TOKEN
npx ovsx publish --yarn -p $OVSX_TOKEN
npx vsce publish -p $VSCE_TOKEN
npx ovsx publish -p $OVSX_TOKEN
env:
VSCE_TOKEN: ${{ secrets.AZURE_PAN_TOKEN }}
Expand Down
Loading

0 comments on commit 2c4ca3e

Please sign in to comment.