Skip to content

Commit c3a55b4

Browse files
NikolaRHristovNikolaRHristov
committed
Merge remote-tracking branch 'Parent/main' into Current
2 parents 1d8e380 + 741c08a commit c3a55b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+11597
-35
lines changed

‎.editorconfig‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
end_of_line = lf
7+
indent_style = space
8+
indent_size = 2
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
12+
[*.js]
13+
indent_size = 4
14+
15+
[*.json]
16+
indent_size = 4

‎.github/assignment.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
perform: true,
3+
assignees: [ aeschli ]
4+
}

‎.github/needs_more_info.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
daysUntilClose: 7,
3+
needsMoreInfoLabel: 'needs more info',
4+
perform: true,
5+
closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"
6+
}

‎.github/workflows/tests.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Tests CI
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
matrix:
16+
node-version: [18.x, 20.x]
17+
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
18+
19+
steps:
20+
- uses: actions/checkout@v3
21+
- name: Use Node.js ${{ matrix.node-version }}
22+
uses: actions/setup-node@v3
23+
with:
24+
node-version: ${{ matrix.node-version }}
25+
- run: npm ci
26+
- name: Run headless test
27+
uses: coactions/setup-xvfb@v1
28+
with:
29+
run: npm test

‎.vscode/launch.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
// Use IntelliSense to learn about possible Node.js debug attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
// make sure to have this generator npm-linked:
9+
// $ git clone https://github.com/Microsoft/vscode-generator-code
10+
// $ cd vscode-generator-code
11+
// $ npm link
12+
//
13+
"type": "node",
14+
"request": "launch",
15+
"name": "yeoman code",
16+
"program": "${workspaceFolder}/node_modules/yeoman-environment/cli/index.js",
17+
"args": [ "run", "code" ],
18+
"cwd": "${workspaceFolder}",
19+
"console": "integratedTerminal",
20+
"internalConsoleOptions": "neverOpen"
21+
},
22+
{
23+
"type": "node",
24+
"request": "launch",
25+
"name": "Mocha Tests",
26+
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
27+
"cwd": "${workspaceFolder}",
28+
"console": "integratedTerminal",
29+
"internalConsoleOptions": "openOnSessionStart"
30+
}
31+
]
32+
}

‎.vscode/settings.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
"editor.insertSpaces": true,
4+
"files.eol": "\n",
5+
"files.trimTrailingWhitespace": true,
6+
"git.branchProtection": [
7+
"main"
8+
],
9+
"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
10+
"git.branchRandomName.enable": true,
11+
"githubPullRequests.assignCreated": "${user}",
12+
"githubPullRequests.defaultMergeMethod": "squash"
13+
}

‎generators/app/dependencyVersions/package.json‎

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,38 @@
11
{
2-
"dependencies": {
3-
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
4-
"@types/assert": "^1.5.10",
5-
"@types/node": "20.x",
6-
"assert": "^2.1.0",
7-
"concurrently": "^8.2.2",
8-
"css-loader": "^7.1.2",
9-
"esbuild": "^0.23.1",
10-
"glob": "^11.0.0",
11-
"npm-run-all": "^4.1.5",
12-
"process": "^0.11.10",
13-
"style-loader": "^4.0.0",
14-
"ts-loader": "^9.5.1",
15-
"util": "^0.12.5"
16-
},
17-
"description": "Helper file to manage the versions of the node modules used by the generators. Named package.json so the VS Code dependencies completions work. Must be in a subfolder due to #325",
18-
"name": "generator-code-dependencies-versions"
2+
"name": "generator-code-dependencies-versions",
3+
"description": "Helper file to manage the versions of the node modules used by the generators. Named package.json so the VS Code dependencies completions work. Must be in a subfolder due to #325",
4+
"version": "0.0.0",
5+
"private": true,
6+
"dependencies": {
7+
"@types/mocha": "^10.0.7",
8+
"@types/node": "20.x",
9+
"@types/assert": "^1.5.10",
10+
"@typescript-eslint/eslint-plugin": "^8.3.0",
11+
"@typescript-eslint/parser": "^8.3.0",
12+
"eslint": "^9.9.1",
13+
"glob": "^11.0.0",
14+
"mocha": "^10.7.3",
15+
"typescript": "^5.5.4",
16+
"@vscode/test-cli": "^0.0.10",
17+
"@vscode/test-electron": "^2.4.1",
18+
"@vscode/test-web": "^0.0.58",
19+
"@types/webpack-env": "^1.18.5",
20+
"@types/vscode-notebook-renderer": "^1.72.3",
21+
"concurrently": "^8.2.2",
22+
"css-loader": "^7.1.2",
23+
"fork-ts-checker-webpack-plugin": "^9.0.2",
24+
"style-loader": "^4.0.0",
25+
"ts-loader": "^9.5.1",
26+
"vscode-dts": "^0.3.3",
27+
"vscode-notebook-error-overlay": "^1.0.1",
28+
"webpack": "^5.94.0",
29+
"util": "^0.12.5",
30+
"webpack-cli": "^5.1.4",
31+
"webpack-dev-server": "^5.0.4",
32+
"assert": "^2.1.0",
33+
"process": "^0.11.10",
34+
"npm-run-all": "^4.1.5",
35+
"esbuild": "^0.23.1",
36+
"@esbuild-plugins/node-globals-polyfill": "^0.2.3"
37+
}
1938
}

‎generators/app/templates/ext-colortheme/package.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"name": <%- JSON.stringify(name) %>,
3+
"displayName": <%- JSON.stringify(displayName) %>,
4+
"description": <%- JSON.stringify(description) %>,
5+
"version": "0.0.1",
6+
"engines": {
7+
"vscode": <%- JSON.stringify(vsCodeEngine) %>
8+
},
9+
"categories": [
10+
"Themes"
11+
],
12+
"contributes": {
13+
"themes": [
14+
{
15+
"label": <%- JSON.stringify(themeName) %>,
16+
"uiTheme": <%- JSON.stringify(themeBase) %>,
17+
"path": <%- JSON.stringify("./themes/" + themeFileName) %>
18+
}
19+
]
20+
}
21+
}

‎generators/app/templates/ext-command-js/.yarnrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--ignore-engines true

‎generators/app/templates/ext-command-js/jsconfig.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"compilerOptions": {
3+
"module": "Node16",
4+
"target": "ES2022",
5+
"checkJs": <%- JSON.stringify(checkJavaScript) %>, /* Typecheck .js files. */
6+
"lib": [
7+
"ES2022"
8+
]
9+
},
10+
"exclude": [
11+
"node_modules"
12+
]
13+
}

0 commit comments

Comments
 (0)