Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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 packages/build/package-lock.json

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

2 changes: 1 addition & 1 deletion packages/build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/build",
"version": "8.9.0",
"version": "8.9.1-fb-es-2023.1",
"description": "LabKey client-side build assets",
"files": [
"webpack/"
Expand Down
7 changes: 1 addition & 6 deletions packages/build/webpack/package.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,7 @@ module.exports = {
'@hello-pangea/dnd',
'@labkey/api',
'@labkey/components',
'@labkey/premium/assay',
'@labkey/premium/eln',
'@labkey/premium/entities',
'@labkey/premium/workflow',
'@labkey/premium/storage',
'@labkey/premium/search',
'@labkey/premium',
'@remirror/pm',
'@remix-run/router',
'@testing-library/jest-dom',
Expand Down
12 changes: 6 additions & 6 deletions packages/build/webpack/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"moduleResolution": "node",
"noEmit": true,
"resolveJsonModule": true,
// sourceMap needs to be true in order for our tests have accurate stack traces, it does not noticeably impact
// sourceMap needs to be true in order for our tests to have accurate stack traces, it does not noticeably impact
// compile times
"sourceMap": true,
"target": "ES2021",
"lib": ["ES2021", "DOM", "DOM.Iterable"],
// Paradoxically we HAVE to include the jest types. If we do not explicitly include them our builds will pass if we
// try to use Node libraries (e.g. Array.at). If we include the jest types our builds will correctly compile against
// the lib targets above.
"target": "ES2023",
"lib": ["ES2023", "DOM", "DOM.Iterable"],
// Paradoxically, we HAVE to include the jest types. If we do not explicitly include them, our builds pass if
// we try to use Node libraries (e.g., Array.at). If we include the jest types, our builds will correctly compile
// against the lib targets above.
"types": ["jest"]
}
}
20 changes: 10 additions & 10 deletions packages/components/package-lock.json

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

11 changes: 7 additions & 4 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"name": "@labkey/components",
"version": "7.22.0",
"version": "7.22.1-fb-es-2023.7",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
"dist/"
"dist/**/*.js",
"dist/**/*.js.map",
"dist/**/*.d.ts",
"dist/**/*.scss"
],
"main": "dist/components.js",
"module": "dist/components.js",
Expand Down Expand Up @@ -50,7 +53,7 @@
"homepage": "https://github.com/LabKey/labkey-ui-components#readme",
"dependencies": {
"@hello-pangea/dnd": "18.0.1",
"@labkey/api": "1.48.0",
"@labkey/api": "1.48.1-fb-es-2023.1",
"@testing-library/dom": "~10.4.1",
"@testing-library/jest-dom": "~6.9.1",
"@testing-library/react": "~16.3.2",
Expand All @@ -75,7 +78,7 @@
"vis-network": "~10.0.2"
},
"devDependencies": {
"@labkey/build": "8.9.0",
"@labkey/build": "8.9.1-fb-es-2023.1",
"@labkey/eslint-config": "1.1.3",
"@types/history": "4.7.11",
"@types/jest": "30.0.0",
Expand Down
14 changes: 7 additions & 7 deletions packages/components/src/internal/components/lineage/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,11 @@ export class LineageNode
declare url: string;

// computed properties
distance: number;
iconProps: LineageIconMetadata;
links: LineageLinkMetadata;
listURL: string;
meta: LineageNodeMetadata;
declare distance: number;
declare iconProps: LineageIconMetadata;
declare links: LineageLinkMetadata;
declare listURL: string;
declare meta: LineageNodeMetadata;

static create(lsid: string, values?: Partial<LineageNodeConfig>): LineageNode {
let config;
Expand All @@ -350,15 +350,15 @@ export class LineageNode
config = {
...values,
...LineageIO.applyConfig(values),
...{
...({
children: LineageLink.createList(values.children),
lsid,
name: values.restricted
? `Restricted ${values.type === 'Data' ? 'Source' : values.type}`
: values.name,
parents: LineageLink.createList(values.parents),
steps: List(values.steps?.map(stepProps => new LineageRunStep(stepProps))),
},
} as Partial<LineageNodeConfig>),
};
}

Expand Down
8 changes: 8 additions & 0 deletions packages/components/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"extends": "./node_modules/@labkey/build/webpack/tsconfig.json",
"compilerOptions": {
// declarationMap is required for IntelliJ to resolve source file references
"declarationMap": true,
"rootDir": "src",
"outDir": "dist",
"paths": {
// Point to the dist/lib folder where the .d.ts files are output
"@labkey/api": ["../../../labkey-api-js/dist/index"],
},
"typeRoots": ["node_modules/@types", "src/typings"]
},
"include": ["src/**/*"],
Expand Down