Skip to content

chore: remove directory hack #152

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

Open
flying-sheep wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: remove directory hack #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e7d615
chore: remove directory hack
flying-sheep Apr 20, 2026
f8d33b1
Merge branch 'main' into no-dir-hack
flying-sheep Apr 26, 2026
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
2 changes: 2 additions & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
compressionLevel: mixed

enableScripts: true

nodeLinker: pnpm

plugins:
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
}
}
},
"main": "./dist/flying-sheep.hatch/extension.js",
"main": "./dist/extension.js",
"scripts": {
"postinstall": "concurrently -c auto -n husky,sync \"$npm_execpath postinstall:husky\" \"$npm_execpath sync\"",
"postinstall:husky": "husky",
Expand All @@ -60,7 +60,7 @@
"lint:deps": "knip --use-tsconfig-files",
"test": "$npm_execpath run build && vscode-test",
"vscode:prepublish": "$npm_execpath run sync && $npm_execpath run build",
"vsce-package": "vsce package --yarn --no-dependencies -o flying-sheep.hatch.vsix"
"vsce-package": "vsce package --yarn --no-dependencies"
},
"lint-staged": {
"*": "biome check --no-errors-on-unmatched --files-ignore-unknown=true --write"
Expand Down Expand Up @@ -89,7 +89,7 @@
"rolldown": "^1.0.0-rc.16",
"typescript": "^6.0.2"
},
"packageManager": "yarn@4.13.0",
"packageManager": "yarn@4.14.1",
"dependencies": {
"untildify": "^6.0.0",
"which": "^6.0.1"
Expand Down
3 changes: 1 addition & 2 deletions rolldown.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import swc from '@rollup/plugin-swc'
import { defineConfig } from 'rolldown'
import { withFilter } from 'rolldown/filter'
import { esmExternalRequirePlugin } from 'rolldown/plugins'
import { EXTENSION_ID } from './src/common/constants.js'

export default defineConfig({
input: 'src/extension.ts',
external: ['vscode'],
output: {
file: `dist/${EXTENSION_ID}/extension.js`,
file: `dist/extension.js`,
sourcemap: true,
},
platform: 'node',
Expand Down
7 changes: 5 additions & 2 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { type ExtensionContext, window } from 'vscode'
import { HatchExecutableTracker } from './cli/index.js'
import { EXTENSION_ID } from './common/constants.js'
import { registerLogger } from './common/logging.js'
import { setWorkspacePersistentState } from './common/persistent-state.js'
import { HatchEnvManager } from './hatch-env-manager.js'
Expand All @@ -25,8 +26,10 @@ export async function activate(context: ExtensionContext): Promise<Api> {
const pkgManager = new HatchPackageManager(api, exe, log)
context.subscriptions.push(
exe,
api.registerEnvironmentManager(envManager),
api.registerPackageManager(pkgManager),
api.registerEnvironmentManager(envManager, {
extensionId: EXTENSION_ID,
}),
api.registerPackageManager(pkgManager, { extensionId: EXTENSION_ID }),
)

return {
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!

__metadata:
version: 8
version: 9
cacheKey: 10

"@azu/format-text@npm:^1.0.1, @azu/format-text@npm:^1.0.2":
Expand Down