Skip to content

Commit bea2107

Browse files
committed
Stop nohoisting extension dependencies
1 parent 637b7e0 commit bea2107

File tree

7 files changed

+392
-31
lines changed

7 files changed

+392
-31
lines changed

packages/template/__tests__/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"extends": "../../../tsconfig.compileroptions.json",
33
"compilerOptions": {
44
"noEmit": true,
5-
"lib": ["dom"]
5+
"lib": ["es2020", "dom"]
66
}
77
}

packages/vscode/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"compile": "tsc --build",
3131
"bundle": "esbuild lib/src/extension.js --bundle --outfile=dist/extension.js --platform=node --external:vscode --minify",
3232
"vscode:prepublish": "yarn build",
33-
"extension:package": "vsce package --no-depencencies",
33+
"extension:package": "vsce package --no-dependencies",
3434
"extension:publish": "vsce publish --no-dependencies"
3535
},
3636
"engines": {
@@ -85,11 +85,6 @@
8585
"color": "#1E293B",
8686
"theme": "dark"
8787
},
88-
"workspaces": {
89-
"nohoist": [
90-
"**/*"
91-
]
92-
},
9388
"dependencies": {
9489
"vscode-languageclient": "^8.0.1"
9590
},
@@ -101,11 +96,15 @@
10196
"@types/mocha": "^10.0.1",
10297
"@types/vscode": "^1.68.1",
10398
"@vscode/test-electron": "2.2.0",
99+
"@vscode/vsce": "^2.19.0",
104100
"esbuild": "^0.15.16",
105101
"expect": "^29.5.0",
106102
"mocha": "^10.2.0",
107103
"glob": "^10.2.4"
108104
},
105+
"volta": {
106+
"extends": "../../package.json"
107+
},
109108
"__metadata": {
110109
"id": "f1370239-cb1d-475c-b9da-20961224a998",
111110
"publisherDisplayName": "typed-ember",

test-packages/test-utils/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"exports": {
77
".": "./lib/index.js"
88
},
9+
"dependencies": {
10+
"execa": "^7.1.1"
11+
},
912
"scripts": {
1013
"test": "true"
1114
}

test-packages/test-utils/src/project.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as path from 'node:path';
22
import * as fs from 'node:fs';
33
import { fileURLToPath } from 'node:url';
44
import { createRequire } from 'node:module';
5-
import { node, ExecaChildProcess, Options } from 'execa';
5+
import { execaNode, ExecaChildProcess, Options } from 'execa';
66
import { type GlintConfigInput } from '@glint/core/config-types';
77
import { pathUtils, analyzeProject, ProjectAnalysis } from '@glint/core';
88

@@ -175,7 +175,7 @@ export class Project {
175175
}
176176

177177
public check(options: Options & { flags?: string[] } = {}): ExecaChildProcess {
178-
return node(require.resolve('@glint/core/bin/glint'), options.flags, {
178+
return execaNode(require.resolve('@glint/core/bin/glint'), options.flags, {
179179
cwd: this.rootDir,
180180
...options,
181181
});
@@ -188,7 +188,7 @@ export class Project {
188188
public build(options: Options & { flags?: string[] } = {}, debug = false): ExecaChildProcess {
189189
let build = ['--build'];
190190
let flags = options.flags ? build.concat(options.flags) : build;
191-
return node(require.resolve('@glint/core/bin/glint'), flags, {
191+
return execaNode(require.resolve('@glint/core/bin/glint'), flags, {
192192
cwd: this.rootDir,
193193
nodeOptions: debug ? ['--inspect-brk'] : [],
194194
...options,

test-packages/test-utils/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"extends": "../../tsconfig.compileroptions.json",
33
"compilerOptions": {
44
"outDir": "lib",
5-
"rootDir": "src"
5+
"rootDir": "src",
6+
"types": ["node"]
67
},
78
"include": ["src"],
89
"references": [{ "path": "../../packages/core" }]

tsconfig.compileroptions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"esModuleInterop": false,
1111
"composite": true,
1212
"declaration": true,
13-
"sourceMap": true
13+
"sourceMap": true,
14+
"types": []
1415
}
1516
}

0 commit comments

Comments
 (0)