Skip to content

Commit 4909a6a

Browse files
author
Brian Canzanella
committed
reworking the builds
1 parent d2d1631 commit 4909a6a

19 files changed

+460
-458
lines changed

Diff for: ‎atom/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎atom/webpack.config.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ module.exports = function(env, argv) {
2626

2727
console.log("Ensuring extension symlink to the agent protocol folder...");
2828
createFolderSymlinkSync(
29-
path.resolve(__dirname, "../codestream-lsp-agent/src/protocol"),
29+
path.resolve(__dirname, "../shared/agent/src/protocol"),
3030
path.resolve(protocolPath, "agent"),
3131
env
3232
);
3333

3434
console.log("Ensuring extension symlink to the webview protocol folder...");
3535
createFolderSymlinkSync(
36-
path.resolve(__dirname, "../codestream-components/ipc"),
36+
path.resolve(__dirname, "../shared/ui/ipc"),
3737
path.resolve(protocolPath, "webview"),
3838
env
3939
);
4040

4141
console.log("Ensuring webview symlink to the agent protocol folder...");
42-
const protocolPathForWebview = path.resolve(__dirname, "../codestream-components/protocols");
42+
const protocolPathForWebview = path.resolve(__dirname, "../shared/ui/protocols");
4343
if (!fs.existsSync(protocolPathForWebview)) {
4444
fs.mkdirSync(protocolPathForWebview);
4545
}
4646
createFolderSymlinkSync(
47-
path.resolve(__dirname, "../codestream-lsp-agent/src/protocol"),
47+
path.resolve(__dirname, "../shared/agent/src/protocol"),
4848
path.resolve(protocolPathForWebview, "agent"),
4949
env
5050
);
@@ -63,15 +63,15 @@ function getExtensionConfig(env) {
6363
copy: [
6464
{
6565
// TODO: Use environment variable if exists
66-
source: path.resolve(__dirname, "../codestream-lsp-agent/dist"),
66+
source: path.resolve(__dirname, "../shared/agent/dist"),
6767
destination: "dist/agent"
6868
},
6969
// {
7070
// source: path.resolve(__dirname, "codestream-*.info"),
7171
// destination: "dist/",
7272
// },
7373
{
74-
source: path.resolve(__dirname, "../codestream-components/assets/icons"),
74+
source: path.resolve(__dirname, "../shared/ui/assets/icons"),
7575
destination: "dist/icons"
7676
}
7777
]
@@ -169,25 +169,25 @@ function getWebviewConfig(env) {
169169
destination: "dist/webview/styles/"
170170
},
171171
{
172-
source: path.resolve(__dirname, "../codestream-components/styles/*"),
172+
source: path.resolve(__dirname, "../shared/ui/styles/*"),
173173
destination: "dist/webview/styles/"
174174
},
175175
{
176176
source: path.resolve(
177177
__dirname,
178-
"../codestream-components/node_modules/rc-tooltip/assets/bootstrap.css"
178+
"../shared/ui/node_modules/rc-tooltip/assets/bootstrap.css"
179179
),
180180
destination: "dist/webview/node_modules/rc-tooltip/assets/bootstrap.css"
181181
},
182182
{
183183
source: path.resolve(
184184
__dirname,
185-
"../codestream-components/node_modules/emoji-mart/css/emoji-mart.css"
185+
"../shared/ui/node_modules/emoji-mart/css/emoji-mart.css"
186186
),
187187
destination: "dist/webview/node_modules/emoji-mart/css/emoji-mart.css"
188188
},
189189
{
190-
source: path.resolve(__dirname, "../codestream-components/assets/icons"),
190+
source: path.resolve(__dirname, "../shared/ui/assets/icons"),
191191
destination: "dist/icons"
192192
}
193193
]

Diff for: ‎atom/webview-lib/tsconfig.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"noUnusedLocals": false,
1717
"outDir": "../dist",
1818
"paths": {
19-
"@codestream/protocols/agent": ["../../codestream-components/protocols/agent/agent.protocol"],
20-
"@codestream/protocols/api": ["../../codestream-components/protocols/agent/api.protocol"],
21-
"@codestream/protocols/webview": ["../../codestream-components/ipc/webview.protocol"],
22-
"@codestream/webview/*": ["../../codestream-components/*"],
23-
"react": ["../../codestream-components/node_modules/react"],
24-
"react-dom": ["../../codestream-components/node_modules/react-dom"],
25-
"vscode-jsonrpc": ["../../codestream-components/vscode-jsonrpc.shim.ts"]
19+
"@codestream/protocols/agent": ["../../shared/ui/protocols/agent/agent.protocol"],
20+
"@codestream/protocols/api": ["../../shared/ui/protocols/agent/api.protocol"],
21+
"@codestream/protocols/webview": ["../../shared/ui/ipc/webview.protocol"],
22+
"@codestream/webview/*": ["../../shared/ui/*"],
23+
"react": ["../../shared/ui/node_modules/react"],
24+
"react-dom": ["../../shared/ui/node_modules/react-dom"],
25+
"vscode-jsonrpc": ["../../shared/ui/vscode-jsonrpc.shim.ts"]
2626
},
2727
"rootDir": ".",
2828
"skipLibCheck": true,

Diff for: ‎bin/placeholder.txt

Whitespace-only changes.

Diff for: ‎jb/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
"clean:ci": "git clean -xdf -e licenses/**/* && npm run webview:clean:ci && npm run agent:clean:ci",
2020
"rebuild": "npm run clean && npm install --no-save && npm run agent:rebuild && npm run build",
2121
"watch": "webpack --watch --env.development --info-verbosity verbose",
22-
"agent:build": "pushd \"../codestream-lsp-agent\" && npm run build && popd",
23-
"agent:bundle": "pushd \"../codestream-lsp-agent\" && npm run bundle && popd",
24-
"agent:clean:ci": "pushd \"../codestream-lsp-agent\" && npm run clean:ci && popd",
25-
"agent:pkg": "pushd \"../codestream-lsp-agent\" && npm run pkg-jetbrains && popd",
26-
"agent:pkg:mac": "pushd \"../codestream-lsp-agent\" && npm run pkg-jetbrains-mac && popd",
27-
"agent:rebuild": "pushd \"../codestream-lsp-agent\" && npm run rebuild && popd",
28-
"agent:test": "pushd \"../codestream-lsp-agent\" && npm run test && popd",
29-
"agent:watch": "pushd \"../codestream-lsp-agent\" && npm run watch && popd",
22+
"agent:build": "pushd \"../shared/agent\" && npm run build && popd",
23+
"agent:bundle": "pushd \"../shared/agent\" && npm run bundle && popd",
24+
"agent:clean:ci": "pushd \"../shared/agent\" && npm run clean:ci && popd",
25+
"agent:pkg": "pushd \"../shared/agent\" && npm run pkg-jetbrains && popd",
26+
"agent:pkg:mac": "pushd \"../shared/agent\" && npm run pkg-jetbrains-mac && popd",
27+
"agent:rebuild": "pushd \"../shared/agent\" && npm run rebuild && popd",
28+
"agent:test": "pushd \"../shared/agent\" && npm run test && popd",
29+
"agent:watch": "pushd \"../shared/agent\" && npm run watch && popd",
3030
"webview:analyze": "webpack --env.analyzeWebview",
31-
"webview:clean:ci": "pushd \"../codestream-components\" && npm run clean:ci && popd",
32-
"preinstall": "pushd \"../codestream-components\" && npm install --no-save && popd"
31+
"webview:clean:ci": "pushd \"../shared/ui\" && npm run clean:ci && popd",
32+
"preinstall": "pushd \"../shared/ui\" && npm install --no-save && popd"
3333
},
3434
"dependencies": {
3535
"core-js": "2.6.9"

Diff for: ‎jb/webpack.config.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@ module.exports = function(env, argv) {
2424

2525
console.log("Ensuring extension symlink to the agent protocol folder...");
2626
createFolderSymlinkSync(
27-
path.resolve(__dirname, "../codestream-lsp-agent/src/protocol"),
27+
path.resolve(__dirname, "../shared/agent/src/protocol"),
2828
path.resolve(protocolPath, "agent"),
2929
env
3030
);
3131

3232
console.log("Ensuring extension symlink to the webview protocol folder...");
3333
createFolderSymlinkSync(
34-
path.resolve(__dirname, "../codestream-components/ipc"),
34+
path.resolve(__dirname, "../shared/ui/ipc"),
3535
path.resolve(protocolPath, "webview"),
3636
env
3737
);
3838

39-
protocolPath = path.resolve(__dirname, "../codestream-components/protocols");
39+
protocolPath = path.resolve(__dirname, "../shared/ui/protocols");
4040
if (!fs.existsSync(protocolPath)) {
4141
fs.mkdirSync(protocolPath);
4242
}
4343

4444
console.log("Ensuring webview symlink to the agent protocol folder...");
4545
createFolderSymlinkSync(
46-
path.resolve(__dirname, "../codestream-lsp-agent/src/protocol"),
46+
path.resolve(__dirname, "../shared/agent/src/protocol"),
4747
path.resolve(protocolPath, "agent"),
4848
env
4949
);
@@ -171,20 +171,20 @@ module.exports = function(env, argv) {
171171
alias: {
172172
"@codestream/protocols/agent": path.resolve(
173173
__dirname,
174-
"../codestream-components/protocols/agent/agent.protocol.ts"
174+
"../shared/ui/protocols/agent/agent.protocol.ts"
175175
),
176176
"@codestream/protocols/api": path.resolve(
177177
__dirname,
178-
"../codestream-components/protocols/agent/api.protocol.ts"
178+
"../shared/ui/protocols/agent/api.protocol.ts"
179179
),
180180
"@codestream/protocols/webview": path.resolve(
181181
__dirname,
182-
"../codestream-components/ipc/webview.protocol.ts"
182+
"../shared/ui/ipc/webview.protocol.ts"
183183
),
184-
"@codestream/webview": path.resolve(__dirname, "../codestream-components/"),
185-
react: path.resolve(__dirname, "../codestream-components/node_modules/react"),
186-
"react-dom": path.resolve(__dirname, "../codestream-components/node_modules/react-dom"),
187-
"vscode-jsonrpc": path.resolve(__dirname, "../codestream-components/vscode-jsonrpc.shim.ts")
184+
"@codestream/webview": path.resolve(__dirname, "../shared/ui/"),
185+
react: path.resolve(__dirname, "../shared/ui/node_modules/react"),
186+
"react-dom": path.resolve(__dirname, "../shared/ui/node_modules/react-dom"),
187+
"vscode-jsonrpc": path.resolve(__dirname, "../shared/ui/vscode-jsonrpc.shim.ts")
188188
},
189189
// Treats symlinks as real files -- using their "current" path
190190
symlinks: false

Diff for: ‎jb/webview/tsconfig.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
"outDir": "../build/ts",
1919
"paths": {
2020
"@codestream/protocols/agent": [
21-
"../../codestream-components/protocols/agent/agent.protocol.ts"
21+
"../../shared/ui/protocols/agent/agent.protocol.ts"
2222
],
2323
"@codestream/protocols/api": [
24-
"../../codestream-components/protocols/agent/api.protocol.ts"
24+
"../../shared/ui/protocols/agent/api.protocol.ts"
2525
],
2626
"@codestream/protocols/webview": [
27-
"../../codestream-components/ipc/webview.protocol.ts"
27+
"../../shared/ui/ipc/webview.protocol.ts"
2828
],
29-
"@codestream/webview/*": ["../../codestream-components/*"],
30-
"vscode-jsonrpc": ["../../codestream-components/vscode-jsonrpc.shim.ts"]
29+
"@codestream/webview/*": ["../../shared/ui/*"],
30+
"vscode-jsonrpc": ["../../shared/ui/vscode-jsonrpc.shim.ts"]
3131
},
3232
"rootDir": ".",
3333
"skipLibCheck": true,

Diff for: ‎sandbox/placeholder.txt

Whitespace-only changes.

Diff for: ‎shared/agent/webpack.config.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,43 @@ module.exports = function(env, argv) {
1919
{
2020
source: "dist/agent.*",
2121
// TODO: Use environment variable if exists
22-
destination: path.resolve(__dirname, "../vscode-codestream/dist/")
22+
destination: path.resolve(__dirname, "../../vscode/dist/")
2323
},
2424
{
2525
source: "dist/agent.*",
2626
// TODO: Use environment variable if exists
27-
destination: path.resolve(__dirname, "../atom-codestream/dist/")
27+
destination: path.resolve(__dirname, "../../atom/dist/")
2828
},
2929
{
3030
source: "dist/agent-pkg.js",
3131
// TODO: Use environment variable if exists
3232
destination: path.resolve(
3333
__dirname,
34-
"../vs-codestream/src/CodeStream.VisualStudio/dist/agent.js"
34+
"../../vs/src/CodeStream.VisualStudio/dist/agent.js"
3535
)
3636
},
3737
{
3838
source: "dist/agent-pkg.js.map",
3939
// TODO: Use environment variable if exists
4040
destination: path.resolve(
4141
__dirname,
42-
"../vs-codestream/src/CodeStream.VisualStudio/dist/agent-pkg.js.map"
42+
"../../vs/src/CodeStream.VisualStudio/dist/agent-pkg.js.map"
4343
)
4444
},
4545
{
4646
source: "dist/agent-pkg.js",
4747
// TODO: Use environment variable if exists
4848
destination: path.resolve(
4949
__dirname,
50-
"../jetbrains-codestream/src/main/resources/agent/agent-pkg.js"
50+
"../../jetbrains/src/main/resources/agent/agent-pkg.js"
5151
)
5252
},
5353
{
5454
source: "dist/agent-pkg.js.map",
5555
// TODO: Use environment variable if exists
5656
destination: path.resolve(
5757
__dirname,
58-
"../jetbrains-codestream/src/main/resources/agent/agent-pkg.js.map"
58+
"../../jetbrains/src/main/resources/agent/agent-pkg.js.map"
5959
)
6060
}
6161
]

Diff for: ‎vs/.vscode/tasks.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{
2828
"base": "$tslint-webpack-watch",
2929
"applyTo": "closedDocuments",
30-
"fileLocation": ["relative", "${workspaceFolder}/../codestream-lsp-agent/"]
30+
"fileLocation": ["relative", "${workspaceFolder}/../shared/agent/"]
3131
}
3232
],
3333
"presentation": {

Diff for: ‎vs/build/build.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ function Build-AgentAndWebview {
9292
throw "Agent packaging failed"
9393
}
9494

95-
if ((Test-Path -Path "../codestream-lsp-agent/dist/agent-pkg-win-x86.exe") -eq $False) {
95+
if ((Test-Path -Path "../shared/agent/dist/agent-pkg-win-x86.exe") -eq $False) {
9696
throw "Creating packaged artifacts failed, ensure the agent has been built"
9797
}
9898

99-
Copy-Item -Path ..\codestream-lsp-agent\dist\agent-pkg-win-x86.exe -Destination src\CodeStream.VisualStudio\dist\agent.exe -Force
99+
Copy-Item -Path ..\..\ui\agent\dist\agent-pkg-win-x86.exe -Destination src\CodeStream.VisualStudio\dist\agent.exe -Force
100100
if ($LastExitCode -ne 0) {
101101
throw "Copying packaged artifacts failed"
102102
}

0 commit comments

Comments
 (0)