Skip to content

Commit 7cb83ed

Browse files
author
Astitv Shandilya
committed
Fix: dirs.js and gulpfile.extensions.js patching errors
1 parent b3f3325 commit 7cb83ed

File tree

13 files changed

+492
-4721
lines changed

13 files changed

+492
-4721
lines changed

‎patched-vscode/build/gulpfile.extensions.js‎

Lines changed: 184 additions & 184 deletions
Large diffs are not rendered by default.

‎patched-vscode/build/npm/dirs.js‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,64 @@ const fs = require('fs');
77

88
// Complete list of directories where yarn should be executed to install node modules
99
const dirs = [
10-
'',
11-
'build',
12-
'extensions',
13-
'extensions/configuration-editing',
14-
'extensions/css-language-features',
15-
'extensions/css-language-features/server',
16-
'extensions/debug-auto-launch',
17-
'extensions/debug-server-ready',
18-
'extensions/emmet',
19-
'extensions/extension-editing',
20-
'extensions/git',
21-
'extensions/git-base',
22-
'extensions/github',
23-
'extensions/github-authentication',
24-
'extensions/grunt',
25-
'extensions/gulp',
26-
'extensions/html-language-features',
27-
'extensions/html-language-features/server',
28-
'extensions/ipynb',
29-
'extensions/jake',
30-
'extensions/json-language-features',
31-
'extensions/json-language-features/server',
32-
'extensions/markdown-language-features/server',
33-
'extensions/markdown-language-features',
34-
'extensions/markdown-math',
35-
'extensions/media-preview',
36-
'extensions/merge-conflict',
37-
'extensions/microsoft-authentication',
38-
'extensions/notebook-renderers',
39-
'extensions/npm',
40-
'extensions/php-language-features',
41-
'extensions/references-view',
42-
'extensions/sagemaker-extension',
43-
'extensions/sagemaker-idle-extension',
44-
'extensions/sagemaker-terminal-crash-mitigation',
45-
'extensions/sagemaker-open-notebook-extension',
46-
'extensions/sagemaker-ui-dark-theme',
10+
'',
11+
'build',
12+
'extensions',
13+
'extensions/configuration-editing',
14+
'extensions/css-language-features',
15+
'extensions/css-language-features/server',
16+
'extensions/debug-auto-launch',
17+
'extensions/debug-server-ready',
18+
'extensions/emmet',
19+
'extensions/extension-editing',
20+
'extensions/git',
21+
'extensions/git-base',
22+
'extensions/github',
23+
'extensions/github-authentication',
24+
'extensions/grunt',
25+
'extensions/gulp',
26+
'extensions/html-language-features',
27+
'extensions/html-language-features/server',
28+
'extensions/ipynb',
29+
'extensions/jake',
30+
'extensions/json-language-features',
31+
'extensions/json-language-features/server',
32+
'extensions/markdown-language-features/server',
33+
'extensions/markdown-language-features',
34+
'extensions/markdown-math',
35+
'extensions/media-preview',
36+
'extensions/merge-conflict',
37+
'extensions/microsoft-authentication',
38+
'extensions/notebook-renderers',
39+
'extensions/npm',
40+
'extensions/php-language-features',
41+
'extensions/references-view',
42+
'extensions/sagemaker-extension',
43+
'extensions/sagemaker-idle-extension',
44+
'extensions/sagemaker-terminal-crash-mitigation',
45+
'extensions/sagemaker-open-notebook-extension',
46+
'extensions/sagemaker-ui-dark-theme',
4747
'extensions/post-startup-notifications',
48-
'extensions/search-result',
49-
'extensions/simple-browser',
50-
'extensions/tunnel-forwarding',
51-
'extensions/typescript-language-features',
52-
'extensions/vscode-api-tests',
53-
'extensions/vscode-colorize-tests',
54-
'extensions/vscode-test-resolver',
55-
'remote',
56-
'remote/web',
57-
'test/automation',
58-
'test/integration/browser',
59-
'test/monaco',
60-
'test/smoke',
61-
'.vscode/extensions/vscode-selfhost-test-provider',
48+
'extensions/search-result',
49+
'extensions/simple-browser',
50+
'extensions/tunnel-forwarding',
51+
'extensions/typescript-language-features',
52+
'extensions/vscode-api-tests',
53+
'extensions/vscode-colorize-tests',
54+
'extensions/vscode-test-resolver',
55+
'remote',
56+
'remote/web',
57+
'test/automation',
58+
'test/integration/browser',
59+
'test/monaco',
60+
'test/smoke',
61+
'.vscode/extensions/vscode-selfhost-test-provider',
6262
];
6363

