Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"type": "extensionHost",
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}/lana"],
"outFiles": ["${workspaceFolder}/lana/out/**/*.js"],
"outFiles": ["${workspaceFolder}/lana/dist/**/*.js"],

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this something we're doing just for us or planning to ship to certinia?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to let CBW config specify the location by extension?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"localRoot": "${workspaceFolder}/lana"
},
{
Expand All @@ -23,7 +23,7 @@
"args": [
"--extensionDevelopmentPath=${workspaceFolder}/${input:worktree}/lana"
],
"outFiles": ["${workspaceFolder}/${input:worktree}/lana/out/**/*.js"],
"outFiles": ["${workspaceFolder}/${input:worktree}/lana/dist/**/*.js"],
"localRoot": "${workspaceFolder}/${input:worktree}/lana"
},
{
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const defaultConfig = {
},
testPathIgnorePatterns: [
'<rootDir>/node_modules/',
'<rootDir>/dist/',
'<rootDir>/out/',
'<rootDir>/test/playwright/',
],
Expand Down
1 change: 1 addition & 0 deletions lana/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

*.vsix

dist/
out/
node_modules/*

Expand Down
2 changes: 1 addition & 1 deletion lana/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/out/**/*.js"
"${workspaceFolder}/dist/**/*.js"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion lana/.vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
// inlcude only the following in the extension
!.vscodeignore
!out/
!dist/
!syntaxes/
!package.json
!CHANGELOG.md
Expand Down
4 changes: 2 additions & 2 deletions lana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"profiling",
"soql"
],
"main": "out/Main.js",
"browser": "out/web/Main.web.js",
"main": "dist/Main.js",
"browser": "dist/web/Main.web.js",
"icon": "./certinia-icon-color.png",
"galleryBanner": {
"color": "#000000",
Expand Down
4 changes: 2 additions & 2 deletions lana/src/commands/LogView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ export class LogView {
const logName = logUri ? Utils.basename(logUri) : 'Untitled';
const logDir = logUri ? Utils.dirname(logUri) : context.context.extensionUri;
const panel = WebView.apply('logFile', `Log: ${logName}`, [
Utils.joinPath(context.context.extensionUri, 'out'),
Utils.joinPath(context.context.extensionUri, 'dist'),
logDir,
]);
this.currentPanel = panel;
this.currentLogUri = logUri;

const logViewerRoot = Utils.joinPath(context.context.extensionUri, 'out');
const logViewerRoot = Utils.joinPath(context.context.extensionUri, 'dist');
const index = Utils.joinPath(logViewerRoot, 'index.html');
const bundleUri = panel.webview.asWebviewUri(Utils.joinPath(logViewerRoot, 'bundle.js'));
const codiconUri = panel.webview.asWebviewUri(Utils.joinPath(logViewerRoot, 'codicon.css'));
Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"@swc/jest": "^0.2.39",
"@types/jest": "^30.0.0",
"@vscode/test-web": "^0.0.81",
"@vscode/vsce": "^3.9.2",
"concurrently": "^10.0.4",
"eslint": "^10.8.0",
"eslint-config-prettier": "^10.1.8",
Expand All @@ -40,9 +41,10 @@
"bump-prerelease": "node ./scripts/pre-release.mjs",
"build": "node --run typecheck && NODE_ENV=production node --run build:dev",
"build:fast": "node --run typecheck && NODE_ENV=production node --run build:dev:fast",
"build:dev": "rm -rf lana/out && rollup -c rollup.config.mjs",
"build:vsix": "cd lana && vsce package --no-dependencies",
"build:dev": "rm -rf lana/dist log-viewer/out && rollup -c rollup.config.mjs",
"build:dev:fast": "rolldown -c rolldown.config.ts",
"watch": "rm -rf lana/out && rollup -w -c rollup.config.mjs",
"watch": "rm -rf lana/dist log-viewer/out && rollup -w -c rollup.config.mjs",
"watch:fast": "rolldown -w -c rolldown.config.ts",
"copy:package-docs": "node ./scripts/copy-package-docs.mjs",
"typecheck": "tsc -b",
Expand All @@ -51,7 +53,7 @@
"test": "jest",
"test:ci": "jest --runInBand",
"test:e2e:web": "pnpm build && playwright test --config=lana/test/playwright/playwright.config.web.ts",
"serve:web": "pnpm build && tsx lana/test/playwright/web/headlessServer.ts",
"serve:web": "pnpm build && vscode-test-web --browser=chromium --browserOption=--disable-web-security --quality=stable --extensionDevelopmentPath=lana --extensionId=salesforce.salesforcedx-vscode-services sample-app/debug-logs",
"ci:install": "pnpm install --frozen-lockfile --prefer-offline --ignore-scripts",
"prettier-format": "prettier '**/*.ts' --cache --write --experimental-cli"
},
Expand Down
Loading
Loading