Skip to content
Open
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ dist/
build/
out/
coverage/
*.tsbuildinfo
3 changes: 2 additions & 1 deletion apex-log-parser/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@

"moduleResolution": "Bundler",
"module": "ESNext",
"noEmit": true,
"composite": true,
"emitDeclarationOnly": true,
"declaration": true,
"declarationMap": true,

Expand Down
2 changes: 1 addition & 1 deletion lana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
}
},
"scripts": {
"vscode:prepublish": "rm -rf out && pnpm -w run build"
"vscode:prepublish": "pnpm -w run build && pnpm -w run copy:package-docs"
},
"dependencies": {
"@apexdevtools/apex-ls": "^6.0.2",
Expand Down
5 changes: 3 additions & 2 deletions lana/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"removeComments": true,
"sourceMap": false
},
"include": ["./src/**/*.ts", "../apex-log-parser/src/**/*.ts"],
"exclude": ["**/node_modules", "**/.*/"]
"include": ["./src/**/*.ts"],
"exclude": ["**/node_modules", "**/.*/"],
"references": [{ "path": "../apex-log-parser" }]
}
5 changes: 3 additions & 2 deletions log-viewer/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"removeComments": true,
"sourceMap": false
},
"include": ["./src/**/*.ts", "declarations.d.ts", "../apex-log-parser/src/**/*.ts"],
"exclude": ["**/node_modules", "**/.*/"]
"include": ["./src/**/*.ts", "declarations.d.ts"],
"exclude": ["**/node_modules", "**/.*/"],
"references": [{ "path": "../apex-log-parser" }]
}
16 changes: 10 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"@swc/jest": "^0.2.39",
"@types/jest": "^30.0.0",
"@typescript-eslint/parser": "^8.60.0",
"@typescript/native-preview": "7.0.0-dev.20260527.2",
"concurrently": "^9.2.1",
"eslint": "^10.4.1",
"eslint-config-prettier": "^10.1.8",
Expand All @@ -36,13 +37,16 @@
"preinstall": "npx only-allow pnpm",
"prepare": "husky",
"bump-prerelease": "node ./scripts/pre-release.js",
"build": "NODE_ENV=production pnpm run build:dev",
"build:fast": "NODE_ENV=production pnpm run build:dev:fast",
"build:dev": "rm -rf lana/out && concurrently -r -g 'rollup -c rollup.config.mjs' 'tsc --noemit --skipLibCheck -p apex-log-parser/tsconfig.json' 'tsc --noemit --skipLibCheck -p log-viewer/tsconfig.json' 'tsc --noemit --skipLibCheck -p lana/tsconfig.json'",
"build:dev:fast": "rm -rf lana/out && concurrently -r -g 'rolldown -c rolldown.config.ts' 'tsc --noemit --skipLibCheck -p apex-log-parser/tsconfig.json' 'tsc --noemit --skipLibCheck -p log-viewer/tsconfig.json' 'tsc --noemit --skipLibCheck -p lana/tsconfig.json'",
"build": "pnpm run typecheck && NODE_ENV=production pnpm run build:dev",
"build:fast": "pnpm run typecheck && NODE_ENV=production pnpm run build:dev:fast",
"build:dev": "rm -rf lana/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:fast": "rm -rf lana/out && rolldown -w -c rolldown.config.ts",
"lint": "concurrently -r -g 'eslint **/*.ts' 'prettier --cache **/*.{ts,css,md,scss} --check --experimental-cli' 'tsc --noemit --skipLibCheck -p apex-log-parser/tsconfig.json' 'tsc --noemit --skipLibCheck -p log-viewer/tsconfig.json' 'tsc --noemit --skipLibCheck -p lana/tsconfig.json'",
"watch:fast": "rolldown -w -c rolldown.config.ts",
"copy:package-docs": "node ./scripts/copy-package-docs.mjs",
"typecheck": "tsgo -b",
"typecheck:tsc": "tsc -b",
"lint": "concurrently -r -g 'eslint **/*.ts' 'prettier --cache **/*.{ts,css,md,scss} --check --experimental-cli' 'pnpm run typecheck'",
"test": "jest",
"test:ci": "jest --runInBand",
"prettier-format": "prettier '**/*.ts' --cache --write --experimental-cli"
Expand Down
83 changes: 82 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions rolldown.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { defineConfig } from 'rolldown';
import nodePolyfills from '@rolldown/plugin-node-polyfills';

// rollup plugins
// @ts-expect-error - no type declarations
import postcssUrl from 'postcss-url';
import copy from 'rollup-plugin-copy';
import postcss from 'rollup-plugin-postcss';
Expand Down Expand Up @@ -105,7 +104,6 @@ export default defineConfig([
src: ['log-viewer/out/*', 'log-viewer/index.html', 'lana/certinia-icon-color.png'],
dest: 'lana/out',
},
{ src: ['CHANGELOG.md', 'LICENSE.txt', 'README.md'], dest: 'lana' },
],
}),
],
Expand Down
7 changes: 1 addition & 6 deletions rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,9 @@ export default [
hook: 'closeBundle',
targets: [
{
src: [
'log-viewer/out/*',
'log-viewer/index.html',
'lana/certinia-icon-color.png',
],
src: ['log-viewer/out/*', 'log-viewer/index.html', 'lana/certinia-icon-color.png'],
dest: 'lana/out',
},
{ src: ['CHANGELOG.md', 'LICENSE.txt', 'README.md'], dest: 'lana' },
],
}),
],
Expand Down
13 changes: 13 additions & 0 deletions scripts/copy-package-docs.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { copyFile } from 'node:fs/promises';
import path from 'node:path';
import { fileURLToPath } from 'node:url';

// Copy the package docs into lana/ for vsce packaging only.
// The root files are the sources of truth; the lana/ copies are gitignored
// build artifacts consumed by `vsce package` (see lana/.vscodeignore).
const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
const docs = ['CHANGELOG.md', 'LICENSE.txt', 'README.md'];

await Promise.all(
docs.map((file) => copyFile(path.join(repoRoot, file), path.join(repoRoot, 'lana', file))),
);
4 changes: 4 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"files": [],
"references": [{ "path": "./apex-log-parser" }, { "path": "./log-viewer" }, { "path": "./lana" }]
}
Loading