Skip to content

Commit b3dc7d7

Browse files
jcreedcmujcreedcmu
authored
Merge pull request #503 from jcreedcmu/jcreed/untangle2
Try moving build to just gulp
2 parents b6bd534 + 9ad0bf6 commit b3dc7d7

File tree

87 files changed

+10280
-11488
lines changed

Some content is hidden

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

87 files changed

+10280
-11488
lines changed

‎.github/workflows/main.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@ jobs:
1919
node-version: '10.18.1'
2020

2121
- name: Install dependencies
22-
run: node common/scripts/install-run-rush.js install
22+
run: |
23+
cd extensions/ql-vscode
24+
npm install
2325
shell: bash
2426

2527
- name: Build
26-
run: node common/scripts/install-run-rush.js build
28+
run: |
29+
cd extensions/ql-vscode
30+
npm run build
2731
shell: bash
2832

2933
- name: Prepare artifacts
@@ -57,11 +61,15 @@ jobs:
5761

5862
# We have to build the dependencies in `lib` before running any tests.
5963
- name: Install dependencies
60-
run: node common/scripts/install-run-rush.js install
64+
run: |
65+
cd extensions/ql-vscode
66+
npm install
6167
shell: bash
6268

6369
- name: Build
64-
run: node common/scripts/install-run-rush.js build
70+
run: |
71+
cd extensions/ql-vscode
72+
npm run build
6573
shell: bash
6674

6775
- name: Lint

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,15 @@ jobs:
3434
node-version: '10.18.1'
3535

3636
- name: Install dependencies
37-
run: node common/scripts/install-run-rush.js install
37+
run: |
38+
cd extensions/ql-vscode
39+
npm install
3840
shell: bash
3941

4042
- name: Build
41-
run: node common/scripts/install-run-rush.js build --release
43+
run: |
44+
cd extensions/ql-vscode
45+
npm run build -- --release
4246
shell: bash
4347

4448
- name: Prepare artifacts

‎.vscode/launch.json‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@
88
"request": "launch",
99
"runtimeExecutable": "${execPath}",
1010
"args": [
11-
"--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql"
11+
"--extensionDevelopmentPath=${workspaceRoot}/extensions/ql-vscode"
1212
],
1313
"stopOnEntry": false,
1414
"sourceMaps": true,
1515
"outFiles": [
16-
"${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
17-
"${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-bqrs/out/**/*.js",
18-
"${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-io/out/**/*.js",
19-
"${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-io-node/out/**/*.js",
20-
"${workspaceRoot}/dist/vscode-codeql/node_modules/@github/codeql-vscode-utils/out/**/*.js"
16+
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
2117
],
2218
"preLaunchTask": "Build"
2319
},
@@ -54,13 +50,13 @@
5450
"request": "launch",
5551
"runtimeExecutable": "${execPath}",
5652
"args": [
57-
"--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql",
53+
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
5854
"--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/no-workspace/index"
5955
],
6056
"stopOnEntry": false,
6157
"sourceMaps": true,
6258
"outFiles": [
63-
"${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
59+
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
6460
"${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/**/*.js"
6561
],
6662
"preLaunchTask": "Build"
@@ -71,14 +67,14 @@
7167
"request": "launch",
7268
"runtimeExecutable": "${execPath}",
7369
"args": [
74-
"--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql",
70+
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
7571
"--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/minimal-workspace/index",
7672
"${workspaceRoot}/extensions/ql-vscode/test/data"
7773
],
7874
"stopOnEntry": false,
7975
"sourceMaps": true,
8076
"outFiles": [
81-
"${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
77+
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
8278
"${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/**/*.js"
8379
],
8480
"preLaunchTask": "Build"

‎.vscode/tasks.json‎

Lines changed: 9 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
"kind": "build",
1111
"isDefault": true
1212
},
13-
"command": "node common/scripts/install-run-rush.js build --verbose",
13+
"command": "npx gulp buildWithoutPackage --verbose",
14+
"options": {
15+
"cwd": "extensions/ql-vscode/"
16+
},
1417
"presentation": {
1518
"echo": true,
1619
"reveal": "always",
@@ -33,64 +36,13 @@
3336
"$ts-webpack"
3437
]
3538
},
36-
{
37-
"label": "Rebuild",
38-
"type": "shell",
39-
"group": "build",
40-
"command": "node common/scripts/install-run-rush.js rebuild --verbose",
41-
"presentation": {
42-
"echo": true,
43-
"reveal": "always",
44-
"focus": false,
45-
"panel": "shared",
46-
"showReuseMessage": true,
47-
"clear": true
48-
},
49-
"problemMatcher": [
50-
{
51-
"owner": "typescript",
52-
"fileLocation": "absolute",
53-
"pattern": {
54-
"regexp": "^\\[gulp-typescript\\] ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): error TS\\d+: (.*)$",
55-
"file": 1,
56-
"location": 2,
57-
"message": 3
58-
}
59-
}
60-
]
61-
},
62-
{
63-
"label": "Update",
64-
"type": "shell",
65-
"command": "node common/scripts/install-run-rush.js update",
66-
"presentation": {
67-
"echo": true,
68-
"reveal": "always",
69-
"focus": false,
70-
"panel": "shared",
71-
"showReuseMessage": true,
72-
"clear": true
73-
},
74-
"problemMatcher": []
75-
},
76-
{
77-
"label": "Update (full)",
78-
"type": "shell",
79-
"command": "node common/scripts/install-run-rush.js update --full",
80-
"presentation": {
81-
"echo": true,
82-
"reveal": "always",
83-
"focus": false,
84-
"panel": "shared",
85-
"showReuseMessage": true,
86-
"clear": true
87-
},
88-
"problemMatcher": []
89-
},
9039
{
9140
"label": "Format",
9241
"type": "shell",
93-
"command": "node common/scripts/install-run-rush.js format",
42+
"command": "npm run format",
43+
"options": {
44+
"cwd": "extensions/ql-vscode/"
45+
},
9446
"presentation": {
9547
"echo": true,
9648
"reveal": "always",
@@ -111,4 +63,4 @@
11163
"group": "build"
11264
}
11365
]
114-
}
66+
}

‎common/config/LICENSE‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎common/config/rush/.npmrc‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎common/config/rush/command-line.json‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎common/config/rush/common-versions.json‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)