diff --git a/packages/build/package-lock.json b/packages/build/package-lock.json index 22200c48fe..02bb988fe1 100644 --- a/packages/build/package-lock.json +++ b/packages/build/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/build", - "version": "8.9.0", + "version": "8.9.1-fb-es-2023.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/build", - "version": "8.9.0", + "version": "8.9.1-fb-es-2023.1", "license": "Apache-2.0", "dependencies": { "@babel/core": "~7.29.0", diff --git a/packages/build/package.json b/packages/build/package.json index ee7b762664..0d430382f4 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -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/" diff --git a/packages/build/webpack/package.config.js b/packages/build/webpack/package.config.js index dd0fdf795c..da1aa378d2 100644 --- a/packages/build/webpack/package.config.js +++ b/packages/build/webpack/package.config.js @@ -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', diff --git a/packages/build/webpack/tsconfig.json b/packages/build/webpack/tsconfig.json index 806bf4d69b..f671a573fb 100644 --- a/packages/build/webpack/tsconfig.json +++ b/packages/build/webpack/tsconfig.json @@ -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"] } } diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 6da289d74c..6fccd5fd04 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,16 +1,16 @@ { "name": "@labkey/components", - "version": "7.22.0", + "version": "7.22.1-fb-es-2023.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "7.22.0", + "version": "7.22.1-fb-es-2023.7", "license": "SEE LICENSE IN LICENSE.txt", "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", @@ -35,7 +35,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", @@ -3748,15 +3748,15 @@ } }, "node_modules/@labkey/api": { - "version": "1.48.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.48.0.tgz", - "integrity": "sha512-FBRts8F//kScqVR2Y1xB8tPSMy8me6uWEbnY7kltQDO6qQSVZcHX/DgV9zW115n5rngKhDfBv+3Dr/dz0VMS8A==", + "version": "1.48.1-fb-es-2023.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.48.1-fb-es-2023.1.tgz", + "integrity": "sha512-VErfaXc0ylzb8YVKIdr5X8arPLDKGQt3l4+/QR1aUAnXbJNfje0g7BVBFF5UjEzbMsA1lUnbFCpQmoCRNm7mKw==", "license": "Apache-2.0" }, "node_modules/@labkey/build": { - "version": "8.9.0", - "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/build/-/@labkey/build-8.9.0.tgz", - "integrity": "sha512-ygkAJeOG+J+lwCjAJ0JEuIjN9mSsHClL/HvmER+5ubKuE/B6+SykbvF5Zm47JqhGcObm0ONlqaxYxJdEKHIqHw==", + "version": "8.9.1-fb-es-2023.1", + "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/build/-/@labkey/build-8.9.1-fb-es-2023.1.tgz", + "integrity": "sha512-CePg3w6WnD7PbeWfXqZh1rUJNykPxRtnX25VE1Age3vxRPyVvrzbc9ulBfhQQuw8mZtqHkhuK6aoPBbSdVQjyw==", "dev": true, "license": "Apache-2.0", "dependencies": { diff --git a/packages/components/package.json b/packages/components/package.json index 1f8ea9767c..4bcf8318f5 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -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", @@ -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", @@ -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", diff --git a/packages/components/src/internal/components/lineage/models.ts b/packages/components/src/internal/components/lineage/models.ts index 5a5e4464f9..a3b678bb98 100644 --- a/packages/components/src/internal/components/lineage/models.ts +++ b/packages/components/src/internal/components/lineage/models.ts @@ -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): LineageNode { let config; @@ -350,7 +350,7 @@ export class LineageNode config = { ...values, ...LineageIO.applyConfig(values), - ...{ + ...({ children: LineageLink.createList(values.children), lsid, name: values.restricted @@ -358,7 +358,7 @@ export class LineageNode : values.name, parents: LineageLink.createList(values.parents), steps: List(values.steps?.map(stepProps => new LineageRunStep(stepProps))), - }, + } as Partial), }; } diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json index 07d3269dfc..6bf3b8c0fc 100644 --- a/packages/components/tsconfig.json +++ b/packages/components/tsconfig.json @@ -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/**/*"],