6464
if (fs.existsSync(`${__dirname}/../../.build/distro/npm`)) {
65-
dirs.push('.build/distro/npm');
66-
dirs.push('.build/distro/npm/remote');
67-
dirs.push('.build/distro/npm/remote/web');
65+
dirs.push('.build/distro/npm');
66+
dirs.push('.build/distro/npm/remote');
67+
dirs.push('.build/distro/npm/remote/web');
6868
}
6969

7070
exports.dirs = dirs;

‎patched-vscode/extensions/post-startup-notifications/.vscode/extensions.json‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
{
2-
// See http://go.microsoft.com/fwlink/?LinkId=827846
3-
// for the documentation about the extensions.json format
4-
"recommendations": [
5-
"dbaeumer.vscode-eslint",
6-
"amodio.tsl-problem-matcher",
7-
"ms-vscode.extension-test-runner"
8-
]
9-
}
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
4+
"recommendations": ["dbaeumer.vscode-eslint", "amodio.tsl-problem-matcher", "ms-vscode.extension-test-runner"]
5+
}

‎patched-vscode/extensions/post-startup-notifications/.vscode/launch.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
// Hover to view descriptions of existing attributes.
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
{
6-
"version": "0.2.0",
7-
"configurations": [
8-
{
9-
"name": "Run Extension",
10-
"type": "extensionHost",
11-
"request": "launch",
12-
"args": [
13-
"--extensionDevelopmentPath=${workspaceFolder}"
14-
],
15-
"outFiles": [
16-
"${workspaceFolder}/dist/**/*.js"
17-
],
18-
"preLaunchTask": "${defaultBuildTask}"
19-
}
20-
]
21-
}
6+
"version": "0.2.0",
7+
"configurations": [
8+
{
9+
"name": "Run Extension",
10+
"type": "extensionHost",
11+
"request": "launch",
12+
"args": [
13+
"--extensionDevelopmentPath=${workspaceFolder}"
14+
],
15+
"outFiles": [
16+
"${workspaceFolder}/dist/**/*.js"
17+
],
18+
"preLaunchTask": "${defaultBuildTask}"
19+
}
20+
]
21+
}

‎patched-vscode/extensions/post-startup-notifications/.vscode/settings.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
3-
"files.exclude": {
4-
"out": false, // set this to true to hide the "out" folder with the compiled JS files
5-
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
6-
},
7-
"search.exclude": {
8-
"out": true, // set this to false to include "out" folder in search results
9-
"dist": true // set this to false to include "dist" folder in search results
10-
},
11-
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
12-
"typescript.tsc.autoDetect": "off"
13-
}
3+
"files.exclude": {
4+
"out": false, // set this to true to hide the "out" folder with the compiled JS files
5+
"dist": false // set this to true to hide the "dist" folder with the compiled JS files
6+
},
7+
"search.exclude": {
8+
"out": true, // set this to false to include "out" folder in search results
9+
"dist": true // set this to false to include "dist" folder in search results
10+
},
11+
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
12+
"typescript.tsc.autoDetect": "off"
13+
}

‎patched-vscode/extensions/post-startup-notifications/.vscode/tasks.json‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
// See https://go.microsoft.com/fwlink/?LinkId=733558
22
// for the documentation about the tasks.json format
33
{
4-
"version": "2.0.0",
5-
"tasks": [
6-
{
7-
"type": "npm",
8-
"script": "watch",
9-
"problemMatcher": "$ts-webpack-watch",
10-
"isBackground": true,
11-
"presentation": {
12-
"reveal": "never",
13-
"group": "watchers"
14-
},
15-
"group": {
16-
"kind": "build",
17-
"isDefault": true
18-
}
19-
},
20-
{
21-
"type": "npm",
22-
"script": "watch-tests",
23-
"problemMatcher": "$tsc-watch",
24-
"isBackground": true,
25-
"presentation": {
26-
"reveal": "never",
27-
"group": "watchers"
28-
},
29-
"group": "build"
30-
},
31-
{
32-
"label": "tasks: watch-tests",
33-
"dependsOn": [
34-
"npm: watch",
35-
"npm: watch-tests"
36-
],
37-
"problemMatcher": []
38-
}
39-
]
40-
}
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"type": "npm",
8+
"script": "watch",
9+
"problemMatcher": "$ts-webpack-watch",
10+
"isBackground": true,
11+
"presentation": {
12+
"reveal": "never",
13+
"group": "watchers"
14+
},
15+
"group": {
16+
"kind": "build",
17+
"isDefault": true
18+
}
19+
},
20+
{
21+
"type": "npm",
22+
"script": "watch-tests",
23+
"problemMatcher": "$tsc-watch",
24+
"isBackground": true,
25+
"presentation": {
26+
"reveal": "never",
27+
"group": "watchers"
28+
},
29+
"group": "build"
30+
},
31+
{
32+
"label": "tasks: watch-tests",
33+
"dependsOn": [
34+
"npm: watch",
35+
"npm: watch-tests"
36+
],
37+
"problemMatcher": []
38+
}
39+
]
40+
}

‎patched-vscode/extensions/post-startup-notifications/package.json‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
{
2-
"name": "post-startup-notifications",
3-
"displayName": "post-startup-notifications",
4-
"description": "Extension for surfacing post startup script status notifications to users",
5-
"version": "0.0.1",
6-
"publisher": "sagemaker",
7-
"license": "MIT",
8-
"engines": {
9-
"vscode": "^1.73.0"
10-
},
11-
"categories": [
12-
"Other"
13-
],
14-
"activationEvents": [
15-
"*"
16-
],
17-
"main": "./dist/extension.js",
18-
"contributes": {
19-
"commands": []
20-
},
21-
"scripts": {
22-
"test": "jest",
23-
"compile": "gulp compile-extension:post-startup-notifications",
24-
"watch": "npm run build-preview && gulp watch-extension:post-startup-notifications",
25-
"vscode:prepublish": "npm run build-ext",
26-
"build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:post-startup-notifications ./tsconfig.json"
27-
},
28-
"jest": {
29-
"preset": "ts-jest",
30-
"testEnvironment": "node",
31-
"moduleFileExtensions": [
32-
"ts",
33-
"js"
34-
]
35-
},
36-
"devDependencies": {
37-
"@types/jest": "^29.5.14",
38-
"@types/mocha": "^10.0.10",
39-
"@types/node": "20.x",
40-
"@types/vscode": "^1.98.0",
41-
"@typescript-eslint/eslint-plugin": "^8.25.0",
42-
"@typescript-eslint/parser": "^8.25.0",
43-
"@vscode/test-cli": "^0.0.10",
44-
"@vscode/test-electron": "^2.4.1",
45-
"eslint": "^9.21.0",
46-
"jest": "^29.7.0",
47-
"mocha": "^11.1.0",
48-
"ts-jest": "^29.3.0",
49-
"ts-loader": "^9.5.2",
50-
"typescript": "^5.7.3",
51-
"webpack": "^5.98.0",
52-
"webpack-cli": "^6.0.1"
53-
},
54-
"dependencies": {
55-
"chokidar": "^4.0.3"
56-
}
57-
}
2+
"name": "post-startup-notifications",
3+
"displayName": "post-startup-notifications",
4+
"description": "Extension for surfacing post startup script status notifications to users",
5+
"version": "0.0.1",
6+
"publisher": "sagemaker",
7+
"license": "MIT",
8+
"engines": {
9+
"vscode": "^1.73.0"
10+
},
11+
"categories": [
12+
"Other"
13+
],
14+
"activationEvents": [
15+
"*"
16+
],
17+
"main": "./dist/extension.js",
18+
"contributes": {
19+
"commands": []
20+
},
21+
"scripts": {
22+
"test": "jest",
23+
"compile": "gulp compile-extension:post-startup-notifications",
24+
"watch": "npm run build-preview && gulp watch-extension:post-startup-notifications",
25+
"vscode:prepublish": "npm run build-ext",
26+
"build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:post-startup-notifications ./tsconfig.json"
27+
},
28+
"jest": {
29+
"preset": "ts-jest",
30+
"testEnvironment": "node",
31+
"moduleFileExtensions": [
32+
"ts",
33+
"js"
34+
]
35+
},
36+
"devDependencies": {
37+
"@types/jest": "^29.5.14",
38+
"@types/mocha": "^10.0.10",
39+
"@types/node": "20.x",
40+
"@types/vscode": "^1.98.0",
41+
"@typescript-eslint/eslint-plugin": "^8.25.0",
42+
"@typescript-eslint/parser": "^8.25.0",
43+
"@vscode/test-cli": "^0.0.10",
44+
"@vscode/test-electron": "^2.4.1",
45+
"eslint": "^9.21.0",
46+
"jest": "^29.7.0",
47+
"mocha": "^11.1.0",
48+
"ts-jest": "^29.3.0",
49+
"ts-loader": "^9.5.2",
50+
"typescript": "^5.7.3",
51+
"webpack": "^5.98.0",
52+
"webpack-cli": "^6.0.1"
53+
},
54+
"dependencies": {
55+
"chokidar": "^4.0.3"
56+
}
57+
}

0 commit comments

Comments
 (0)