From 49864d102880e0b43962bf30b02d8b6f5a044b65 Mon Sep 17 00:00:00 2001 From: AlainRobertAtBentley <73677355+AlainRobertAtBentley@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:31:52 -0500 Subject: [PATCH 001/395] GCS interpret take 2 (#2807) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added GeoServices class with first method to parse of complete a GCS … * rush change * Documented GCS Interpret request and response props * Made geographicCRS props on interpret response can be undefined --- common/api/core-common.api.md | 12 + .../gcs-interpret2_2021-11-30-17-42.json | 10 + .../gcs-interpret2_2021-11-30-17-42.json | 10 + .../backend/src/test/misc/GeoServices.test.ts | 746 ++++++++++++++++++ core/common/src/GeoCoordinateServices.ts | 32 + 5 files changed, 810 insertions(+) create mode 100644 common/changes/@itwin/core-backend/gcs-interpret2_2021-11-30-17-42.json create mode 100644 common/changes/@itwin/core-common/gcs-interpret2_2021-11-30-17-42.json create mode 100644 core/backend/src/test/misc/GeoServices.test.ts diff --git a/common/api/core-common.api.md b/common/api/core-common.api.md index 223bc4d64969..cd12a86e1891 100644 --- a/common/api/core-common.api.md +++ b/common/api/core-common.api.md @@ -3480,6 +3480,18 @@ export class GeographicCRS implements GeographicCRSProps { readonly verticalCRS?: VerticalCRS; } +// @beta +export interface GeographicCRSInterpretRequestProps { + format: "WKT" | "JSON"; + geographicCRSDef: string; +} + +// @beta +export interface GeographicCRSInterpretResponseProps { + geographicCRS?: GeographicCRSProps; + status: number; +} + // @public export interface GeographicCRSProps { additionalTransform?: AdditionalTransformProps; diff --git a/common/changes/@itwin/core-backend/gcs-interpret2_2021-11-30-17-42.json b/common/changes/@itwin/core-backend/gcs-interpret2_2021-11-30-17-42.json new file mode 100644 index 000000000000..cc4af4e4dc5f --- /dev/null +++ b/common/changes/@itwin/core-backend/gcs-interpret2_2021-11-30-17-42.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-backend", + "comment": "Add new GeoServices class and first method to interpret WKT or complete GCS JSON.\"", + "type": "none" + } + ], + "packageName": "@itwin/core-backend" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-common/gcs-interpret2_2021-11-30-17-42.json b/common/changes/@itwin/core-common/gcs-interpret2_2021-11-30-17-42.json new file mode 100644 index 000000000000..d9eea2e0248b --- /dev/null +++ b/common/changes/@itwin/core-common/gcs-interpret2_2021-11-30-17-42.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-common", + "comment": "Add new GeoServices class and first method to interpret WKT or complete GCS JSON.\"", + "type": "none" + } + ], + "packageName": "@itwin/core-common" +} \ No newline at end of file diff --git a/core/backend/src/test/misc/GeoServices.test.ts b/core/backend/src/test/misc/GeoServices.test.ts new file mode 100644 index 000000000000..1b7721f62af1 --- /dev/null +++ b/core/backend/src/test/misc/GeoServices.test.ts @@ -0,0 +1,746 @@ +/*--------------------------------------------------------------------------------------------- +* Copyright (c) Bentley Systems, Incorporated. All rights reserved. +* See LICENSE.md in the project root for license terms and full copyright notice. +*--------------------------------------------------------------------------------------------*/ + +import { assert } from "chai"; +import { + GeographicCRSInterpretRequestProps, GeographicCRSProps, +} from "@itwin/core-common"; +import { IModelHost } from "../../IModelHost"; +import { Geometry } from "@itwin/core-geometry"; + +// spell-checker: disable + +describe("GeoServices", () => { + + it("should be able to interpret to completion an incomplete GeographicCRS", async () => { + + const completionTest = async (incompleteGCS: GeographicCRSProps, completeCRS: GeographicCRSProps) => { + + const requestProps: GeographicCRSInterpretRequestProps = { format: "JSON", geographicCRSDef: JSON.stringify(incompleteGCS) }; + const response = IModelHost.platform.GeoServices.getGeographicCRSInterpretation(requestProps); + + assert.isTrue(response.status === 0); + + assert.isTrue(response.geographicCRS !== undefined); + if (response.geographicCRS !== undefined) { + assert.isTrue(response.geographicCRS.horizontalCRS !== undefined && completeCRS.horizontalCRS !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.id === completeCRS.horizontalCRS!.id); + assert.isTrue(response.geographicCRS.horizontalCRS!.projection !== undefined && completeCRS.horizontalCRS!.projection !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.projection!.method === completeCRS.horizontalCRS!.projection!.method); + if (completeCRS.horizontalCRS!.projection!.falseEasting !== undefined) { + assert.isTrue(response.geographicCRS.horizontalCRS!.projection!.falseEasting !== undefined); + assert.isTrue(Math.abs(response.geographicCRS.horizontalCRS!.projection!.falseEasting! - completeCRS.horizontalCRS!.projection!.falseEasting) < Geometry.smallMetricDistance); + } + if (completeCRS.horizontalCRS!.projection!.falseNorthing !== undefined) { + assert.isTrue(response.geographicCRS.horizontalCRS!.projection!.falseNorthing !== undefined); + assert.isTrue(Math.abs(response.geographicCRS.horizontalCRS!.projection!.falseNorthing! - completeCRS.horizontalCRS!.projection!.falseNorthing) < Geometry.smallMetricDistance); + } + + assert.isTrue(response.geographicCRS.horizontalCRS!.datum !== undefined && completeCRS.horizontalCRS!.datum !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.datum!.id === completeCRS.horizontalCRS!.datum!.id); + + assert.isTrue(response.geographicCRS.horizontalCRS!.datum!.ellipsoid !== undefined && completeCRS.horizontalCRS!.datum!.ellipsoid !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.datum!.ellipsoid!.id === completeCRS.horizontalCRS!.datum!.ellipsoid!.id); + + if (response.geographicCRS.additionalTransform !== undefined) { + assert.isTrue(completeCRS.additionalTransform !== undefined); + assert.isTrue(response.geographicCRS.additionalTransform.helmert2DWithZOffset !== undefined); + assert.isTrue(completeCRS.additionalTransform!.helmert2DWithZOffset !== undefined); + + assert.isTrue(Math.abs(response.geographicCRS.additionalTransform.helmert2DWithZOffset!.rotDeg - completeCRS.additionalTransform!.helmert2DWithZOffset!.rotDeg) < Geometry.smallAngleDegrees); + assert.isTrue(Math.abs(response.geographicCRS.additionalTransform.helmert2DWithZOffset!.translationX - completeCRS.additionalTransform!.helmert2DWithZOffset!.translationX) < Geometry.smallMetricDistance); + assert.isTrue(Math.abs(response.geographicCRS.additionalTransform.helmert2DWithZOffset!.translationY - completeCRS.additionalTransform!.helmert2DWithZOffset!.translationY) < Geometry.smallMetricDistance); + assert.isTrue(Math.abs(response.geographicCRS.additionalTransform.helmert2DWithZOffset!.translationZ - completeCRS.additionalTransform!.helmert2DWithZOffset!.translationZ) < Geometry.smallMetricDistance); + assert.isTrue(Math.abs(response.geographicCRS.additionalTransform.helmert2DWithZOffset!.scale - completeCRS.additionalTransform!.helmert2DWithZOffset!.scale) < Geometry.smallFraction); + } + + assert.isTrue(response.geographicCRS.verticalCRS !== undefined && completeCRS.verticalCRS !== undefined); + assert.isTrue(response.geographicCRS.verticalCRS!.id === completeCRS.verticalCRS!.id); + } + }; + + const britishNationalGridOld: GeographicCRSProps = + { + horizontalCRS: { + datum: { + deprecated: true, + description: "OSGB36 - Use OSGB-7P-2. Consider OSGB/OSTN15 instead", + ellipsoid: { + description: "Airy 1830", + equatorialRadius: 6377563.396, + id: "EPSG:7001", + polarRadius: 6356256.909237, + source: "EPSG, Version 6 [EPSG]"}, + ellipsoidId: "EPSG:7001", + id: "EPSG:6277", + source: "EPSG V6.12 operation EPSG:1314 [EPSG]", + transforms: [ + { + method: "PositionalVector", + positionalVector: { + delta: { + x: 446.448, + y: -125.157, + z: 542.06}, + rotation: { + x: 0.15, + y: 0.247, + z: 0.842}, + scalePPM: -20.489}, + sourceEllipsoid: { + equatorialRadius: 6377563.396, + id: "EPSG:7001", + polarRadius: 6356256.909237}, + targetEllipsoid: { + equatorialRadius: 6378137, + id: "WGS84", + polarRadius: 6356752.3142}}]}, + datumId: "EPSG:6277", + deprecated: true, + description: "Use other variant - OSGB British National Grid", + extent: { + northEast: { + latitude: 60.84, + longitude: 1.78}, + southWest: { + latitude: 49.96, + longitude: -7.56}}, + id: "EPSG:27700", + projection: { + centralMeridian: -2, + falseEasting: 400000, + falseNorthing: -100000, + latitudeOfOrigin: 49, + method: "TransverseMercator", + scaleFactor: 0.999601272737422}, + source: "EPSG", + unit: "Meter"}, + verticalCRS: { + id: "ELLIPSOID"}}; + + const EWRGCS: GeographicCRSProps = { + horizontalCRS: { + id: "EPSG:27700", + description: "OSGB 1936 / British National Grid", + source: "EPSG V6 [Large and medium scale topographic mapping and engin]", + datumId: "EPSG:6277", + datum: { + id: "EPSG:6277", + description: "OSGB36 - Use OSGB-7P-2. Consider OSGB/OSTN15 instead", + deprecated: true, + source: "EPSG V6.12 operation EPSG:1314 [EPSG]", + ellipsoidId: "EPSG:7001", + ellipsoid: { + equatorialRadius: 6377563.396, + polarRadius: 6356256.909237, + id: "EPSG:7001", + description: "Airy 1830", + source: "EPSG, Version 6 [EPSG]"}, + transforms: [ + { + method: "PositionalVector", + sourceEllipsoid: { + equatorialRadius: 6377563.396, + polarRadius: 6356256.909237, + id: "EPSG:7001"}, + targetEllipsoid: { + equatorialRadius: 6378137, + polarRadius: 6356752.3142, + id: "WGS84"}, + positionalVector: { + delta: { + x: 446.448, + y: -125.157, + z: 542.06}, + rotation: { + x: 0.15, + y: 0.247, + z: 0.842}, + scalePPM: -20.489}}]}, + unit: "Meter", + projection: { + method: "TransverseMercator", + falseEasting: 400000, + falseNorthing: -100000, + centralMeridian: -2, + latitudeOfOrigin: 49, + scaleFactor: 0.999601272737422}, + extent: { + southWest: { + latitude: 49.96, + longitude: -7.56}, + northEast: { + latitude: 60.84, + longitude: 1.78}}}, + verticalCRS: { + id: "ELLIPSOID"}, + additionalTransform: { + helmert2DWithZOffset: { + translationX: 284597.3343, + translationY: 79859.4651, + translationZ: 0, + rotDeg: 0.5263624458992088, + scale: 0.9996703340508721}}}; + + const UTM27Z10: GeographicCRSProps = { + horizontalCRS: { + datum: { + description: "North American Datum of 1927 (US48, AK, HI, and Canada)", + ellipsoid: { + description: "Clarke 1866, Benoit Ratio", + epsg: 7008, + equatorialRadius: 6378206.4, + id: "CLRK66", + polarRadius: 6356583.8, + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987"}, + ellipsoidId: "CLRK66", + epsg: 6267, + id: "NAD27", + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + transforms: [ + { + gridFile: { + files: [ + { + direction: "Direct", + fileName: "./Usa/Nadcon/conus.l?s", + format: "NADCON"}, + { + direction: "Direct", + fileName: "./Usa/Nadcon/alaska.l?s", + format: "NADCON"}, + { + direction: "Direct", + fileName: "./Usa/Nadcon/prvi.l?s", + format: "NADCON"}, + { + direction: "Direct", + fileName: "./Usa/Nadcon/hawaii.l?s", + format: "NADCON"}, + { + direction: "Direct", + fileName: "./Usa/Nadcon/stgeorge.l?s", + format: "NADCON"}, + { + direction: "Direct", + fileName: "./Usa/Nadcon/stlrnc.l?s", + format: "NADCON"}, + { + direction: "Direct", + fileName: "./Usa/Nadcon/stpaul.l?s", + format: "NADCON"}]}, + method: "GridFiles", + sourceEllipsoid: { + equatorialRadius: 6378206.4, + id: "CLRK66", + polarRadius: 6356583.8}, + targetEllipsoid: { + equatorialRadius: 6378137, + id: "GRS1980", + polarRadius: 6356752.314140348}}]}, + datumId: "NAD27", + description: "UTM with NAD27 datum, Zone 10, Meter; Central Meridian 123d W", + epsg: 26710, + extent: { + northEast: { + latitude: 84, + longitude: -119.5}, + southWest: { + latitude: -1, + longitude: -126.5}}, + id: "UTM27-10", + projection: { + hemisphere: "North", + method: "UniversalTransverseMercator", + zoneNumber: 10}, + source: "Snyder, J.P, 1987, Map Projections - A Working Manual", + unit: "Meter"}, + verticalCRS: { + id: "NGVD29"}}; + + const UTM27Z10B: GeographicCRSProps = + { + horizontalCRS: { + datum: { + description: "North American Datum of 1927 (US48, AK, HI, and Canada)", + ellipsoid: { + description: "Clarke 1866, Benoit Ratio", + epsg: 7008, + equatorialRadius: 6378206.4, + id: "CLRK66", + polarRadius: 6356583.8, + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + }, + ellipsoidId: "CLRK66", + epsg: 6267, + id: "NAD27", + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + transforms: [ + { + gridFile: { + files: [ + { + direction: "Direct", + fileName: "./Usa/Nadcon/conus.l?s", + format: "NADCON", + }, + { + direction: "Direct", + fileName: "./Usa/Nadcon/alaska.l?s", + format: "NADCON", + }, + { + direction: "Direct", + fileName: "./Usa/Nadcon/prvi.l?s", + format: "NADCON", + }, + { + direction: "Direct", + fileName: "./Usa/Nadcon/hawaii.l?s", + format: "NADCON", + }, + { + direction: "Direct", + fileName: "./Usa/Nadcon/stgeorge.l?s", + format: "NADCON", + }, + { + direction: "Direct", + fileName: "./Usa/Nadcon/stlrnc.l?s", + format: "NADCON", + }, + { + direction: "Direct", + fileName: "./Usa/Nadcon/stpaul.l?s", + format: "NADCON", + }, + ], + }, + method: "GridFiles", + sourceEllipsoid: { + equatorialRadius: 6378206.4, + id: "CLRK66", + polarRadius: 6356583.8, + }, + targetEllipsoid: { + equatorialRadius: 6378137, + id: "GRS1980", + polarRadius: 6356752.314140348, + }, + }, + ], + }, + datumId: "NAD27", + description: "NAD27 / UTM zone 10N", + epsg: 26710, + extent: { + northEast: { + latitude: 77, + longitude: -120, + }, + southWest: { + latitude: 34.4, + longitude: -126, + }, + }, + id: "EPSG:26710", + projection: { + centralMeridian: -123, + falseEasting: 500000, + falseNorthing: 0, + latitudeOfOrigin: 0, + method: "TransverseMercator", + scaleFactor: 0.9996, + }, + source: "EPSG V6 [Large and medium scale topographic mapping and engin]", + unit: "Meter", + }, + verticalCRS: { + id: "NGVD29", + }, + }; + + await completionTest({ horizontalCRS: { id: "EPSG:27700" }, verticalCRS: { id: "ELLIPSOID" } }, britishNationalGridOld); + await completionTest({ horizontalCRS: { id: "EPSG:27700" }, verticalCRS: { id: "ELLIPSOID" }, additionalTransform: { helmert2DWithZOffset: { translationX: 284597.3343, translationY: 79859.4651, translationZ: 0, rotDeg: 0.5263624458992088, scale: 0.9996703340508721}} }, EWRGCS); + await completionTest({ horizontalCRS: { id: "UTM27-10" }, verticalCRS: { id: "NGVD29" } }, UTM27Z10); + await completionTest({ horizontalCRS: { epsg: 26710 }, verticalCRS: { id: "NGVD29" } }, UTM27Z10B); + }); + + it("should be able to interpret a WKT GeographicCRS", async () => { + + const interpretWKTTest = async (testWKT: string, completeCRS: GeographicCRSProps) => { + + const requestProps: GeographicCRSInterpretRequestProps = { format: "WKT", geographicCRSDef: testWKT }; + const response = IModelHost.platform.GeoServices.getGeographicCRSInterpretation(requestProps); + + assert.isTrue(response.status === 0); + + assert.isTrue(response.geographicCRS !== undefined); + if (response.geographicCRS !== undefined) { + assert.isTrue(response.geographicCRS.horizontalCRS !== undefined && completeCRS.horizontalCRS !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.id === completeCRS.horizontalCRS!.id); + assert.isTrue(response.geographicCRS.horizontalCRS!.projection !== undefined && completeCRS.horizontalCRS!.projection !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.projection!.method === completeCRS.horizontalCRS!.projection!.method); + if (completeCRS.horizontalCRS!.projection!.falseEasting !== undefined) { + assert.isTrue(response.geographicCRS.horizontalCRS!.projection!.falseEasting !== undefined); + assert.isTrue(Math.abs(response.geographicCRS.horizontalCRS!.projection!.falseEasting! - completeCRS.horizontalCRS!.projection!.falseEasting) < Geometry.smallMetricDistance); + } + if (completeCRS.horizontalCRS!.projection!.falseNorthing !== undefined) { + assert.isTrue(response.geographicCRS.horizontalCRS!.projection!.falseNorthing !== undefined); + assert.isTrue(Math.abs(response.geographicCRS.horizontalCRS!.projection!.falseNorthing! - completeCRS.horizontalCRS!.projection!.falseNorthing) < Geometry.smallMetricDistance); + } + + assert.isTrue(response.geographicCRS.horizontalCRS!.datum !== undefined && completeCRS.horizontalCRS!.datum !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.datum!.id === completeCRS.horizontalCRS!.datum!.id); + + assert.isTrue(response.geographicCRS.horizontalCRS!.datum!.ellipsoid !== undefined && completeCRS.horizontalCRS!.datum!.ellipsoid !== undefined); + assert.isTrue(response.geographicCRS.horizontalCRS!.datum!.ellipsoid!.id === completeCRS.horizontalCRS!.datum!.ellipsoid!.id); + + assert.isTrue(response.geographicCRS.verticalCRS !== undefined && completeCRS.verticalCRS !== undefined); + assert.isTrue(response.geographicCRS.verticalCRS!.id === completeCRS.verticalCRS!.id); + + // WKTs cannot define an additional transform + assert.isTrue(response.geographicCRS.additionalTransform === undefined); + } + }; + + const airportGrid2007: GeographicCRSProps = + { + horizontalCRS: { + datum: { + description: "Heathrow T5 Datum", + ellipsoid: { + description: "Airy, 1830", + epsg: 7001, + equatorialRadius: 6377563.396, + id: "AIRY30", + polarRadius: 6356256.909, + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + }, + ellipsoidId: "AIRY30", + id: "HeathrowT5", + source: "Bentley Client", + transforms: [ + { + method: "PositionalVector", + positionalVector: { + delta: { + x: 358.398212181898, + y: -213.702844870731, + z: 495.318319769716, + }, + rotation: { + x: 668.806139320047, + y: -4.72664217602752, + z: 719.671097181396, + }, + scalePPM: -6.26386076385543, + }, + sourceEllipsoid: { + equatorialRadius: 6377563.396, + id: "AIRY30", + polarRadius: 6356256.909, + }, + targetEllipsoid: { + equatorialRadius: 6378137, + id: "WGS84", + polarRadius: 6356752.3142, + }, + }, + ], + }, + datumId: "HeathrowT5", + description: "AirportGrid2007", + id: "AirportGrid2007", + projection: { + centralMeridian: -0.41832591666666674, + falseEasting: 7334.81, + falseNorthing: 5637.423, + latitudeOfOrigin: 51.47011065555556, + method: "TransverseMercator", + scaleFactor: 0.999995, + }, + source: "WKT", + unit: "Meter", + }, + verticalCRS: { + id: "ELLIPSOID", + }, + }; + + const denmarkED50: GeographicCRSProps = + { + horizontalCRS: { + datum: { + description: "European 1950, Denmark, for System 34", + ellipsoid: { + description: "Hayford, 1924 (aka 1909); same as International 1924", + epsg: 7022, + equatorialRadius: 6378388, + id: "HAYFORD", + polarRadius: 6356911.9461279465, + source: "Snyder, J.P., 1987, Map Projections - A Working Manual", + }, + ellipsoidId: "HAYFORD", + id: "ED50-DK34", + source: "KMSTrans, by Kort-og Matrikelstyrelsen (Nov 1999)", + transforms: [ + { + method: "PositionalVector", + positionalVector: { + delta: { + x: -81.0703, + y: -89.3603, + z: -115.7526, + }, + rotation: { + x: 0.48488, + y: 0.02436, + z: 0.41321, + }, + scalePPM: -0.540645, + }, + sourceEllipsoid: { + equatorialRadius: 6378388, + id: "HAYFORD", + polarRadius: 6356911.9461279465, + }, + targetEllipsoid: { + equatorialRadius: 6378137, + id: "WGS84", + polarRadius: 6356752.3142, + }, + }, + ], + }, + datumId: "ED50-DK34", + description: "Longitude / Latitude (ED 50 Denmark)", + extent: { + northEast: { + latitude: 90, + longitude: 180, + }, + southWest: { + latitude: -90, + longitude: -180, + }, + }, + id: "Longitude.Latitude (ED ", + projection: { + method: "None", + }, + source: "Extracted from WKT string; description field carries WKT name.", + unit: "Degree", + }, + verticalCRS: { + id: "ELLIPSOID", + }, + }; + + const californiaStateZone2: GeographicCRSProps = + { + horizontalCRS: { + datum: { + description: "North American Datum of 1983", + ellipsoid: { + description: "Geodetic Reference System of 1980", + epsg: 7019, + equatorialRadius: 6378137, + id: "GRS1980", + polarRadius: 6356752.314140348, + source: "Stem, L.E., Jan 1989, State Plane Coordinate System of 1983", + }, + ellipsoidId: "GRS1980", + epsg: 6269, + id: "NAD83", + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + transforms: [ + { + method: "None", + }, + ], + }, + datumId: "NAD83", + description: "NAD_1983_StatePlane_California_II_FIPS_0402_Feet", + id: "NAD_1983_StatePlane_Cal", + projection: { + falseEasting: 6561666.666666666, + falseNorthing: 1640416.666666667, + latitudeOfOrigin: 37.66666666666666, + longitudeOfOrigin: -122, + method: "LambertConformalConicTwoParallels", + standardParallel1: 38.33333333333334, + standardParallel2: 39.83333333333334, + }, + source: "WKT", + unit: "USSurveyFoot", + }, + verticalCRS: { + id: "NAVD88", + }, + }; + + const utm84Zone34S: GeographicCRSProps = + { + horizontalCRS: { + datum: { + description: "World Geodetic System of 1984", + ellipsoid: { + description: "World Geodetic System of 1984, GEM 10C", + epsg: 7030, + equatorialRadius: 6378137, + id: "WGS84", + polarRadius: 6356752.3142, + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + }, + ellipsoidId: "WGS84", + epsg: 6326, + id: "WGS84", + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + transforms: [ + { + method: "None", + }, + ], + }, + datumId: "WGS84", + description: "WGS 84 / UTM zone 34S", + id: "WGS 84 / UTM zone 34S", + projection: { + centralMeridian: 20.999999999999982, + falseEasting: 500000, + falseNorthing: 10000000, + latitudeOfOrigin: 0, + method: "TransverseMercator", + scaleFactor: 0.9996, + }, + source: "WKT", + unit: "Meter", + }, + verticalCRS: { + id: "ELLIPSOID", + }, + }; + + const utm84Zone32NGeoid: GeographicCRSProps = + { + horizontalCRS: { + datum: { + description: "World Geodetic System of 1984", + ellipsoid: { + description: "World Geodetic System of 1984, GEM 10C", + epsg: 7030, + equatorialRadius: 6378137, + id: "WGS84", + polarRadius: 6356752.3142, + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + }, + ellipsoidId: "WGS84", + epsg: 6326, + id: "WGS84", + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + transforms: [ + { + method: "None", + }, + ], + }, + datumId: "WGS84", + description: "WGS 84 / UTM zone32N", + id: "WGS 84 / UTM zone32N", + projection: { + centralMeridian: 9, + falseEasting: 500000, + falseNorthing: 0, + latitudeOfOrigin: 0, + method: "TransverseMercator", + scaleFactor: 0.9996, + }, + source: "WKT", + unit: "Meter", + }, + verticalCRS: { + id: "GEOID", + }, + }; + + const utm84Zone18NGeoid: GeographicCRSProps = + { + horizontalCRS: { + datum: { + description: "World Geodetic System of 1984", + ellipsoid: { + description: "World Geodetic System of 1984, GEM 10C", + epsg: 7030, + equatorialRadius: 6378137, + id: "WGS84", + polarRadius: 6356752.3142, + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + }, + ellipsoidId: "WGS84", + epsg: 6326, + id: "WGS84", + source: "US Defense Mapping Agency, TR-8350.2-B, December 1987", + transforms: [ + { + method: "None", + }, + ], + }, + datumId: "WGS84", + description: "UTM84-18N", + id: "UTM84-18N", + projection: { + hemisphere: "North", + method: "UniversalTransverseMercator", + zoneNumber: 18, + }, + source: "WKT", + unit: "Meter", + }, + verticalCRS: { + id: "GEOID", + }, + }; + + await interpretWKTTest('PROJCS["AirportGrid2007", GEOGCS["HeathrowT5.LL",DATUM["Heathrow T5", SPHEROID["AIRY30",6377563.396,299.32496127],358.398,-213.7028,495.3183,-668.80613932004700,4.72664217602752,-719.67109718139600,-6.26386076385543],PRIMEM["Greenwich",0],UNIT["Decimal Degree",0.017453292519943295]],PROJECTION["Transverse Mercator"],PARAMETER["latitude_of_origin",51.470110655555558],PARAMETER["central_meridian",-0.41832591666666669],PARAMETER["scale_factor",0.999995],PARAMETER["false_easting",7334.810],PARAMETER["false_northing",5637.423],UNIT["Meter",1.00000000000000]]', airportGrid2007); + await interpretWKTTest('GEOGCS[ "Longitude / Latitude (ED 50 Denmark)", DATUM ["European 1950 (Denmark)", SPHEROID ["International 1924", 6378388, 297],-81.0703, -89.3603, -115.7526, .48488, .02436, .41321, -.540645], PRIMEM [ "Greenwich", 0.000000 ], UNIT ["Decimal Degree", 0.01745329251994330]]', denmarkED50); + await interpretWKTTest('PROJCS["NAD_1983_StatePlane_California_II_FIPS_0402_Feet",GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",6561666.666666666],PARAMETER["False_Northing",1640416.666666667],PARAMETER["Central_Meridian",-122],PARAMETER["Standard_Parallel_1",38.33333333333334],PARAMETER["Standard_Parallel_2",39.83333333333334],PARAMETER["Latitude_Of_Origin",37.66666666666666],UNIT["Foot_US",0.30480060960121924]]', californiaStateZone2); + await interpretWKTTest('PROJCS["WGS 84 / UTM zone 34S", GEOGCS [ "WGS 84", DATUM ["World Geodetic System 1984 (EPSG ID 6326)", SPHEROID ["WGS 84 (EPSG ID 7030)", 6378137, 298.257223563]], PRIMEM [ "Greenwich", 0.000000 ], UNIT ["Decimal Degree", 0.01745329251994328]], PROJECTION ["UTM zone 34S (EPSG OP 16134)"], PARAMETER ["Latitude_Of_Origin", 0], PARAMETER ["Central_Meridian", 21], PARAMETER ["Scale_Factor", .9996], PARAMETER ["False_Easting", 500000], PARAMETER ["False_Northing", 10000000], UNIT ["Meter", 1]]', utm84Zone34S); + await interpretWKTTest('COMPD_CS["WGS 84 / UTM zone 32N + EGM96 geoid height",PROJCS["WGS 84 / UTM zone32N",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",9],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","32632"]],VERT_CS["EGM96 geoid height",VERT_DATUM["EGM96 geoid",2005,EXTENSION["PROJ4_GRIDS","egm96_15.gtx"],AUTHORITY["EPSG","5171"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Up",UP],AUTHORITY["EPSG","5773"]]]', utm84Zone32NGeoid); + await interpretWKTTest('COMPD_CS["UTM84-18N",PROJCS["UTM84-18N",GEOGCS["LL84",DATUM["WGS84",SPHEROID["WGS84",6378137.000,298.25722293]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Universal Transverse Mercator System"],PARAMETER["UTM Zone Number (1 - 60)",18.0],PARAMETER["Hemisphere, North or South",1.0],UNIT["Meter",1.00000000000000]],VERT_CS["Geoid Height",VERT_DATUM["EGM96 geoid",2005],UNIT["METER",1.000000]]]', utm84Zone18NGeoid); + }); + + it("should not be able to interpret an invalid GeographicCRS", async () => { + + const interpretInvalidTest = async (formatCRS: "WKT"| "JSON", testInvalid: string) => { + + const requestProps: GeographicCRSInterpretRequestProps = { format: formatCRS, geographicCRSDef: testInvalid }; + const response = IModelHost.platform.GeoServices.getGeographicCRSInterpretation(requestProps); + + // At the moment return codes are not really error specific (we mostly return 32768) so we do not validate + // actual error code for now. + assert.isFalse(response.status === 0); + }; + + // WKT Without datum or projection clause + await interpretInvalidTest("WKT", 'PROJCS["AirportGrid2007", GEOGCS["HeathrowT5.LL",PRIMEM["Greenwich",0],UNIT["Decimal Degree",0.017453292519943295]],UNIT["Meter",1.00000000000000]]'); + + // Plain garbage + await interpretInvalidTest("WKT", "Some invalid content"); + + // Format is JSON but content is WKT + await interpretInvalidTest("JSON", 'GEOGCS[ "Longitude / Latitude (ED 50 Denmark)", DATUM ["European 1950 (Denmark)", SPHEROID ["International 1924", 6378388, 297],-81.0703, -89.3603, -115.7526, .48488, .02436, .41321, -.540645], PRIMEM [ "Greenwich", 0.000000 ], UNIT ["Decimal Degree", 0.01745329251994330]]'); + + // Vertical datum invalid for horizontal definition + await interpretInvalidTest("JSON", '{ horizontalCRS: { id: "EPSG:27700" }, verticalCRS: { id: "NAVD29" } }'); + + // No horizontal CRS + await interpretInvalidTest("JSON", '{ verticalCRS: { id: "NAVD29" } }'); + + // Unknown identifier + await interpretInvalidTest("JSON", '{ horizontalCRS: { id: "UNKNOWN" }, verticalCRS: { id: "NAVD29" } }'); + }); +}); diff --git a/core/common/src/GeoCoordinateServices.ts b/core/common/src/GeoCoordinateServices.ts index 052d03216cb6..f62a74ac743c 100644 --- a/core/common/src/GeoCoordinateServices.ts +++ b/core/common/src/GeoCoordinateServices.ts @@ -6,8 +6,11 @@ * @module iModels */ +// cspell:ignore NGVD, NAVD, COMPD_CS, PROJCS, GEOGCS + import { GeoServiceStatus } from "@itwin/core-bentley"; import { XYZProps } from "@itwin/core-geometry"; +import { GeographicCRSProps } from "./geometry/CoordinateReferenceSystem"; /** This enumeration lists all possible status as returned from a coordinate conversion to or from a * [[GeographicCRS]] and either another [[GeographicCRS]] or a [[GeodeticDatum]]. @@ -113,3 +116,32 @@ export interface GeoCoordinatesResponseProps { geoCoords: PointWithStatus[]; fromCache: number; // the number that were read from the cache rather than calculated. } + +/** Information required to interpret or complete a Geographic CRS in the specified format. + * The only currently supported formats are JSON (for completion) and WKT (OGC Well Known Text) + * @beta + */ +export interface GeographicCRSInterpretRequestProps { + /** The format of the geographic CRS definition provided in the geographicCRSDef property. */ + format: "WKT" | "JSON"; + /** The geographic CRS definition in the format specified in the format property. + * Note that when the WKT is used the WKT fragment provided can start with a COMPD_CS clause + * which should then contain both the horizontal CRS definition as well as the vertical CRS specification. + * WKT fragments starting with PROJCS or GEOGCS are also supported but the vertical CRS will be assigned a + * default value. + */ + geographicCRSDef: string; +} + +/** Information returned from a request to interpret or complete a Geographic CRS + * @beta + */ +export interface GeographicCRSInterpretResponseProps { + /** The result status of the interpret operation. A value of zero indicates successful interpretation. + * Any value other than zero is to be considered a hard error and no valid result will + * be returned in the geographicCRS property. + */ + status: number; + /** The property that receives the interpreted geographic CRS if the process was successful. */ + geographicCRS?: GeographicCRSProps; +} From 25b499bb159e625e11aff1a291cf7a9007ec5bd5 Mon Sep 17 00:00:00 2001 From: swbsi <69857376+swbsi@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:44:03 -0500 Subject: [PATCH 002/395] Adding WebEditServer (#2690) * backend class * different approach + tests * lint * change * api --- common/api/core-common.api.md | 24 +++ common/api/core-frontend.api.md | 4 +- common/api/express-server.api.md | 7 + .../web-edit-server_2021-11-23-16-39.json | 10 ++ .../web-edit-server_2021-11-23-16-39.json | 10 ++ .../web-edit-server_2021-11-18-16-04.json | 10 ++ .../web-edit-server_2021-11-18-16-04.json | 10 ++ .../rush/browser-approved-packages.json | 2 +- common/config/rush/pnpm-lock.yaml | 39 +++-- core/backend/src/LocalhostIpcHost.ts | 14 +- core/common/src/core-common.ts | 1 + core/common/src/ipc/IpcWebSocket.ts | 44 ++++- core/common/src/ipc/IpcWebSocketTransport.ts | 156 ++++++++++++++++++ core/express-server/package.json | 10 +- core/express-server/src/ExpressServer.ts | 17 ++ core/frontend/src/LocalhostIpcApp.ts | 32 +++- full-stack-tests/core/src/backend/backend.ts | 14 +- .../core/src/frontend/TestUtility.ts | 15 +- .../frontend/standalone/BriefcaseTxns.test.ts | 6 +- .../src/frontend/standalone/EditTool.test.ts | 4 +- .../standalone/GraphicalEditingScope.test.ts | 4 +- .../standalone/ModelChangeMonitor.test.ts | 4 +- .../display-test-app/src/frontend/App.ts | 7 +- 23 files changed, 383 insertions(+), 61 deletions(-) create mode 100644 common/changes/@itwin/core-backend/web-edit-server_2021-11-23-16-39.json create mode 100644 common/changes/@itwin/core-common/web-edit-server_2021-11-23-16-39.json create mode 100644 common/changes/@itwin/core-frontend/web-edit-server_2021-11-18-16-04.json create mode 100644 common/changes/@itwin/express-server/web-edit-server_2021-11-18-16-04.json create mode 100644 core/common/src/ipc/IpcWebSocketTransport.ts diff --git a/common/api/core-common.api.md b/common/api/core-common.api.md index 223bc4d64969..fff5ff3c9da1 100644 --- a/common/api/core-common.api.md +++ b/common/api/core-common.api.md @@ -4915,11 +4915,29 @@ export interface IpcWebSocketMessage { // (undocumented) response?: number; // (undocumented) + sequence: number; + // (undocumented) type: IpcWebSocketMessageType; } +// @internal (undocumented) +export namespace IpcWebSocketMessage { + // (undocumented) + export function duplicate(): IpcWebSocketMessage; + // (undocumented) + export function internal(): IpcWebSocketMessage; + // (undocumented) + export function next(): number; + // (undocumented) + export function skip(message: IpcWebSocketMessage): boolean; +} + // @internal (undocumented) export enum IpcWebSocketMessageType { + // (undocumented) + Duplicate = 5, + // (undocumented) + Internal = 4, // (undocumented) Invoke = 2, // (undocumented) @@ -4932,8 +4950,14 @@ export enum IpcWebSocketMessageType { // @internal (undocumented) export abstract class IpcWebSocketTransport { + // (undocumented) + protected notifyIncoming(data: any): Promise; // (undocumented) abstract send(message: IpcWebSocketMessage): void; + // (undocumented) + protected serialize(data: IpcWebSocketMessage): any[]; + // (undocumented) + protected unwrap(data: any): any; } // @internal diff --git a/common/api/core-frontend.api.md b/common/api/core-frontend.api.md index b130587798f1..0ee951eb3eee 100644 --- a/common/api/core-frontend.api.md +++ b/common/api/core-frontend.api.md @@ -5038,6 +5038,8 @@ export function linePlaneIntersect(outP: Point3d, linePt: Point3d, lineNormal: V // @internal export class LocalhostIpcApp { + // (undocumented) + static buildUrlForSocket(base: URL, path?: string): URL; // (undocumented) static startup(opts: LocalHostIpcAppOpts): Promise; } @@ -5049,7 +5051,7 @@ export interface LocalHostIpcAppOpts { // (undocumented) localhostIpcApp?: { socketPort?: number; - socketPath?: string; + socketUrl?: URL; }; } diff --git a/common/api/express-server.api.md b/common/api/express-server.api.md index 569daa16c918..13da2cb11a91 100644 --- a/common/api/express-server.api.md +++ b/common/api/express-server.api.md @@ -31,6 +31,13 @@ export interface IModelJsExpressServerConfig { uploadLimit: string; } +// @alpha (undocumented) +export class WebEditServer extends IModelJsExpressServer { + constructor(protocol: WebAppRpcProtocol, config?: IModelJsExpressServerConfig); + // (undocumented) + protected _configureRoutes(): void; +} + // (No @packageDocumentation comment for this package) diff --git a/common/changes/@itwin/core-backend/web-edit-server_2021-11-23-16-39.json b/common/changes/@itwin/core-backend/web-edit-server_2021-11-23-16-39.json new file mode 100644 index 000000000000..fd905d05314a --- /dev/null +++ b/common/changes/@itwin/core-backend/web-edit-server_2021-11-23-16-39.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-backend", + "comment": "Adding WebEditServer (test scenarios only for now)", + "type": "none" + } + ], + "packageName": "@itwin/core-backend" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-common/web-edit-server_2021-11-23-16-39.json b/common/changes/@itwin/core-common/web-edit-server_2021-11-23-16-39.json new file mode 100644 index 000000000000..fe6dd5b6c0aa --- /dev/null +++ b/common/changes/@itwin/core-common/web-edit-server_2021-11-23-16-39.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-common", + "comment": "Adding WebEditServer (test scenarios only for now)", + "type": "none" + } + ], + "packageName": "@itwin/core-common" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-frontend/web-edit-server_2021-11-18-16-04.json b/common/changes/@itwin/core-frontend/web-edit-server_2021-11-18-16-04.json new file mode 100644 index 000000000000..4c36d8f63c53 --- /dev/null +++ b/common/changes/@itwin/core-frontend/web-edit-server_2021-11-18-16-04.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-frontend", + "comment": "Adding WebEditServer (test scenarios only for now).", + "type": "none" + } + ], + "packageName": "@itwin/core-frontend" +} \ No newline at end of file diff --git a/common/changes/@itwin/express-server/web-edit-server_2021-11-18-16-04.json b/common/changes/@itwin/express-server/web-edit-server_2021-11-18-16-04.json new file mode 100644 index 000000000000..f8ddc0281e40 --- /dev/null +++ b/common/changes/@itwin/express-server/web-edit-server_2021-11-18-16-04.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/express-server", + "comment": "Adding WebEditServer (test scenarios only for now).", + "type": "none" + } + ], + "packageName": "@itwin/express-server" +} \ No newline at end of file diff --git a/common/config/rush/browser-approved-packages.json b/common/config/rush/browser-approved-packages.json index eafec88cd70e..5d7404666cb5 100644 --- a/common/config/rush/browser-approved-packages.json +++ b/common/config/rush/browser-approved-packages.json @@ -492,7 +492,7 @@ }, { "name": "express-ws", - "allowedCategories": [ "internal" ] + "allowedCategories": [ "backend", "internal" ] }, { "name": "faker", diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index acb89b805a78..4464071db928 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -592,11 +592,13 @@ importers: ../../core/express-server: specifiers: '@itwin/build-tools': workspace:* + '@itwin/core-backend': workspace:* '@itwin/core-common': workspace:* '@itwin/eslint-plugin': workspace:* '@types/body-parser': ^1.17.0 '@types/chai': ^4.1.4 '@types/express': ^4.16.1 + '@types/express-ws': ^3.0.1 '@types/mocha': ^8.2.2 '@types/node': 14.14.31 '@types/sinon': ^9.0.0 @@ -604,6 +606,7 @@ importers: chai: ^4.1.2 eslint: ^7.11.0 express: ^4.16.3 + express-ws: ^5.0.2 mocha: ^8.3.2 nyc: ^15.1.0 rimraf: ^3.0.2 @@ -612,13 +615,16 @@ importers: typescript: ~4.4.0 dependencies: express: 4.17.1 + express-ws: 5.0.2_express@4.17.1 devDependencies: '@itwin/build-tools': link:../../tools/build + '@itwin/core-backend': link:../backend '@itwin/core-common': link:../common '@itwin/eslint-plugin': link:../../tools/eslint-plugin '@types/body-parser': 1.19.2 '@types/chai': 4.2.22 '@types/express': 4.17.13 + '@types/express-ws': 3.0.1 '@types/mocha': 8.2.3 '@types/node': 14.14.31 '@types/sinon': 9.0.11 @@ -6149,12 +6155,12 @@ packages: requiresBuild: true dev: false - /@bentley/itwin-client/3.0.0-dev.135_2a526bb54deb5ab443bbedfaf1d28158: - resolution: {integrity: sha512-facpvfpiOsyvNxrOUP47Qn1T/9uUp2pxF9EweNg18HpcgdRZvfQtqGAdYoiR4qdvCVZJEqpoCz7p6t1DFFjAuA==} + /@bentley/itwin-client/3.0.0-dev.136_8264537c3090aecc81c8b892c7f72712: + resolution: {integrity: sha512-I4mBlIDr1QRdku0WIZz6erzGsda8FvICcCdQAiouDjQyq0CWeavQADJyMUsv3qJHPr8WhTLgXhp3UxgdKfvXjA==} peerDependencies: - '@itwin/core-bentley': ^3.0.0-dev.135 + '@itwin/core-bentley': ^3.0.0-dev.136 dependencies: - '@itwin/core-bentley': 3.0.0-dev.135 + '@itwin/core-bentley': 3.0.0-dev.136 deep-assign: 2.0.0 js-base64: 3.7.2 lodash: 4.17.21 @@ -6611,8 +6617,8 @@ packages: oidc-client: 1.11.5 dev: false - /@itwin/certa/3.0.0-dev.135: - resolution: {integrity: sha512-/HUGCRk2+6Q+67ayrXP3FAuM1vFwrbf3lOR9ZSNUgJwbTihkVuhYVxLKPhK7ZnOgViYBoNWILULT/F6DfBmNUQ==} + /@itwin/certa/3.0.0-dev.136: + resolution: {integrity: sha512-E/pkirDdopg/0OhT2jBKhbW7JGMWbEnWxuxfqKGGdEatiJFbuYFbwvpCA9mSPTL15kwscPhIuuRmFbpryMg/Gg==} hasBin: true peerDependencies: electron: ^14.0.0 @@ -6634,8 +6640,8 @@ packages: - supports-color - utf-8-validate - /@itwin/certa/3.0.0-dev.135_electron@14.2.1: - resolution: {integrity: sha512-/HUGCRk2+6Q+67ayrXP3FAuM1vFwrbf3lOR9ZSNUgJwbTihkVuhYVxLKPhK7ZnOgViYBoNWILULT/F6DfBmNUQ==} + /@itwin/certa/3.0.0-dev.136_electron@14.2.1: + resolution: {integrity: sha512-E/pkirDdopg/0OhT2jBKhbW7JGMWbEnWxuxfqKGGdEatiJFbuYFbwvpCA9mSPTL15kwscPhIuuRmFbpryMg/Gg==} hasBin: true peerDependencies: electron: ^14.0.0 @@ -6659,8 +6665,8 @@ packages: - utf-8-validate dev: true - /@itwin/core-bentley/3.0.0-dev.135: - resolution: {integrity: sha512-a2ksxttsEX+dNzI/y3V+kiVdjwvw3FFPwoL7PVJzIjfvFevCMNPj0b6jQ+j4TjQysj7+aw+C73WAZVdeMeupVQ==} + /@itwin/core-bentley/3.0.0-dev.136: + resolution: {integrity: sha512-hFEzVH/6mzFOBeat8lAXPHaLdy/8ylUAJC0Ow8M4m+F9XwnA2B0emde44AKtJsH0ZG6tzpNkKqlcXFuQc+xCKg==} /@itwin/core-bentley/3.0.0-extension.1: resolution: {integrity: sha512-3r1aRoZp694aqP2E0M9dZiaPSAC0E/E2VTvvN9K73NnlTvO4jpaIdt520oHp7tkGYx24VS9Q8+ED1Z0CH9+RkA==} @@ -6682,8 +6688,8 @@ packages: /@itwin/electron-authorization/0.5.0: resolution: {integrity: sha512-RGaIYXy0AoxBbTMSJTYzQgrwnr8kV/OJurhirv39VC3LnREu/6ZILYVP2eSoF7+F2f220rWvwzvQp29xhoDYHA==} dependencies: - '@bentley/itwin-client': 3.0.0-dev.135_2a526bb54deb5ab443bbedfaf1d28158 - '@itwin/core-bentley': 3.0.0-dev.135 + '@bentley/itwin-client': 3.0.0-dev.136_8264537c3090aecc81c8b892c7f72712 + '@itwin/core-bentley': 3.0.0-dev.136 '@openid/appauth': 1.3.1 keytar: 7.7.0 open: 8.4.0 @@ -6775,8 +6781,8 @@ packages: /@itwin/oidc-signin-tool/3.0.0-dev.110: resolution: {integrity: sha512-uoTmMBqnEueiBQSzP6JjaTQu96fJa8JBqTESZZT/6Ub43jP1jYUcI+t0bk0lq3V4GF1GVWisTmcBaW6VK7kHsw==} dependencies: - '@itwin/certa': 3.0.0-dev.135 - '@itwin/core-bentley': 3.0.0-dev.135 + '@itwin/certa': 3.0.0-dev.136 + '@itwin/core-bentley': 3.0.0-dev.136 dotenv: 10.0.0 dotenv-expand: 5.1.0 openid-client: 4.9.1 @@ -6790,8 +6796,8 @@ packages: /@itwin/oidc-signin-tool/3.0.0-dev.110_electron@14.2.1: resolution: {integrity: sha512-uoTmMBqnEueiBQSzP6JjaTQu96fJa8JBqTESZZT/6Ub43jP1jYUcI+t0bk0lq3V4GF1GVWisTmcBaW6VK7kHsw==} dependencies: - '@itwin/certa': 3.0.0-dev.135_electron@14.2.1 - '@itwin/core-bentley': 3.0.0-dev.135 + '@itwin/certa': 3.0.0-dev.136_electron@14.2.1 + '@itwin/core-bentley': 3.0.0-dev.136 dotenv: 10.0.0 dotenv-expand: 5.1.0 openid-client: 4.9.1 @@ -12318,7 +12324,6 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate - dev: true /express/4.17.1: resolution: {integrity: sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==} diff --git a/core/backend/src/LocalhostIpcHost.ts b/core/backend/src/LocalhostIpcHost.ts index 9ef7cbc0c382..713158bfc6f9 100644 --- a/core/backend/src/LocalhostIpcHost.ts +++ b/core/backend/src/LocalhostIpcHost.ts @@ -31,15 +31,23 @@ class LocalTransport extends IpcWebSocketTransport { } public send(message: IpcWebSocketMessage): void { - this._connections.forEach((connection) => connection.send(JSON.stringify(message))); + this._connections.forEach((connection) => { + const parts = this.serialize(message); + parts.forEach((part) => connection.send(part)); + }); } public connect(connection: ws) { this._connections.add(connection); - connection.on("message", (data) => { + connection.on("message", async (data) => { + const message = await this.notifyIncoming(data); + if (IpcWebSocketMessage.skip(message)) { + return; + } + for (const listener of IpcWebSocket.receivers) { - listener({} as Event, JSON.parse(data as string)); + listener({} as Event, message); } }); diff --git a/core/common/src/core-common.ts b/core/common/src/core-common.ts index 1e923d7d0104..01545c5a441f 100644 --- a/core/common/src/core-common.ts +++ b/core/common/src/core-common.ts @@ -67,6 +67,7 @@ export * from "./IModelError"; export * from "./IModelVersion"; export * from "./ipc/IpcSocket"; export * from "./ipc/IpcWebSocket"; +export * from "./ipc/IpcWebSocketTransport"; export * from "./IpcAppProps"; export * from "./LightSettings"; export * from "./LinePixels"; diff --git a/core/common/src/ipc/IpcWebSocket.ts b/core/common/src/ipc/IpcWebSocket.ts index 802adf6c4611..5f4987b8517c 100644 --- a/core/common/src/ipc/IpcWebSocket.ts +++ b/core/common/src/ipc/IpcWebSocket.ts @@ -7,18 +7,16 @@ */ import { IpcListener, IpcSocket, IpcSocketBackend, IpcSocketFrontend, RemoveFunction } from "./IpcSocket"; - -/** @internal */ -export abstract class IpcWebSocketTransport { - public abstract send(message: IpcWebSocketMessage): void; -} +import { IpcWebSocketTransport } from "./IpcWebSocketTransport"; /** @internal */ export enum IpcWebSocketMessageType { Send, Push, Invoke, - Response + Response, + Internal, + Duplicate } /** @internal */ @@ -29,6 +27,28 @@ export interface IpcWebSocketMessage { channel: string; method?: string; data?: any[]; + sequence: number; +} + +/** @internal */ +export namespace IpcWebSocketMessage { + let _next = -1; + + export function next(): number { + return ++_next; + } + + export function internal(): IpcWebSocketMessage { + return { type: IpcWebSocketMessageType.Internal, channel: "", sequence: Number.MIN_SAFE_INTEGER }; + } + + export function duplicate(): IpcWebSocketMessage { + return { type: IpcWebSocketMessageType.Duplicate, channel: "", sequence: Number.MIN_SAFE_INTEGER }; + } + + export function skip(message: IpcWebSocketMessage): boolean { + return message.type === IpcWebSocketMessageType.Internal || message.type === IpcWebSocketMessageType.Duplicate; + } } /** @internal */ @@ -89,12 +109,14 @@ export class IpcWebSocketFrontend extends IpcWebSocket implements IpcSocketFront } public send(channel: string, ...data: any[]): void { - IpcWebSocket.transport.send({ type: IpcWebSocketMessageType.Send, channel, data }); + const sequence = IpcWebSocketMessage.next(); + IpcWebSocket.transport.send({ type: IpcWebSocketMessageType.Send, channel, data, sequence }); } public async invoke(channel: string, methodName: string, ...args: any[]): Promise { const requestId = ++this._nextRequest; - IpcWebSocket.transport.send({ type: IpcWebSocketMessageType.Invoke, channel, method: methodName, data: args, request: requestId }); + const sequence = IpcWebSocketMessage.next(); + IpcWebSocket.transport.send({ type: IpcWebSocketMessageType.Invoke, channel, method: methodName, data: args, request: requestId, sequence }); return new Promise((resolve) => { this._pendingRequests.set(requestId, resolve); @@ -124,7 +146,8 @@ export class IpcWebSocketBackend extends IpcWebSocket implements IpcSocketBacken } public send(channel: string, ...data: any[]): void { - IpcWebSocket.transport.send({ type: IpcWebSocketMessageType.Push, channel, data }); + const sequence = IpcWebSocketMessage.next(); + IpcWebSocket.transport.send({ type: IpcWebSocketMessageType.Push, channel, data, sequence }); } public handle(channel: string, handler: (event: Event, methodName: string, ...args: any[]) => Promise): RemoveFunction { @@ -150,11 +173,14 @@ export class IpcWebSocketBackend extends IpcWebSocket implements IpcSocketBacken const response = await handler({} as any, message.method, ...args); + const sequence = IpcWebSocketMessage.next(); + IpcWebSocket.transport.send({ type: IpcWebSocketMessageType.Response, channel: message.channel, response: message.request, data: response, + sequence, }); } } diff --git a/core/common/src/ipc/IpcWebSocketTransport.ts b/core/common/src/ipc/IpcWebSocketTransport.ts new file mode 100644 index 000000000000..523d3b85c797 --- /dev/null +++ b/core/common/src/ipc/IpcWebSocketTransport.ts @@ -0,0 +1,156 @@ +/*--------------------------------------------------------------------------------------------- +* Copyright (c) Bentley Systems, Incorporated. All rights reserved. +* See LICENSE.md in the project root for license terms and full copyright notice. +*--------------------------------------------------------------------------------------------*/ +/** @packageDocumentation + * @module IpcSocket + */ + +import { IpcWebSocketMessage } from "./IpcWebSocket"; + +let parts: any[] = []; + +/** @internal */ +export abstract class IpcWebSocketTransport { + private _partial?: string; + private _received: any[] = []; + private _outstanding = 0; + + public abstract send(message: IpcWebSocketMessage): void; + + protected unwrap(data: any) { + return (typeof (Blob) !== "undefined" && data instanceof Blob) ? data.arrayBuffer() : data; + } + + protected async notifyIncoming(data: any): Promise { + if (this._partial) { + this._received.push(data); + --this._outstanding; + + if (this._outstanding === 0) { + await Promise.all(this._received.map(async (v, i, a) => a[i] = await this.unwrap(v))); + parts = this._received; + const message: IpcWebSocketMessage = JSON.parse(this._partial, reviver); + this._partial = undefined; + parts.length = 0; + return InSentOrder.deliver(message); + } else { + return IpcWebSocketMessage.internal(); + } + } else { + const [serialized, followers] = JSON.parse(data); + + if (followers) { + this._partial = serialized; + this._outstanding = followers; + return IpcWebSocketMessage.internal(); + } else { + const message: IpcWebSocketMessage = JSON.parse(serialized, reviver); + return InSentOrder.deliver(message); + } + } + } + + protected serialize(data: IpcWebSocketMessage): any[] { + parts.length = 0; + const objects = JSON.stringify(data, replacer); + const value = [JSON.stringify([objects, parts.length]), ...parts]; + parts.length = 0; + return value; + } +} + +interface Marker { ipc: "binary", type: number, index: number } +const types = [Uint8Array, Int8Array, Uint8ClampedArray, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array, DataView]; +function identify(value: any) { return Buffer.isBuffer(value) ? 0 : types.indexOf(value.constructor); } +function lookup(value: Marker) { return types[value.type]; } + +function replacer(this: any, _key: string, value: any) { + const asBinary = replaceBinary(value); + if (asBinary) { + return asBinary; + } + + return value; +} + +function reviver(_key: string, value: any) { + if (typeof (value) === "object" && value !== null && value.hasOwnProperty("ipc") && value.ipc === "binary") { + return reviveBinary(value); + } + + return value; +} + +function replaceBinary(value: any): Marker | undefined { + if (ArrayBuffer.isView(value) || Buffer.isBuffer(value)) { + const index = parts.push(value) - 1; + const type = identify(value); + return { ipc: "binary", type, index }; + } else { + return undefined; + } +} + +function reviveBinary(value: Marker): ArrayBufferView { + const constructor = lookup(value); + const part = parts[value.index]; + return new constructor(part); +} + +function makePromise() { + let resolve: (value: T | PromiseLike) => void = () => { }; + let reject: (reason?: any) => void = () => { }; + const promise = new Promise((res, rej) => { resolve = res; reject = rej; }); + return { promise, resolve, reject }; +} + +/* Reconstructing the sequence in which messages were sent is necessary since + the binary data for a message has to be awaited in IpcWebSocketTransport.unwrap. */ +class InSentOrder { + private static _queue: InSentOrder[] = []; + private static _last = -1; + private static get _next() { return this._last + 1; } + + public static async deliver(message: IpcWebSocketMessage): Promise { + const entry = new InSentOrder(message); + this._queue.push(entry); + this._queue.sort((a, b) => a.sequence - b.sequence); + + while (this._queue.length !== 0) { + const next = this._queue[0]; + const duplicate = next.sequence <= this._last; + const match = next.sequence === this._next; + + if (duplicate) { + next.duplicate = true; + } else if (match) { + ++this._last; + } + + if (duplicate || match) { + this._queue.shift(); + next.release(); + } + } + + return entry.message; + } + + public release = () => { }; + public sequence: number; + public duplicate = false; + public message: Promise; + + private constructor(message: IpcWebSocketMessage) { + this.sequence = message.sequence; + + const { promise, resolve } = makePromise(); + this.message = promise; + + this.release = () => { + const value = this.duplicate ? IpcWebSocketMessage.duplicate() : message; + resolve(value); + }; + } +} diff --git a/core/express-server/package.json b/core/express-server/package.json index f7fb17d67be0..73717d8efbe7 100644 --- a/core/express-server/package.json +++ b/core/express-server/package.json @@ -35,6 +35,7 @@ "devDependencies": { "@itwin/build-tools": "workspace:*", "@itwin/core-common": "workspace:*", + "@itwin/core-backend": "workspace:*", "@itwin/eslint-plugin": "workspace:*", "@types/body-parser": "^1.17.0", "@types/chai": "^4.1.4", @@ -43,6 +44,7 @@ "@types/node": "14.14.31", "@types/sinon": "^9.0.0", "@types/supertest": "^2.0.4", + "@types/express-ws": "^3.0.1", "chai": "^4.1.2", "eslint": "^7.11.0", "mocha": "^8.3.2", @@ -52,8 +54,12 @@ "supertest": "^3.0.0", "typescript": "~4.4.0" }, + "peerDependencies": { + "@itwin/core-backend": "workspace:*" + }, "dependencies": { - "express": "^4.16.3" + "express": "^4.16.3", + "express-ws": "^5.0.2" }, "eslintConfig": { "plugins": [ @@ -64,4 +70,4 @@ "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc" } -} +} \ No newline at end of file diff --git a/core/express-server/src/ExpressServer.ts b/core/express-server/src/ExpressServer.ts index 0ccf2799380d..d72ca8a39507 100644 --- a/core/express-server/src/ExpressServer.ts +++ b/core/express-server/src/ExpressServer.ts @@ -3,8 +3,10 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ import * as express from "express"; +import * as enableWs from "express-ws"; import { Server as HttpServer } from "http"; import { BentleyCloudRpcConfiguration, RpcConfiguration, WebAppRpcProtocol } from "@itwin/core-common"; +import { LocalhostIpcHost } from "@itwin/core-backend"; /** * Options for configuring IModelJsExpressServer. @@ -78,3 +80,18 @@ export class IModelJsExpressServer { }); } } + +/** + * @alpha + */ +export class WebEditServer extends IModelJsExpressServer { + protected override _configureRoutes() { + (this._app as any).ws("/ipc", (ws: any, _req: any) => LocalhostIpcHost.connect(ws)); + super._configureRoutes(); + } + + constructor(protocol: WebAppRpcProtocol, config = IModelJsExpressServer.defaults) { + super(protocol, config); + enableWs(this._app); + } +} diff --git a/core/frontend/src/LocalhostIpcApp.ts b/core/frontend/src/LocalhostIpcApp.ts index 768c457c9c65..db4fc659e636 100644 --- a/core/frontend/src/LocalhostIpcApp.ts +++ b/core/frontend/src/LocalhostIpcApp.ts @@ -16,7 +16,7 @@ export interface LocalHostIpcAppOpts { localhostIpcApp?: { socketPort?: number; - socketPath?: string; + socketUrl?: URL; }; } @@ -27,12 +27,12 @@ class LocalTransport extends IpcWebSocketTransport { public constructor(opts: LocalHostIpcAppOpts) { super(); - let url = ""; - if (opts?.localhostIpcApp?.socketPath) { - url = opts?.localhostIpcApp?.socketPath; + let url: URL; + if (opts?.localhostIpcApp?.socketUrl) { + url = opts?.localhostIpcApp?.socketUrl; } else { const port = opts?.localhostIpcApp?.socketPort ?? 3002; - url = `ws://localhost:${port}/`; + url = new URL(`ws://localhost:${port}/`); } this._client = new WebSocket(url); @@ -44,13 +44,24 @@ class LocalTransport extends IpcWebSocketTransport { }); this._client.addEventListener("message", async (event) => { + const message = await this.notifyIncoming(event.data); + if (IpcWebSocketMessage.skip(message)) { + return; + } + for (const listener of IpcWebSocket.receivers) - listener({} as Event, JSON.parse(event.data as string)); + listener({} as Event, message); }); } public send(message: IpcWebSocketMessage): void { - this._pending?.push(message) || this._client.send(JSON.stringify(message)); + if (this._pending) { + this._pending.push(message); + return; + } + + const parts = this.serialize(message); + parts.forEach((part) => this._client.send(part)); } } @@ -59,6 +70,13 @@ class LocalTransport extends IpcWebSocketTransport { * @internal */ export class LocalhostIpcApp { + public static buildUrlForSocket(base: URL, path = "ipc"): URL { + const url = new URL(base); + url.protocol = "ws"; + url.pathname = [...url.pathname.split("/"), path].filter((v) => v).join("/"); + return url; + } + public static async startup(opts: LocalHostIpcAppOpts) { IpcWebSocket.transport = new LocalTransport(opts); const ipc = new IpcWebSocketFrontend(); diff --git a/full-stack-tests/core/src/backend/backend.ts b/full-stack-tests/core/src/backend/backend.ts index 733f3015914f..89ce6b7414e0 100644 --- a/full-stack-tests/core/src/backend/backend.ts +++ b/full-stack-tests/core/src/backend/backend.ts @@ -8,15 +8,15 @@ import "@itwin/oidc-signin-tool/lib/cjs/certa/certaBackend"; import * as fs from "fs"; import * as path from "path"; import { ElectronMainAuthorization } from "@itwin/electron-authorization/lib/cjs/ElectronMain"; -import { IModelJsExpressServer } from "@itwin/express-server"; +import { WebEditServer } from "@itwin/express-server"; import { IModelHubBackend } from "@bentley/imodelhub-client/lib/cjs/imodelhub-node"; import { - FileNameResolver, IModelDb, IModelHost, IModelHostConfiguration, IpcHandler, PhysicalModel, PhysicalPartition, SpatialCategory, + FileNameResolver, IModelDb, IModelHost, IModelHostConfiguration, IpcHandler, LocalhostIpcHost, PhysicalModel, PhysicalPartition, SpatialCategory, SubjectOwnsPartitionElements, } from "@itwin/core-backend"; import { Id64String, Logger, LogLevel, ProcessDetector } from "@itwin/core-bentley"; import { BentleyCloudRpcManager, CodeProps, ElementProps, IModel, RelatedElement, RpcConfiguration, SubCategoryAppearance } from "@itwin/core-common"; -import { ElectronHost } from "@itwin/core-electron/lib/cjs/ElectronBackend"; +import { ElectronHost } from "@itwin/core-electron/lib/cjs/ElectronBackend"; import { BasicManipulationCommand, EditCommandAdmin } from "@itwin/editor-backend"; import { fullstackIpcChannel, FullStackTestIpc } from "../common/FullStackTestIpc"; import { rpcInterfaces } from "../common/RpcInterfaces"; @@ -100,11 +100,15 @@ async function init() { // create a basic express web server const port = Number(process.env.CERTA_PORT || 3011) + 2000; - const server = new IModelJsExpressServer(rpcConfig.protocol); + const server = new WebEditServer(rpcConfig.protocol); await server.initialize(port); console.log(`Web backend for full-stack-tests listening on port ${port}`); - await IModelHost.startup(iModelHost); + await LocalhostIpcHost.startup({ iModelHost, localhostIpcHost: { noServer: true } }); + + EditCommandAdmin.registerModule(testCommands); + EditCommandAdmin.register(BasicManipulationCommand); + FullStackTestIpcHandler.register(); } IModelHost.snapshotFileNameResolver = new BackendTestAssetResolver(); diff --git a/full-stack-tests/core/src/frontend/TestUtility.ts b/full-stack-tests/core/src/frontend/TestUtility.ts index cc5f2b155ea1..3fd4fb22c9b0 100644 --- a/full-stack-tests/core/src/frontend/TestUtility.ts +++ b/full-stack-tests/core/src/frontend/TestUtility.ts @@ -8,7 +8,7 @@ import { Project as ITwin } from "@itwin/projects-client"; import { AuthorizationClient } from "@itwin/core-common"; import { ElectronRendererAuthorization } from "@itwin/electron-authorization/lib/cjs/ElectronRenderer"; import { ElectronApp } from "@itwin/core-electron/lib/cjs/ElectronFrontend"; -import { IModelApp, IModelAppOptions, MockRender, NativeApp } from "@itwin/core-frontend"; +import { IModelApp, IModelAppOptions, LocalhostIpcApp, MockRender, NativeApp } from "@itwin/core-frontend"; import { getAccessTokenFromBackend, TestUserCredentials } from "@itwin/oidc-signin-tool/lib/cjs/frontend"; import { IModelHubUserMgr } from "../common/IModelHubUserMgr"; import { rpcInterfaces, TestRpcInterface } from "../common/RpcInterfaces"; @@ -135,13 +135,22 @@ export class TestUtility { * * Otherwise, IModelApp.startup is used directly. */ - public static async startFrontend(opts?: IModelAppOptions, mockRender?: boolean): Promise { + public static async startFrontend(opts?: IModelAppOptions, mockRender?: boolean, enableWebEdit?: boolean): Promise { opts = opts ? opts : TestUtility.iModelAppOptions; if (mockRender) opts.renderSys = this.systemFactory(); if (ProcessDetector.isElectronAppFrontend) return ElectronApp.startup({ iModelApp: opts }); - return IModelApp.startup(opts); + + if (enableWebEdit) { + let socketUrl = new URL(window.location.toString()); + socketUrl.port = (parseInt(socketUrl.port, 10) + 2000).toString(); + socketUrl = LocalhostIpcApp.buildUrlForSocket(socketUrl); + + return LocalhostIpcApp.startup({ iModelApp: opts, localhostIpcApp: { socketUrl } }); + } else { + return IModelApp.startup(opts); + } } /** Helper around the different shutdown workflows for different app types. diff --git a/full-stack-tests/core/src/frontend/standalone/BriefcaseTxns.test.ts b/full-stack-tests/core/src/frontend/standalone/BriefcaseTxns.test.ts index fe9d7a89ec63..4981c9693825 100644 --- a/full-stack-tests/core/src/frontend/standalone/BriefcaseTxns.test.ts +++ b/full-stack-tests/core/src/frontend/standalone/BriefcaseTxns.test.ts @@ -10,12 +10,12 @@ import { BriefcaseConnection } from "@itwin/core-frontend"; import { callFullStackTestIpc, deleteElements, initializeEditTools, insertLineElement, makeModelCode, transformElements } from "../Editing"; import { TestUtility } from "../TestUtility"; -describe.skip("BriefcaseTxns", () => { - if (ProcessDetector.isElectronAppFrontend) { +describe("BriefcaseTxns", () => { + if (!ProcessDetector.isMobileAppFrontend) { let imodel: BriefcaseConnection; before(async () => { - await TestUtility.startFrontend(); + await TestUtility.startFrontend(undefined, undefined, true); await initializeEditTools(); }); diff --git a/full-stack-tests/core/src/frontend/standalone/EditTool.test.ts b/full-stack-tests/core/src/frontend/standalone/EditTool.test.ts index 8364e4dee930..661ad21af5d0 100644 --- a/full-stack-tests/core/src/frontend/standalone/EditTool.test.ts +++ b/full-stack-tests/core/src/frontend/standalone/EditTool.test.ts @@ -34,11 +34,11 @@ class TestEditTool1 extends PrimitiveTool { } } -if (ProcessDetector.isElectronAppFrontend) { +if (!ProcessDetector.isMobileAppFrontend) { describe("EditTools", () => { before(async () => { - await TestUtility.startFrontend(); + await TestUtility.startFrontend(undefined, undefined, true); const namespace = "TestApp"; await IModelApp.localization.registerNamespace(namespace); IModelApp.tools.register(TestEditTool1, namespace); diff --git a/full-stack-tests/core/src/frontend/standalone/GraphicalEditingScope.test.ts b/full-stack-tests/core/src/frontend/standalone/GraphicalEditingScope.test.ts index da41b47e4f5a..42955f510e23 100644 --- a/full-stack-tests/core/src/frontend/standalone/GraphicalEditingScope.test.ts +++ b/full-stack-tests/core/src/frontend/standalone/GraphicalEditingScope.test.ts @@ -23,7 +23,7 @@ function makeUpdate(id: Id64String, range?: Range3d): ElementGeometryChange { re function makeDelete(id: Id64String): ElementGeometryChange { return { id, type: DbOpcode.Delete }; } describe("GraphicalEditingScope", () => { - if (ProcessDetector.isElectronAppFrontend) { + if (!ProcessDetector.isMobileAppFrontend) { let imodel: BriefcaseConnection | undefined; // Editable; BisCore version < 1.0.11 const oldFilePath = path.join(process.env.IMODELJS_CORE_DIRNAME!, "core/backend/lib/cjs/test/assets/test.bim"); @@ -38,7 +38,7 @@ describe("GraphicalEditingScope", () => { } before(async () => { - await TestUtility.startFrontend(); + await TestUtility.startFrontend(undefined, undefined, true); await initializeEditTools(); }); diff --git a/full-stack-tests/core/src/frontend/standalone/ModelChangeMonitor.test.ts b/full-stack-tests/core/src/frontend/standalone/ModelChangeMonitor.test.ts index 142b71364ea1..94925675548b 100644 --- a/full-stack-tests/core/src/frontend/standalone/ModelChangeMonitor.test.ts +++ b/full-stack-tests/core/src/frontend/standalone/ModelChangeMonitor.test.ts @@ -10,12 +10,12 @@ import { BriefcaseConnection, GeometricModelState } from "@itwin/core-frontend"; import { callFullStackTestIpc, initializeEditTools, insertLineElement, makeModelCode, transformElements } from "../Editing"; import { TestUtility } from "../TestUtility"; -if (ProcessDetector.isElectronAppFrontend) { +if (!ProcessDetector.isMobileAppFrontend) { describe("Model change monitoring", () => { let imodel: BriefcaseConnection; before(async () => { - await TestUtility.startFrontend(); + await TestUtility.startFrontend(undefined, undefined, true); await initializeEditTools(); }); diff --git a/test-apps/display-test-app/src/frontend/App.ts b/test-apps/display-test-app/src/frontend/App.ts index 821dbb6e5fbc..1dde2afa9e76 100644 --- a/test-apps/display-test-app/src/frontend/App.ts +++ b/test-apps/display-test-app/src/frontend/App.ts @@ -198,9 +198,8 @@ export class DisplayTestApp { public static get iTwinId(): GuidString | undefined { return this._iTwinId; } public static async startup(configuration: DtaConfiguration, renderSys: RenderSystem.Options, tileAdmin: TileAdmin.Props): Promise { - const socketUrl = new URL(configuration.customOrchestratorUri || "http://localhost:3001"); - socketUrl.protocol = "ws"; - socketUrl.pathname = [...socketUrl.pathname.split("/"), "ipc"].filter((v) => v).join("/"); + let socketUrl = new URL(configuration.customOrchestratorUri || "http://localhost:3001"); + socketUrl = LocalhostIpcApp.buildUrlForSocket(socketUrl); const opts: ElectronAppOpts | LocalHostIpcAppOpts = { iModelApp: { @@ -225,7 +224,7 @@ export class DisplayTestApp { /* eslint-enable @typescript-eslint/naming-convention */ }, localhostIpcApp: { - socketPath: socketUrl.toString(), + socketUrl, }, }; From 1519a797c649f0af9c310dd1c3c91f6a3ca22e75 Mon Sep 17 00:00:00 2001 From: imodeljs-admin <38288322+imodeljs-admin@users.noreply.github.com> Date: Wed, 1 Dec 2021 05:01:37 +0000 Subject: [PATCH 003/395] 3.0.0-dev.137 --- clients/imodelhub/package.json | 6 ++-- clients/itwin/package.json | 4 +-- clients/reality-data/package.json | 10 +++---- common/config/rush/version-policies.json | 2 +- core/backend/package.json | 12 ++++---- core/bentley/package.json | 2 +- core/common/package.json | 6 ++-- core/ecschema-editing/package.json | 6 ++-- core/ecschema-locaters/package.json | 4 +-- core/ecschema-metadata/package.json | 4 +-- core/ecschema-rpc/common/package.json | 2 +- core/ecschema-rpc/impl/package.json | 2 +- core/electron/package.json | 12 ++++---- core/express-server/package.json | 4 +-- core/frontend-devtools/package.json | 2 +- core/frontend/package.json | 18 +++++------ core/geometry/package.json | 2 +- core/hypermodeling/package.json | 10 +++---- core/i18n/package.json | 4 +-- core/markup/package.json | 10 +++---- core/mobile/package.json | 14 ++++----- core/orbitgt/package.json | 2 +- core/quantity/package.json | 4 +-- core/telemetry/package.json | 2 +- core/transformer/package.json | 14 ++++----- core/webgl-compatibility/package.json | 2 +- domains/analytical/backend/package.json | 8 ++--- .../linear-referencing/backend/package.json | 10 +++---- .../linear-referencing/common/package.json | 6 ++-- .../physical-material/backend/package.json | 8 ++--- editor/backend/package.json | 10 +++---- editor/common/package.json | 8 ++--- editor/frontend/package.json | 6 ++-- extensions/geonames/package.json | 2 +- extensions/map-layers/package.json | 2 +- .../ecschema-rpc-interface/package.json | 2 +- .../imodelhub-client/package.json | 2 +- full-stack-tests/rpc-interface/package.json | 2 +- presentation/backend/package.json | 12 ++++---- presentation/common/package.json | 8 ++--- presentation/components/package.json | 20 ++++++------- presentation/frontend/package.json | 12 ++++---- presentation/testing/package.json | 2 +- tools/backend-webpack/package.json | 2 +- tools/build/package.json | 2 +- tools/certa/package.json | 2 +- tools/ecschema2ts/package.json | 2 +- tools/eslint-plugin/package.json | 2 +- tools/perf-tools/package.json | 2 +- tools/webpack-core/package.json | 2 +- ui/appui-abstract/package.json | 4 +-- ui/appui-layout-react/package.json | 8 ++--- ui/appui-react/package.json | 30 +++++++++---------- ui/components-react/package.json | 8 ++--- ui/core-react/package.json | 6 ++-- ui/imodel-components-react/package.json | 18 +++++------ 56 files changed, 184 insertions(+), 184 deletions(-) diff --git a/clients/imodelhub/package.json b/clients/imodelhub/package.json index 1eac99881be9..440226f79523 100644 --- a/clients/imodelhub/package.json +++ b/clients/imodelhub/package.json @@ -1,6 +1,6 @@ { "name": "@bentley/imodelhub-client", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js iModelHub Client", "main": "lib/cjs/imodelhub-client.js", "modules": "lib/esm/imodelhub-client.js", @@ -45,8 +45,8 @@ "semver": "^5.5.0" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136" + "@bentley/itwin-client": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@bentley/itwin-client": "workspace:*", diff --git a/clients/itwin/package.json b/clients/itwin/package.json index 5c964eeac0bf..550644d5e3dd 100644 --- a/clients/itwin/package.json +++ b/clients/itwin/package.json @@ -1,6 +1,6 @@ { "name": "@bentley/itwin-client", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Base client package for iTwin applications", "main": "lib/cjs/itwin-client.js", "module": "lib/esm/itwin-client.js", @@ -32,7 +32,7 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/clients/reality-data/package.json b/clients/reality-data/package.json index 934266b90926..42c4181765b0 100644 --- a/clients/reality-data/package.json +++ b/clients/reality-data/package.json @@ -1,6 +1,6 @@ { "name": "@bentley/reality-data-client", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js Reality Data Client", "main": "lib/cjs/reality-data-client.js", "module": "lib/esm/reality-data-client.js", @@ -43,10 +43,10 @@ "lodash": "^4.17.10" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136" + "@bentley/itwin-client": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 99cdcc7133fc..1116ac453a4b 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -2,7 +2,7 @@ { "policyName": "prerelease-monorepo-lockStep", "definitionName": "lockStepVersion", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "nextBump": "prerelease" } ] diff --git a/core/backend/package.json b/core/backend/package.json index 451612e760c2..baaf47d957dc 100644 --- a/core/backend/package.json +++ b/core/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-backend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js backend components", "main": "lib/cjs/core-backend.js", "typings": "lib/cjs/core-backend", @@ -38,11 +38,11 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136", - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.136" + "@bentley/itwin-client": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137", + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/bentley/package.json b/core/bentley/package.json index d1227c659539..9b5b9a5dd83e 100644 --- a/core/bentley/package.json +++ b/core/bentley/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-bentley", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Bentley JavaScript core components", "main": "lib/cjs/core-bentley.js", "module": "lib/esm/core-bentley.js", diff --git a/core/common/package.json b/core/common/package.json index e44572e6146a..b0b945e860f7 100644 --- a/core/common/package.json +++ b/core/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-common", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js components common to frontend and backend", "main": "lib/cjs/core-common.js", "module": "lib/esm/core-common.js", @@ -41,8 +41,8 @@ "js-base64": "^3.6.1" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/core/ecschema-editing/package.json b/core/ecschema-editing/package.json index 2130d7f53cad..0f0721541973 100644 --- a/core/ecschema-editing/package.json +++ b/core/ecschema-editing/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-editing", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "ECSchema editing and validation API", "license": "MIT", "main": "lib/cjs/ecschema-editing.js", @@ -59,8 +59,8 @@ "typescript": "~4.4.0" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" }, "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc" diff --git a/core/ecschema-locaters/package.json b/core/ecschema-locaters/package.json index 290668882247..177ad7dc1c5b 100644 --- a/core/ecschema-locaters/package.json +++ b/core/ecschema-locaters/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-locaters", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "EC Schema file locaters", "license": "MIT", "main": "lib/cjs/ecschema-locaters.js", @@ -56,7 +56,7 @@ "glob": "^7.1.2" }, "peerDependencies": { - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.136" + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" }, "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc", diff --git a/core/ecschema-metadata/package.json b/core/ecschema-metadata/package.json index c88f6d0151d7..0c01de7e3ac6 100644 --- a/core/ecschema-metadata/package.json +++ b/core/ecschema-metadata/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-metadata", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "ECObjects core concepts in typescript", "license": "MIT", "main": "lib/cjs/ecschema-metadata.js", @@ -58,7 +58,7 @@ "typescript": "~4.4.0" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137" }, "dependencies": { "almost-equal": "^1.1.0" diff --git a/core/ecschema-rpc/common/package.json b/core/ecschema-rpc/common/package.json index 89047363f7a8..26cf8095e362 100644 --- a/core/ecschema-rpc/common/package.json +++ b/core/ecschema-rpc/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-rpcinterface-common", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Schema RPC Interface common interface", "main": "lib/cjs/ecschema-rpc-interface.js", "typings": "lib/cjs/ecschema-rpc-interface", diff --git a/core/ecschema-rpc/impl/package.json b/core/ecschema-rpc/impl/package.json index f38fd9177ca1..f9a7d7599ba6 100644 --- a/core/ecschema-rpc/impl/package.json +++ b/core/ecschema-rpc/impl/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-rpcinterface-impl", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Schema RPC Interface backend implementation", "main": "lib/cjs/ecschema-rpc-impl.js", "typings": "lib/cjs/ecschema-rpc-impl", diff --git a/core/electron/package.json b/core/electron/package.json index 51322b42d135..535fb4925d4a 100644 --- a/core/electron/package.json +++ b/core/electron/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-electron", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js ElectronHost and ElectronApp", "license": "MIT", "engines": { @@ -31,11 +31,11 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/presentation-common": "workspace:^3.0.0-dev.136", + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/presentation-common": "workspace:^3.0.0-dev.137", "electron": "^14.0.0" }, "devDependencies": { diff --git a/core/express-server/package.json b/core/express-server/package.json index 73717d8efbe7..44a84b4d6a9a 100644 --- a/core/express-server/package.json +++ b/core/express-server/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/express-server", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js express utilities", "main": "lib/cjs/ExpressServer.js", "typings": "lib/cjs/ExpressServer", @@ -70,4 +70,4 @@ "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc" } -} \ No newline at end of file +} diff --git a/core/frontend-devtools/package.json b/core/frontend-devtools/package.json index 9900a5d0600b..525199bfd578 100644 --- a/core/frontend-devtools/package.json +++ b/core/frontend-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/frontend-devtools", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Debug menu and supporting UI widgets", "main": "lib/cjs/frontend-devtools.js", "module": "lib/esm/frontend-devtools.js", diff --git a/core/frontend/package.json b/core/frontend/package.json index d780341f0213..1808fec07371 100644 --- a/core/frontend/package.json +++ b/core/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-frontend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js frontend components", "main": "lib/cjs/core-frontend.js", "module": "lib/esm/core-frontend.js", @@ -39,14 +39,14 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.136", - "@itwin/appui-abstract": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136", - "@itwin/core-orbitgt": "workspace:^3.0.0-dev.136", - "@itwin/core-quantity": "workspace:^3.0.0-dev.136", - "@itwin/webgl-compatibility": "workspace:^3.0.0-dev.136" + "@bentley/itwin-client": "workspace:^3.0.0-dev.137", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137", + "@itwin/core-orbitgt": "workspace:^3.0.0-dev.137", + "@itwin/core-quantity": "workspace:^3.0.0-dev.137", + "@itwin/webgl-compatibility": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/geometry/package.json b/core/geometry/package.json index bc1f79698a03..477444312416 100644 --- a/core/geometry/package.json +++ b/core/geometry/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-geometry", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js Core Geometry library", "main": "lib/cjs/core-geometry.js", "module": "lib/esm/core-geometry.js", diff --git a/core/hypermodeling/package.json b/core/hypermodeling/package.json index 20c73e222654..f34a9ba225b6 100644 --- a/core/hypermodeling/package.json +++ b/core/hypermodeling/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/hypermodeling-frontend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js hypermodeling package", "main": "lib/cjs/hypermodeling-frontend.js", "module": "lib/esm/hypermodeling-frontend.js", @@ -38,10 +38,10 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/core/i18n/package.json b/core/i18n/package.json index 710f40997fbe..06ee07ce0b87 100644 --- a/core/i18n/package.json +++ b/core/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-i18n", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js localization code", "main": "lib/cjs/core-i18n.js", "module": "lib/esm/core-i18n.js", @@ -33,7 +33,7 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/markup/package.json b/core/markup/package.json index 7fdb6506f6d0..6f3f959bfa7c 100644 --- a/core/markup/package.json +++ b/core/markup/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-markup", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js markup package", "main": "lib/cjs/core-markup.js", "module": "lib/esm/core-markup.js", @@ -43,10 +43,10 @@ "@svgdotjs/svg.js": "3.0.13" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/core/mobile/package.json b/core/mobile/package.json index 8af6f201a233..f2d88df9f2cd 100644 --- a/core/mobile/package.json +++ b/core/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-mobile", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js MobileHost and MobileApp", "license": "MIT", "engines": { @@ -32,12 +32,12 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.136", - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/presentation-common": "workspace:^3.0.0-dev.136", + "@bentley/itwin-client": "workspace:^3.0.0-dev.137", + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/presentation-common": "workspace:^3.0.0-dev.137", "js-base64": "^3.6.1", "ws": "^7.5.3" }, diff --git a/core/orbitgt/package.json b/core/orbitgt/package.json index 339e9e499acd..6068d3f3fa6f 100644 --- a/core/orbitgt/package.json +++ b/core/orbitgt/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-orbitgt", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "", "main": "lib/cjs/core-orbitgt.js", "module": "lib/esm/core-orbitgt.js", diff --git a/core/quantity/package.json b/core/quantity/package.json index 473d1b34ff25..78a51564c85e 100644 --- a/core/quantity/package.json +++ b/core/quantity/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-quantity", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Quantity parsing, formatting and conversions for iModel.js", "main": "lib/cjs/core-quantity.js", "module": "lib/esm/core-quantity.js", @@ -53,7 +53,7 @@ "typescript": "~4.4.0" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137" }, "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc" diff --git a/core/telemetry/package.json b/core/telemetry/package.json index 6636663db7af..fa816ecae758 100644 --- a/core/telemetry/package.json +++ b/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-telemetry", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js Telemetry Client", "main": "lib/cjs/core-telemetry.js", "module": "lib/esm/core-telemetry.js", diff --git a/core/transformer/package.json b/core/transformer/package.json index 0e780cc9ff4d..a3ab73dbb5b9 100644 --- a/core/transformer/package.json +++ b/core/transformer/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-transformer", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "API for exporting an iModel's parts and also importing them into another iModel", "main": "lib/cjs/core-transformer.js", "typings": "lib/cjs/core-transformer", @@ -37,12 +37,12 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.136", - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136", - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.136" + "@bentley/itwin-client": "workspace:^3.0.0-dev.137", + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137", + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/webgl-compatibility/package.json b/core/webgl-compatibility/package.json index b7a07ff9d15d..cc66f7ef4e65 100644 --- a/core/webgl-compatibility/package.json +++ b/core/webgl-compatibility/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/webgl-compatibility", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "APIs for determining the level of compatibility of a browser+device with the iModel.js rendering system.", "license": "MIT", "main": "lib/cjs/webgl-compatibility.js", diff --git a/domains/analytical/backend/package.json b/domains/analytical/backend/package.json index f0bd358a208a..1af9b0c9b6b8 100644 --- a/domains/analytical/backend/package.json +++ b/domains/analytical/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/analytical-backend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "main": "lib/cjs/analytical-backend.js", "typings": "lib/cjs/analytical-backend", "license": "MIT", @@ -32,9 +32,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136" + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/domains/linear-referencing/backend/package.json b/domains/linear-referencing/backend/package.json index d5a0240a9f02..066a8a68f0fe 100644 --- a/domains/linear-referencing/backend/package.json +++ b/domains/linear-referencing/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/linear-referencing-backend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "main": "lib/cjs/linear-referencing-backend.js", "typings": "lib/cjs/linear-referencing-backend", "license": "MIT", @@ -32,10 +32,10 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/linear-referencing-common": "workspace:^3.0.0-dev.136" + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/linear-referencing-common": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/domains/linear-referencing/common/package.json b/domains/linear-referencing/common/package.json index 1d6cbff18bcf..920f0ef8f0c4 100644 --- a/domains/linear-referencing/common/package.json +++ b/domains/linear-referencing/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/linear-referencing-common", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "main": "lib/cjs/linear-referencing-common.js", "typings": "lib/cjs/linear-referencing-common", "license": "MIT", @@ -32,8 +32,8 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/domains/physical-material/backend/package.json b/domains/physical-material/backend/package.json index b06e9e121e96..9996d9444afa 100644 --- a/domains/physical-material/backend/package.json +++ b/domains/physical-material/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/physical-material-backend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "main": "lib/cjs/physical-material-backend.js", "typings": "lib/cjs/physical-material-backend", "license": "MIT", @@ -32,9 +32,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136" + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/editor/backend/package.json b/editor/backend/package.json index ee625d273922..4999c91cf191 100644 --- a/editor/backend/package.json +++ b/editor/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/editor-backend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js editor backend", "main": "lib/cjs/editor-backend.js", "typings": "lib/cjs/editor-backend", @@ -35,10 +35,10 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136" + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/editor/common/package.json b/editor/common/package.json index d852633e7a2f..bda19bf56f05 100644 --- a/editor/common/package.json +++ b/editor/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/editor-common", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js editing properties common to frontend and backend", "main": "lib/cjs/editor-common.js", "module": "lib/esm/editor-common.js", @@ -35,9 +35,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@itwin/core-bentley": "workspace:*", diff --git a/editor/frontend/package.json b/editor/frontend/package.json index 05dec201c9a3..f19729289481 100644 --- a/editor/frontend/package.json +++ b/editor/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/editor-frontend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js frontend components", "main": "lib/cjs/editor-frontend.js", "module": "lib/esm/editor-frontend.js", @@ -37,8 +37,8 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/extensions/geonames/package.json b/extensions/geonames/package.json index a221f2b93978..5b9fc62bd228 100644 --- a/extensions/geonames/package.json +++ b/extensions/geonames/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/geonames-extension", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Geolocation Extension", "main": "index.js", "license": "MIT", diff --git a/extensions/map-layers/package.json b/extensions/map-layers/package.json index c5e10bd7e59e..3b5384c1680b 100644 --- a/extensions/map-layers/package.json +++ b/extensions/map-layers/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/map-layers", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Extension that adds a Map Layers Widget", "main": "lib/cjs/map-layers.js", "module": "lib/esm/map-layers.js", diff --git a/full-stack-tests/ecschema-rpc-interface/package.json b/full-stack-tests/ecschema-rpc-interface/package.json index c3c8b5a2c478..cf4c6fd04fb7 100644 --- a/full-stack-tests/ecschema-rpc-interface/package.json +++ b/full-stack-tests/ecschema-rpc-interface/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-rpcinterface-tests", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Integration tests for the Schema RPC Interface", "author": { "name": "Bentley Systems, Inc.", diff --git a/full-stack-tests/imodelhub-client/package.json b/full-stack-tests/imodelhub-client/package.json index f5d3c44ada74..7bdd6ecebcd3 100644 --- a/full-stack-tests/imodelhub-client/package.json +++ b/full-stack-tests/imodelhub-client/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/imodelhub-client-tests", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "main": "lib/imodelhub-client-tests.js", "description": "Tests the iModelHub client", "license": "MIT", diff --git a/full-stack-tests/rpc-interface/package.json b/full-stack-tests/rpc-interface/package.json index 9f95202982e2..88e4046f043a 100644 --- a/full-stack-tests/rpc-interface/package.json +++ b/full-stack-tests/rpc-interface/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/rpcinterface-full-stack-tests", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Test the full iModel.js stack (frontend and backend) using standard RPC interfaces", "license": "MIT", "scripts": { diff --git a/presentation/backend/package.json b/presentation/backend/package.json index ac3997bc9769..b992002d2dad 100644 --- a/presentation/backend/package.json +++ b/presentation/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-backend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Backend of iModel.js Presentation library", "license": "MIT", "repository": { @@ -38,11 +38,11 @@ "test:watch": "npm -s test -- --reporter min --watch-extensions ts --watch" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-quantity": "workspace:^3.0.0-dev.136", - "@itwin/presentation-common": "workspace:^3.0.0-dev.136" + "@itwin/core-backend": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-quantity": "workspace:^3.0.0-dev.137", + "@itwin/presentation-common": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/presentation/common/package.json b/presentation/common/package.json index 8bbda22d4408..4d3b2c3cf223 100644 --- a/presentation/common/package.json +++ b/presentation/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-common", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Common pieces for iModel.js presentation packages", "imodeljsSharedLibrary": true, "license": "MIT", @@ -47,9 +47,9 @@ "test:watch": "npm -s test -- --reporter min --watch-extensions ts --watch" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-quantity": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-quantity": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/presentation/components/package.json b/presentation/components/package.json index 42fe36c77aa9..01239ed0a8f9 100644 --- a/presentation/components/package.json +++ b/presentation/components/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-components", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "React components based on iModel.js Presentation library", "main": "lib/cjs/presentation-components.js", "module": "lib/esm/presentation-components.js", @@ -52,15 +52,15 @@ "rxjs": "^6.6.2" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.136", - "@itwin/components-react": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/core-react": "workspace:^3.0.0-dev.136", - "@itwin/imodel-components-react": "workspace:^3.0.0-dev.136", - "@itwin/presentation-common": "workspace:^3.0.0-dev.136", - "@itwin/presentation-frontend": "workspace:^3.0.0-dev.136", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", + "@itwin/components-react": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/core-react": "workspace:^3.0.0-dev.137", + "@itwin/imodel-components-react": "workspace:^3.0.0-dev.137", + "@itwin/presentation-common": "workspace:^3.0.0-dev.137", + "@itwin/presentation-frontend": "workspace:^3.0.0-dev.137", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/presentation/frontend/package.json b/presentation/frontend/package.json index 16c3442fb147..94dd943894b3 100644 --- a/presentation/frontend/package.json +++ b/presentation/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-frontend", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Frontend of iModel.js Presentation library", "main": "lib/cjs/presentation-frontend.js", "module": "lib/esm/presentation-frontend.js", @@ -42,11 +42,11 @@ "test:watch": "npm -s test -- --reporter min --watch-extensions ts --watch" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/core-quantity": "workspace:^3.0.0-dev.136", - "@itwin/presentation-common": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/core-quantity": "workspace:^3.0.0-dev.137", + "@itwin/presentation-common": "workspace:^3.0.0-dev.137" }, "devDependencies": { "@bentley/itwin-client": "workspace:*", diff --git a/presentation/testing/package.json b/presentation/testing/package.json index 29b615de5060..6e8e1bdf92bd 100644 --- a/presentation/testing/package.json +++ b/presentation/testing/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-testing", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "", "license": "MIT", "repository": { diff --git a/tools/backend-webpack/package.json b/tools/backend-webpack/package.json index 943b4efe4f6a..b683dbe55db8 100644 --- a/tools/backend-webpack/package.json +++ b/tools/backend-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/backend-webpack-tools", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Configuration and scripts for iModel.js agents and backends.", "license": "MIT", "repository": { diff --git a/tools/build/package.json b/tools/build/package.json index be6438cbdda1..fa6c813f165e 100644 --- a/tools/build/package.json +++ b/tools/build/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/build-tools", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Bentley build tools", "license": "MIT", "repository": { diff --git a/tools/certa/package.json b/tools/certa/package.json index 08d9e12840c4..71c37fa24139 100644 --- a/tools/certa/package.json +++ b/tools/certa/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/certa", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "A mocha-based integration test runner", "license": "MIT", "main": "bin/certa.js", diff --git a/tools/ecschema2ts/package.json b/tools/ecschema2ts/package.json index 122b316747c4..3c5389955a14 100644 --- a/tools/ecschema2ts/package.json +++ b/tools/ecschema2ts/package.json @@ -2,7 +2,7 @@ "name": "@itwin/ecschema2ts", "description": "Command line tools that takes an ECSchema xml file and outputs a typescript module", "license": "MIT", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "bin": { "ecschema2ts": "./bin/index.js" }, diff --git a/tools/eslint-plugin/package.json b/tools/eslint-plugin/package.json index e7932673b9e0..1cf6d99c8eb8 100644 --- a/tools/eslint-plugin/package.json +++ b/tools/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/eslint-plugin", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "ESLint plugin with default configuration and custom rules for iTwin.js projects", "license": "MIT", "keywords": [ diff --git a/tools/perf-tools/package.json b/tools/perf-tools/package.json index 7a2af4c50ed2..21991a82e09b 100644 --- a/tools/perf-tools/package.json +++ b/tools/perf-tools/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/perf-tools", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Tools for collecting and reporting performance data", "main": "lib/cjs/index.js", "typings": "lib/cjs/index", diff --git a/tools/webpack-core/package.json b/tools/webpack-core/package.json index c2446328f445..69740517048f 100644 --- a/tools/webpack-core/package.json +++ b/tools/webpack-core/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-webpack-tools", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "Set of Webpack Plugins and Loaders used for building iModel.js applications", "license": "MIT", "repository": { diff --git a/ui/appui-abstract/package.json b/ui/appui-abstract/package.json index 8a92ba4ed9fb..f74cc1ac1f6b 100644 --- a/ui/appui-abstract/package.json +++ b/ui/appui-abstract/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/appui-abstract", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js UI abstractions", "main": "lib/cjs/appui-abstract.js", "module": "lib/esm/appui-abstract.js", @@ -36,7 +36,7 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.136" + "@itwin/core-bentley": "workspace:^3.0.0-dev.137" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/ui/appui-layout-react/package.json b/ui/appui-layout-react/package.json index 92a4278a4128..ce274dfe9d9a 100644 --- a/ui/appui-layout-react/package.json +++ b/ui/appui-layout-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/appui-layout-react", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js Nine-zone React UI components", "main": "lib/cjs/appui-layout-react.js", "module": "lib/esm/appui-layout-react.js", @@ -37,9 +37,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-react": "workspace:^3.0.0-dev.136", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-react": "workspace:^3.0.0-dev.137", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/ui/appui-react/package.json b/ui/appui-react/package.json index 9d7f83813a51..9f5b03fc552e 100644 --- a/ui/appui-react/package.json +++ b/ui/appui-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/appui-react", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "UI framework", "main": "lib/cjs/appui-react.js", "module": "lib/esm/appui-react.js", @@ -41,20 +41,20 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.136", - "@itwin/appui-abstract": "workspace:^3.0.0-dev.136", - "@itwin/appui-layout-react": "workspace:^3.0.0-dev.136", - "@itwin/components-react": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/core-markup": "workspace:^3.0.0-dev.136", - "@itwin/core-quantity": "workspace:^3.0.0-dev.136", - "@itwin/core-react": "workspace:^3.0.0-dev.136", - "@itwin/imodel-components-react": "workspace:^3.0.0-dev.136", - "@itwin/presentation-common": "workspace:^3.0.0-dev.136", - "@itwin/presentation-frontend": "workspace:^3.0.0-dev.136", + "@bentley/itwin-client": "workspace:^3.0.0-dev.137", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", + "@itwin/appui-layout-react": "workspace:^3.0.0-dev.137", + "@itwin/components-react": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/core-markup": "workspace:^3.0.0-dev.137", + "@itwin/core-quantity": "workspace:^3.0.0-dev.137", + "@itwin/core-react": "workspace:^3.0.0-dev.137", + "@itwin/imodel-components-react": "workspace:^3.0.0-dev.137", + "@itwin/presentation-common": "workspace:^3.0.0-dev.137", + "@itwin/presentation-frontend": "workspace:^3.0.0-dev.137", "react": "^17.0.0", "react-dom": "^17.0.0", "react-redux": "^7.2.2", diff --git a/ui/components-react/package.json b/ui/components-react/package.json index 279ae2e5672b..b60e7b4c1dd1 100644 --- a/ui/components-react/package.json +++ b/ui/components-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/components-react", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js UI complex components", "main": "lib/cjs/components-react.js", "module": "lib/esm/components-react.js", @@ -38,9 +38,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-react": "workspace:^3.0.0-dev.136", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-react": "workspace:^3.0.0-dev.137", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/ui/core-react/package.json b/ui/core-react/package.json index fd4a993421fa..8c518efebf04 100644 --- a/ui/core-react/package.json +++ b/ui/core-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-react", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iModel.js UI core components", "main": "lib/cjs/core-react.js", "module": "lib/esm/core-react.js", @@ -40,8 +40,8 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/ui/imodel-components-react/package.json b/ui/imodel-components-react/package.json index 8b79868b8eaf..ab786ab06900 100644 --- a/ui/imodel-components-react/package.json +++ b/ui/imodel-components-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/imodel-components-react", - "version": "3.0.0-dev.136", + "version": "3.0.0-dev.137", "description": "iTwin.js UI IModel Components", "main": "lib/cjs/imodel-components-react.js", "module": "lib/esm/imodel-components-react.js", @@ -38,14 +38,14 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.136", - "@itwin/components-react": "workspace:^3.0.0-dev.136", - "@itwin/core-bentley": "workspace:^3.0.0-dev.136", - "@itwin/core-common": "workspace:^3.0.0-dev.136", - "@itwin/core-frontend": "workspace:^3.0.0-dev.136", - "@itwin/core-geometry": "workspace:^3.0.0-dev.136", - "@itwin/core-quantity": "workspace:^3.0.0-dev.136", - "@itwin/core-react": "workspace:^3.0.0-dev.136", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", + "@itwin/components-react": "workspace:^3.0.0-dev.137", + "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/core-common": "workspace:^3.0.0-dev.137", + "@itwin/core-frontend": "workspace:^3.0.0-dev.137", + "@itwin/core-geometry": "workspace:^3.0.0-dev.137", + "@itwin/core-quantity": "workspace:^3.0.0-dev.137", + "@itwin/core-react": "workspace:^3.0.0-dev.137", "react": "^17.0.0", "react-dom": "^17.0.0" }, From a4d5c7982ffa33c84e30b0e3e6c3ee1b638d46c6 Mon Sep 17 00:00:00 2001 From: MarcBedard8 <31048177+MarcBedard8@users.noreply.github.com> Date: Wed, 1 Dec 2021 09:16:47 -0500 Subject: [PATCH 004/395] Add Support for APIM RDS url to create RealityDataSourceKey from tilesetUrl (#2810) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- ...RealityDataSourceKey_2021-11-30-21-15.json | 10 ++++++++++ .../src/test/RealityDataSouce.test.ts | 16 ++++++++++++++++ .../frontend/src/tile/ContextShareProvider.ts | 19 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 common/changes/@itwin/core-frontend/marcb-apim-support-RealityDataSourceKey_2021-11-30-21-15.json diff --git a/common/changes/@itwin/core-frontend/marcb-apim-support-RealityDataSourceKey_2021-11-30-21-15.json b/common/changes/@itwin/core-frontend/marcb-apim-support-RealityDataSourceKey_2021-11-30-21-15.json new file mode 100644 index 000000000000..0565619eb3e5 --- /dev/null +++ b/common/changes/@itwin/core-frontend/marcb-apim-support-RealityDataSourceKey_2021-11-30-21-15.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-frontend", + "comment": "Add Support for APIM RDS url to create RealityDataSourceKey from tilesetUrl", + "type": "none" + } + ], + "packageName": "@itwin/core-frontend" +} \ No newline at end of file diff --git a/core/frontend/src/test/RealityDataSouce.test.ts b/core/frontend/src/test/RealityDataSouce.test.ts index 582dab833b73..a11d162d40a1 100644 --- a/core/frontend/src/test/RealityDataSouce.test.ts +++ b/core/frontend/src/test/RealityDataSouce.test.ts @@ -48,6 +48,22 @@ describe("RealityDataSource", () => { expect(rdSourceKey.id).to.be.equal("994fc408-401f-4ee1-91f0-3d7bfba50136"); expect(rdSourceKey.iTwinId).to.equal("00000000-0000-0000-0000-000000000000"); }); + it("should handle creation from Context Share url using apim in QA (qa-api.bentley.com)", () => { + const tilesetUrl = "https://qa-api.bentley.com/realitydata/c9fddf2c-e519-468b-b6fa-6d0e39f198a7?projectId=a57f6b1c-747d-4253-b0ce-9900c4dd7c1c"; + const rdSourceKey = RealityDataSource.createKeyFromUrl(tilesetUrl); + expect(rdSourceKey.provider).to.equal(RealityDataProvider.ContextShare); + expect(rdSourceKey.format).to.equal(RealityDataFormat.ThreeDTile); + expect(rdSourceKey.id).to.be.equal("c9fddf2c-e519-468b-b6fa-6d0e39f198a7"); + expect(rdSourceKey.iTwinId).to.equal("a57f6b1c-747d-4253-b0ce-9900c4dd7c1c"); + }); + it("should handle creation from Context Share url using apim in PROD (api.bentley.com)", () => { + const tilesetUrl = "https://api.bentley.com/realitydata/c9fddf2c-e519-468b-b6fa-6d0e39f198a7?projectId=a57f6b1c-747d-4253-b0ce-9900c4dd7c1c"; + const rdSourceKey = RealityDataSource.createKeyFromUrl(tilesetUrl); + expect(rdSourceKey.provider).to.equal(RealityDataProvider.ContextShare); + expect(rdSourceKey.format).to.equal(RealityDataFormat.ThreeDTile); + expect(rdSourceKey.id).to.be.equal("c9fddf2c-e519-468b-b6fa-6d0e39f198a7"); + expect(rdSourceKey.iTwinId).to.equal("a57f6b1c-747d-4253-b0ce-9900c4dd7c1c"); + }); it("should handle creation from url to an .opc file on an azure blob", () => { const tilesetUrl = "https://realityblobqaeussa01.blob.core.windows.net/fe8d32a5-f6ab-4157-b3ec-a9b53db923e3/Tuxford.opc?sv=2020-08-04&se=2021-08-26T05%3A11%3A31Z&sr=c&sp=rl&sig=J9wGT1f3nyKePPj%2FI%2BJdx086GylEfM0P4ZXBQL%2FaRD4%3D"; const rdSourceKey = RealityDataSource.createKeyFromBlobUrl(tilesetUrl); diff --git a/core/frontend/src/tile/ContextShareProvider.ts b/core/frontend/src/tile/ContextShareProvider.ts index 7e9aa2b6241b..bac7bf55f1d6 100644 --- a/core/frontend/src/tile/ContextShareProvider.ts +++ b/core/frontend/src/tile/ContextShareProvider.ts @@ -21,6 +21,9 @@ export class ContextShareProvider { // Not a valid URL for Context share return false; } + // If api.bentley.com/realitydata is used, it is context share + if (tilesetUrl.toLowerCase().includes("api.bentley.com/realitydata")) + return true; // detect if it is a RDS url const formattedUrl1 = attUrl.pathname.replace(/~2F/g, "/").replace(/\\/g, "/"); if (formattedUrl1) { @@ -48,6 +51,22 @@ export class ContextShareProvider { // Not a valid URL and not equal, probably $cesiumAsset return invalidUrlInfo; } + // If api.bentley.com/realitydata is used, it is context share + if (tilesetUrl.toLowerCase().includes("api.bentley.com/realitydata")) { + const lcTilesetUrl = tilesetUrl.toLowerCase(); + // NOTICE: We assume it is a ThreeDTile BUT this could technically be a point cloud (OPC). + // This method was used in typical workflow where format was always ThreeDTile and is here for legacy support. + // We don't want to make a call to RDS to resolve format since this method must not be async (it is used in workflow that are not async) + const format = RealityDataFormat.ThreeDTile; + const indexId = lcTilesetUrl.indexOf("realitydata/") + 12; // lenght of "realitydata/" = 12; + const id = lcTilesetUrl.substr(indexId, Guid.empty.length); + const indexProjectId = lcTilesetUrl.indexOf("projectid=") + 10; // lenght of "projectid=" = 10; + let projectId: string | undefined; + if (indexProjectId && indexProjectId > 0) + projectId = lcTilesetUrl.substr(indexProjectId, Guid.empty.length); + const apimContextShareKey = { provider: RealityDataProvider.ContextShare, format, id, iTwinId: projectId }; + return apimContextShareKey; + } // detect if it is a RDS url const formattedUrl1 = attUrl.pathname.replace(/~2F/g, "/").replace(/\\/g, "/"); if (formattedUrl1) { From e1f4ae458479cca137f4236f676ecc2c60acba73 Mon Sep 17 00:00:00 2001 From: Bill Steinbock <65047615+bsteinbk@users.noreply.github.com> Date: Wed, 1 Dec 2021 22:35:24 -0500 Subject: [PATCH 005/395] Provide an explicit method for IModelApp to call to initialize/load UI state (#2812) * Add requested ability to hide stage entry in backstage if only one stage is available. * Add initializeStateFromUserSettingsProviders to initialize UI state. * rush change --- common/api/appui-react.api.md | 1 + ...UserSettingProviders_2021-12-01-22-01.json | 10 ++++++++ test-apps/ui-test-app/src/frontend/index.tsx | 3 +++ ui/appui-react/src/appui-react/UiFramework.ts | 23 +++++++++++-------- 4 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 common/changes/@itwin/appui-react/ui-fixInitUserSettingProviders_2021-12-01-22-01.json diff --git a/common/api/appui-react.api.md b/common/api/appui-react.api.md index 77f5be8d7e32..c3ef7d0544ed 100644 --- a/common/api/appui-react.api.md +++ b/common/api/appui-react.api.md @@ -6557,6 +6557,7 @@ export class UiFramework { static get initialized(): boolean; // @internal static initializeEx(store: Store | undefined, frameworkStateKey?: string): Promise; + static initializeStateFromUserSettingsProviders(immediateSync?: boolean): Promise; // @alpha static get isContextMenuOpen(): boolean; // (undocumented) diff --git a/common/changes/@itwin/appui-react/ui-fixInitUserSettingProviders_2021-12-01-22-01.json b/common/changes/@itwin/appui-react/ui-fixInitUserSettingProviders_2021-12-01-22-01.json new file mode 100644 index 000000000000..df7ecd2a1bd0 --- /dev/null +++ b/common/changes/@itwin/appui-react/ui-fixInitUserSettingProviders_2021-12-01-22-01.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/appui-react", + "comment": "Add initializeStateFromUserSettingsProviders to initialize UI state.", + "type": "none" + } + ], + "packageName": "@itwin/appui-react" +} \ No newline at end of file diff --git a/test-apps/ui-test-app/src/frontend/index.tsx b/test-apps/ui-test-app/src/frontend/index.tsx index 13ce9a55f826..7fde9578d73f 100644 --- a/test-apps/ui-test-app/src/frontend/index.tsx +++ b/test-apps/ui-test-app/src/frontend/index.tsx @@ -323,6 +323,9 @@ export class SampleAppIModelApp { UiFramework.useDefaultPopoutUrl = true; + // initialize state from all registered UserSettingsProviders + await UiFramework.initializeStateFromUserSettingsProviders(); + // try starting up event loop if not yet started so key-in palette can be opened IModelApp.startEventLoop(); } diff --git a/ui/appui-react/src/appui-react/UiFramework.ts b/ui/appui-react/src/appui-react/UiFramework.ts index c144af27b107..e81582dc4539 100644 --- a/ui/appui-react/src/appui-react/UiFramework.ts +++ b/ui/appui-react/src/appui-react/UiFramework.ts @@ -392,17 +392,14 @@ export class UiFramework { return UiFramework.frameworkState ? UiFramework.frameworkState.sessionState.iModelConnection : /* istanbul ignore next */ undefined; } - /** @public */ - public static async setUiStateStorage(storage: UiStateStorage, immediateSync = false) { - if (UiFramework._uiStateStorage === storage) - return; - - UiFramework._uiStateStorage = storage; - + /** Called by iModelApp to initialize saved UI state from registered UseSettingsProviders + * @public + */ + public static async initializeStateFromUserSettingsProviders(immediateSync = false) { // let any registered providers to load values from the new storage location const providerKeys = [...this._uiSettingsProviderRegistry.keys()]; for await (const key of providerKeys) { - await this._uiSettingsProviderRegistry.get(key)!.loadUserSettings(storage); + await this._uiSettingsProviderRegistry.get(key)!.loadUserSettings(UiFramework._uiStateStorage); } // istanbul ignore next @@ -412,6 +409,15 @@ export class UiFramework { SyncUiEventDispatcher.dispatchSyncUiEvent(SyncUiEventId.UiStateStorageChanged); } + /** @public */ + public static async setUiStateStorage(storage: UiStateStorage, immediateSync = false) { + if (UiFramework._uiStateStorage === storage) + return; + + UiFramework._uiStateStorage = storage; + await this.initializeStateFromUserSettingsProviders(immediateSync); + } + /** The UI Settings Storage is a convenient wrapper around Local Storage to assist in caching state information across user sessions. * It was previously used to conflate both the state information across session and the information driven directly from user explicit action, * which are now handled with user preferences. @@ -556,5 +562,4 @@ export class UiFramework { const contextMenu = document.querySelector("div.core-context-menu-opened"); return contextMenu !== null && contextMenu !== undefined; } - } From 3ca9f744cd0b8f23abb7449c9b3da81af1b05950 Mon Sep 17 00:00:00 2001 From: imodeljs-admin <38288322+imodeljs-admin@users.noreply.github.com> Date: Thu, 2 Dec 2021 05:01:54 +0000 Subject: [PATCH 006/395] 3.0.0-dev.138 --- clients/imodelhub/package.json | 6 ++-- clients/itwin/package.json | 4 +-- clients/reality-data/package.json | 10 +++---- common/config/rush/version-policies.json | 2 +- core/backend/package.json | 12 ++++---- core/bentley/package.json | 2 +- core/common/package.json | 6 ++-- core/ecschema-editing/package.json | 6 ++-- core/ecschema-locaters/package.json | 4 +-- core/ecschema-metadata/package.json | 4 +-- core/ecschema-rpc/common/package.json | 2 +- core/ecschema-rpc/impl/package.json | 2 +- core/electron/package.json | 12 ++++---- core/express-server/package.json | 2 +- core/frontend-devtools/package.json | 2 +- core/frontend/package.json | 18 +++++------ core/geometry/package.json | 2 +- core/hypermodeling/package.json | 10 +++---- core/i18n/package.json | 4 +-- core/markup/package.json | 10 +++---- core/mobile/package.json | 14 ++++----- core/orbitgt/package.json | 2 +- core/quantity/package.json | 4 +-- core/telemetry/package.json | 2 +- core/transformer/package.json | 14 ++++----- core/webgl-compatibility/package.json | 2 +- domains/analytical/backend/package.json | 8 ++--- .../linear-referencing/backend/package.json | 10 +++---- .../linear-referencing/common/package.json | 6 ++-- .../physical-material/backend/package.json | 8 ++--- editor/backend/package.json | 10 +++---- editor/common/package.json | 8 ++--- editor/frontend/package.json | 6 ++-- extensions/geonames/package.json | 2 +- extensions/map-layers/package.json | 2 +- .../ecschema-rpc-interface/package.json | 2 +- .../imodelhub-client/package.json | 2 +- full-stack-tests/rpc-interface/package.json | 2 +- presentation/backend/package.json | 12 ++++---- presentation/common/package.json | 8 ++--- presentation/components/package.json | 20 ++++++------- presentation/frontend/package.json | 12 ++++---- presentation/testing/package.json | 2 +- tools/backend-webpack/package.json | 2 +- tools/build/package.json | 2 +- tools/certa/package.json | 2 +- tools/ecschema2ts/package.json | 2 +- tools/eslint-plugin/package.json | 2 +- tools/perf-tools/package.json | 2 +- tools/webpack-core/package.json | 2 +- ui/appui-abstract/package.json | 4 +-- ui/appui-layout-react/package.json | 8 ++--- ui/appui-react/package.json | 30 +++++++++---------- ui/components-react/package.json | 8 ++--- ui/core-react/package.json | 6 ++-- ui/imodel-components-react/package.json | 18 +++++------ 56 files changed, 183 insertions(+), 183 deletions(-) diff --git a/clients/imodelhub/package.json b/clients/imodelhub/package.json index 440226f79523..f2a290222f91 100644 --- a/clients/imodelhub/package.json +++ b/clients/imodelhub/package.json @@ -1,6 +1,6 @@ { "name": "@bentley/imodelhub-client", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js iModelHub Client", "main": "lib/cjs/imodelhub-client.js", "modules": "lib/esm/imodelhub-client.js", @@ -45,8 +45,8 @@ "semver": "^5.5.0" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137" + "@bentley/itwin-client": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@bentley/itwin-client": "workspace:*", diff --git a/clients/itwin/package.json b/clients/itwin/package.json index 550644d5e3dd..29752d92b6aa 100644 --- a/clients/itwin/package.json +++ b/clients/itwin/package.json @@ -1,6 +1,6 @@ { "name": "@bentley/itwin-client", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Base client package for iTwin applications", "main": "lib/cjs/itwin-client.js", "module": "lib/esm/itwin-client.js", @@ -32,7 +32,7 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/clients/reality-data/package.json b/clients/reality-data/package.json index 42c4181765b0..7963b47de7fc 100644 --- a/clients/reality-data/package.json +++ b/clients/reality-data/package.json @@ -1,6 +1,6 @@ { "name": "@bentley/reality-data-client", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js Reality Data Client", "main": "lib/cjs/reality-data-client.js", "module": "lib/esm/reality-data-client.js", @@ -43,10 +43,10 @@ "lodash": "^4.17.10" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137" + "@bentley/itwin-client": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 1116ac453a4b..1d4c67c5f24f 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -2,7 +2,7 @@ { "policyName": "prerelease-monorepo-lockStep", "definitionName": "lockStepVersion", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "nextBump": "prerelease" } ] diff --git a/core/backend/package.json b/core/backend/package.json index baaf47d957dc..ca5caef6e70f 100644 --- a/core/backend/package.json +++ b/core/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-backend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js backend components", "main": "lib/cjs/core-backend.js", "typings": "lib/cjs/core-backend", @@ -38,11 +38,11 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137", - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" + "@bentley/itwin-client": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138", + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/bentley/package.json b/core/bentley/package.json index 9b5b9a5dd83e..c68561de2e73 100644 --- a/core/bentley/package.json +++ b/core/bentley/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-bentley", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Bentley JavaScript core components", "main": "lib/cjs/core-bentley.js", "module": "lib/esm/core-bentley.js", diff --git a/core/common/package.json b/core/common/package.json index b0b945e860f7..4bb24fb9e13a 100644 --- a/core/common/package.json +++ b/core/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-common", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js components common to frontend and backend", "main": "lib/cjs/core-common.js", "module": "lib/esm/core-common.js", @@ -41,8 +41,8 @@ "js-base64": "^3.6.1" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/core/ecschema-editing/package.json b/core/ecschema-editing/package.json index 0f0721541973..3498dfbc0bc6 100644 --- a/core/ecschema-editing/package.json +++ b/core/ecschema-editing/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-editing", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "ECSchema editing and validation API", "license": "MIT", "main": "lib/cjs/ecschema-editing.js", @@ -59,8 +59,8 @@ "typescript": "~4.4.0" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.138" }, "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc" diff --git a/core/ecschema-locaters/package.json b/core/ecschema-locaters/package.json index 177ad7dc1c5b..0fb54042e4cc 100644 --- a/core/ecschema-locaters/package.json +++ b/core/ecschema-locaters/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-locaters", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "EC Schema file locaters", "license": "MIT", "main": "lib/cjs/ecschema-locaters.js", @@ -56,7 +56,7 @@ "glob": "^7.1.2" }, "peerDependencies": { - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.138" }, "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc", diff --git a/core/ecschema-metadata/package.json b/core/ecschema-metadata/package.json index 0c01de7e3ac6..f5d8437eb1e4 100644 --- a/core/ecschema-metadata/package.json +++ b/core/ecschema-metadata/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-metadata", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "ECObjects core concepts in typescript", "license": "MIT", "main": "lib/cjs/ecschema-metadata.js", @@ -58,7 +58,7 @@ "typescript": "~4.4.0" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138" }, "dependencies": { "almost-equal": "^1.1.0" diff --git a/core/ecschema-rpc/common/package.json b/core/ecschema-rpc/common/package.json index 26cf8095e362..99021e4da982 100644 --- a/core/ecschema-rpc/common/package.json +++ b/core/ecschema-rpc/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-rpcinterface-common", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Schema RPC Interface common interface", "main": "lib/cjs/ecschema-rpc-interface.js", "typings": "lib/cjs/ecschema-rpc-interface", diff --git a/core/ecschema-rpc/impl/package.json b/core/ecschema-rpc/impl/package.json index f9a7d7599ba6..300368673780 100644 --- a/core/ecschema-rpc/impl/package.json +++ b/core/ecschema-rpc/impl/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-rpcinterface-impl", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Schema RPC Interface backend implementation", "main": "lib/cjs/ecschema-rpc-impl.js", "typings": "lib/cjs/ecschema-rpc-impl", diff --git a/core/electron/package.json b/core/electron/package.json index 535fb4925d4a..93101d2ce41f 100644 --- a/core/electron/package.json +++ b/core/electron/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-electron", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js ElectronHost and ElectronApp", "license": "MIT", "engines": { @@ -31,11 +31,11 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/presentation-common": "workspace:^3.0.0-dev.137", + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/presentation-common": "workspace:^3.0.0-dev.138", "electron": "^14.0.0" }, "devDependencies": { diff --git a/core/express-server/package.json b/core/express-server/package.json index 44a84b4d6a9a..40107cb34bd0 100644 --- a/core/express-server/package.json +++ b/core/express-server/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/express-server", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js express utilities", "main": "lib/cjs/ExpressServer.js", "typings": "lib/cjs/ExpressServer", diff --git a/core/frontend-devtools/package.json b/core/frontend-devtools/package.json index 525199bfd578..b0a7b74d07f0 100644 --- a/core/frontend-devtools/package.json +++ b/core/frontend-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/frontend-devtools", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Debug menu and supporting UI widgets", "main": "lib/cjs/frontend-devtools.js", "module": "lib/esm/frontend-devtools.js", diff --git a/core/frontend/package.json b/core/frontend/package.json index 1808fec07371..397d127a573c 100644 --- a/core/frontend/package.json +++ b/core/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-frontend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js frontend components", "main": "lib/cjs/core-frontend.js", "module": "lib/esm/core-frontend.js", @@ -39,14 +39,14 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.137", - "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137", - "@itwin/core-orbitgt": "workspace:^3.0.0-dev.137", - "@itwin/core-quantity": "workspace:^3.0.0-dev.137", - "@itwin/webgl-compatibility": "workspace:^3.0.0-dev.137" + "@bentley/itwin-client": "workspace:^3.0.0-dev.138", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138", + "@itwin/core-orbitgt": "workspace:^3.0.0-dev.138", + "@itwin/core-quantity": "workspace:^3.0.0-dev.138", + "@itwin/webgl-compatibility": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/geometry/package.json b/core/geometry/package.json index 477444312416..66da30d7d378 100644 --- a/core/geometry/package.json +++ b/core/geometry/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-geometry", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js Core Geometry library", "main": "lib/cjs/core-geometry.js", "module": "lib/esm/core-geometry.js", diff --git a/core/hypermodeling/package.json b/core/hypermodeling/package.json index f34a9ba225b6..b5d6df3d786a 100644 --- a/core/hypermodeling/package.json +++ b/core/hypermodeling/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/hypermodeling-frontend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js hypermodeling package", "main": "lib/cjs/hypermodeling-frontend.js", "module": "lib/esm/hypermodeling-frontend.js", @@ -38,10 +38,10 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/core/i18n/package.json b/core/i18n/package.json index 06ee07ce0b87..efccddbde536 100644 --- a/core/i18n/package.json +++ b/core/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-i18n", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js localization code", "main": "lib/cjs/core-i18n.js", "module": "lib/esm/core-i18n.js", @@ -33,7 +33,7 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/markup/package.json b/core/markup/package.json index 6f3f959bfa7c..15800a1065a2 100644 --- a/core/markup/package.json +++ b/core/markup/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-markup", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js markup package", "main": "lib/cjs/core-markup.js", "module": "lib/esm/core-markup.js", @@ -43,10 +43,10 @@ "@svgdotjs/svg.js": "3.0.13" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/core/mobile/package.json b/core/mobile/package.json index f2d88df9f2cd..1cad5b142d32 100644 --- a/core/mobile/package.json +++ b/core/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-mobile", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js MobileHost and MobileApp", "license": "MIT", "engines": { @@ -32,12 +32,12 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.137", - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/presentation-common": "workspace:^3.0.0-dev.137", + "@bentley/itwin-client": "workspace:^3.0.0-dev.138", + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/presentation-common": "workspace:^3.0.0-dev.138", "js-base64": "^3.6.1", "ws": "^7.5.3" }, diff --git a/core/orbitgt/package.json b/core/orbitgt/package.json index 6068d3f3fa6f..96665b390345 100644 --- a/core/orbitgt/package.json +++ b/core/orbitgt/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-orbitgt", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "", "main": "lib/cjs/core-orbitgt.js", "module": "lib/esm/core-orbitgt.js", diff --git a/core/quantity/package.json b/core/quantity/package.json index 78a51564c85e..1bc051bad193 100644 --- a/core/quantity/package.json +++ b/core/quantity/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-quantity", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Quantity parsing, formatting and conversions for iModel.js", "main": "lib/cjs/core-quantity.js", "module": "lib/esm/core-quantity.js", @@ -53,7 +53,7 @@ "typescript": "~4.4.0" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138" }, "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc" diff --git a/core/telemetry/package.json b/core/telemetry/package.json index fa816ecae758..dab1faca202b 100644 --- a/core/telemetry/package.json +++ b/core/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-telemetry", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js Telemetry Client", "main": "lib/cjs/core-telemetry.js", "module": "lib/esm/core-telemetry.js", diff --git a/core/transformer/package.json b/core/transformer/package.json index a3ab73dbb5b9..243eae0f155b 100644 --- a/core/transformer/package.json +++ b/core/transformer/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-transformer", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "API for exporting an iModel's parts and also importing them into another iModel", "main": "lib/cjs/core-transformer.js", "typings": "lib/cjs/core-transformer", @@ -37,12 +37,12 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.137", - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137", - "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.137" + "@bentley/itwin-client": "workspace:^3.0.0-dev.138", + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138", + "@itwin/ecschema-metadata": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/core/webgl-compatibility/package.json b/core/webgl-compatibility/package.json index cc66f7ef4e65..2e73579dee5d 100644 --- a/core/webgl-compatibility/package.json +++ b/core/webgl-compatibility/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/webgl-compatibility", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "APIs for determining the level of compatibility of a browser+device with the iModel.js rendering system.", "license": "MIT", "main": "lib/cjs/webgl-compatibility.js", diff --git a/domains/analytical/backend/package.json b/domains/analytical/backend/package.json index 1af9b0c9b6b8..2cce08d8ade6 100644 --- a/domains/analytical/backend/package.json +++ b/domains/analytical/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/analytical-backend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "main": "lib/cjs/analytical-backend.js", "typings": "lib/cjs/analytical-backend", "license": "MIT", @@ -32,9 +32,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137" + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/domains/linear-referencing/backend/package.json b/domains/linear-referencing/backend/package.json index 066a8a68f0fe..92d33aa631bb 100644 --- a/domains/linear-referencing/backend/package.json +++ b/domains/linear-referencing/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/linear-referencing-backend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "main": "lib/cjs/linear-referencing-backend.js", "typings": "lib/cjs/linear-referencing-backend", "license": "MIT", @@ -32,10 +32,10 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/linear-referencing-common": "workspace:^3.0.0-dev.137" + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/linear-referencing-common": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/domains/linear-referencing/common/package.json b/domains/linear-referencing/common/package.json index 920f0ef8f0c4..1afbc7192def 100644 --- a/domains/linear-referencing/common/package.json +++ b/domains/linear-referencing/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/linear-referencing-common", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "main": "lib/cjs/linear-referencing-common.js", "typings": "lib/cjs/linear-referencing-common", "license": "MIT", @@ -32,8 +32,8 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/domains/physical-material/backend/package.json b/domains/physical-material/backend/package.json index 9996d9444afa..39e2e0d02c74 100644 --- a/domains/physical-material/backend/package.json +++ b/domains/physical-material/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/physical-material-backend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "main": "lib/cjs/physical-material-backend.js", "typings": "lib/cjs/physical-material-backend", "license": "MIT", @@ -32,9 +32,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137" + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/editor/backend/package.json b/editor/backend/package.json index 4999c91cf191..3b4fad198536 100644 --- a/editor/backend/package.json +++ b/editor/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/editor-backend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js editor backend", "main": "lib/cjs/editor-backend.js", "typings": "lib/cjs/editor-backend", @@ -35,10 +35,10 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137" + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/editor/common/package.json b/editor/common/package.json index bda19bf56f05..4a54a7ce2b05 100644 --- a/editor/common/package.json +++ b/editor/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/editor-common", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js editing properties common to frontend and backend", "main": "lib/cjs/editor-common.js", "module": "lib/esm/editor-common.js", @@ -35,9 +35,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@itwin/core-bentley": "workspace:*", diff --git a/editor/frontend/package.json b/editor/frontend/package.json index f19729289481..83b774d4f1a2 100644 --- a/editor/frontend/package.json +++ b/editor/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/editor-frontend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js frontend components", "main": "lib/cjs/editor-frontend.js", "module": "lib/esm/editor-frontend.js", @@ -37,8 +37,8 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/extensions/geonames/package.json b/extensions/geonames/package.json index 5b9fc62bd228..ad966d147582 100644 --- a/extensions/geonames/package.json +++ b/extensions/geonames/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/geonames-extension", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Geolocation Extension", "main": "index.js", "license": "MIT", diff --git a/extensions/map-layers/package.json b/extensions/map-layers/package.json index 3b5384c1680b..bf6420b0e97f 100644 --- a/extensions/map-layers/package.json +++ b/extensions/map-layers/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/map-layers", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Extension that adds a Map Layers Widget", "main": "lib/cjs/map-layers.js", "module": "lib/esm/map-layers.js", diff --git a/full-stack-tests/ecschema-rpc-interface/package.json b/full-stack-tests/ecschema-rpc-interface/package.json index cf4c6fd04fb7..a3abd655cfc8 100644 --- a/full-stack-tests/ecschema-rpc-interface/package.json +++ b/full-stack-tests/ecschema-rpc-interface/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/ecschema-rpcinterface-tests", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Integration tests for the Schema RPC Interface", "author": { "name": "Bentley Systems, Inc.", diff --git a/full-stack-tests/imodelhub-client/package.json b/full-stack-tests/imodelhub-client/package.json index 7bdd6ecebcd3..6bfada184b33 100644 --- a/full-stack-tests/imodelhub-client/package.json +++ b/full-stack-tests/imodelhub-client/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/imodelhub-client-tests", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "main": "lib/imodelhub-client-tests.js", "description": "Tests the iModelHub client", "license": "MIT", diff --git a/full-stack-tests/rpc-interface/package.json b/full-stack-tests/rpc-interface/package.json index 88e4046f043a..c40f64b10428 100644 --- a/full-stack-tests/rpc-interface/package.json +++ b/full-stack-tests/rpc-interface/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/rpcinterface-full-stack-tests", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Test the full iModel.js stack (frontend and backend) using standard RPC interfaces", "license": "MIT", "scripts": { diff --git a/presentation/backend/package.json b/presentation/backend/package.json index b992002d2dad..79c634835731 100644 --- a/presentation/backend/package.json +++ b/presentation/backend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-backend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Backend of iModel.js Presentation library", "license": "MIT", "repository": { @@ -38,11 +38,11 @@ "test:watch": "npm -s test -- --reporter min --watch-extensions ts --watch" }, "peerDependencies": { - "@itwin/core-backend": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-quantity": "workspace:^3.0.0-dev.137", - "@itwin/presentation-common": "workspace:^3.0.0-dev.137" + "@itwin/core-backend": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-quantity": "workspace:^3.0.0-dev.138", + "@itwin/presentation-common": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/presentation/common/package.json b/presentation/common/package.json index 4d3b2c3cf223..79f28ed510ae 100644 --- a/presentation/common/package.json +++ b/presentation/common/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-common", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Common pieces for iModel.js presentation packages", "imodeljsSharedLibrary": true, "license": "MIT", @@ -47,9 +47,9 @@ "test:watch": "npm -s test -- --reporter min --watch-extensions ts --watch" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-quantity": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-quantity": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@itwin/build-tools": "workspace:*", diff --git a/presentation/components/package.json b/presentation/components/package.json index 01239ed0a8f9..f437af42491b 100644 --- a/presentation/components/package.json +++ b/presentation/components/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-components", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "React components based on iModel.js Presentation library", "main": "lib/cjs/presentation-components.js", "module": "lib/esm/presentation-components.js", @@ -52,15 +52,15 @@ "rxjs": "^6.6.2" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", - "@itwin/components-react": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/core-react": "workspace:^3.0.0-dev.137", - "@itwin/imodel-components-react": "workspace:^3.0.0-dev.137", - "@itwin/presentation-common": "workspace:^3.0.0-dev.137", - "@itwin/presentation-frontend": "workspace:^3.0.0-dev.137", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.138", + "@itwin/components-react": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/core-react": "workspace:^3.0.0-dev.138", + "@itwin/imodel-components-react": "workspace:^3.0.0-dev.138", + "@itwin/presentation-common": "workspace:^3.0.0-dev.138", + "@itwin/presentation-frontend": "workspace:^3.0.0-dev.138", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/presentation/frontend/package.json b/presentation/frontend/package.json index 94dd943894b3..095c4b8332a7 100644 --- a/presentation/frontend/package.json +++ b/presentation/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-frontend", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Frontend of iModel.js Presentation library", "main": "lib/cjs/presentation-frontend.js", "module": "lib/esm/presentation-frontend.js", @@ -42,11 +42,11 @@ "test:watch": "npm -s test -- --reporter min --watch-extensions ts --watch" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/core-quantity": "workspace:^3.0.0-dev.137", - "@itwin/presentation-common": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/core-quantity": "workspace:^3.0.0-dev.138", + "@itwin/presentation-common": "workspace:^3.0.0-dev.138" }, "devDependencies": { "@bentley/itwin-client": "workspace:*", diff --git a/presentation/testing/package.json b/presentation/testing/package.json index 6e8e1bdf92bd..783890a3fb82 100644 --- a/presentation/testing/package.json +++ b/presentation/testing/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/presentation-testing", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "", "license": "MIT", "repository": { diff --git a/tools/backend-webpack/package.json b/tools/backend-webpack/package.json index b683dbe55db8..13e01597972e 100644 --- a/tools/backend-webpack/package.json +++ b/tools/backend-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/backend-webpack-tools", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Configuration and scripts for iModel.js agents and backends.", "license": "MIT", "repository": { diff --git a/tools/build/package.json b/tools/build/package.json index fa6c813f165e..ba5a4bc95c38 100644 --- a/tools/build/package.json +++ b/tools/build/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/build-tools", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Bentley build tools", "license": "MIT", "repository": { diff --git a/tools/certa/package.json b/tools/certa/package.json index 71c37fa24139..65cd87b8f23c 100644 --- a/tools/certa/package.json +++ b/tools/certa/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/certa", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "A mocha-based integration test runner", "license": "MIT", "main": "bin/certa.js", diff --git a/tools/ecschema2ts/package.json b/tools/ecschema2ts/package.json index 3c5389955a14..25c297dffaa0 100644 --- a/tools/ecschema2ts/package.json +++ b/tools/ecschema2ts/package.json @@ -2,7 +2,7 @@ "name": "@itwin/ecschema2ts", "description": "Command line tools that takes an ECSchema xml file and outputs a typescript module", "license": "MIT", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "bin": { "ecschema2ts": "./bin/index.js" }, diff --git a/tools/eslint-plugin/package.json b/tools/eslint-plugin/package.json index 1cf6d99c8eb8..e5a1c2f4a320 100644 --- a/tools/eslint-plugin/package.json +++ b/tools/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/eslint-plugin", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "ESLint plugin with default configuration and custom rules for iTwin.js projects", "license": "MIT", "keywords": [ diff --git a/tools/perf-tools/package.json b/tools/perf-tools/package.json index 21991a82e09b..0d26e9ec6e74 100644 --- a/tools/perf-tools/package.json +++ b/tools/perf-tools/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/perf-tools", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Tools for collecting and reporting performance data", "main": "lib/cjs/index.js", "typings": "lib/cjs/index", diff --git a/tools/webpack-core/package.json b/tools/webpack-core/package.json index 69740517048f..e27425e8e4d8 100644 --- a/tools/webpack-core/package.json +++ b/tools/webpack-core/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-webpack-tools", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "Set of Webpack Plugins and Loaders used for building iModel.js applications", "license": "MIT", "repository": { diff --git a/ui/appui-abstract/package.json b/ui/appui-abstract/package.json index f74cc1ac1f6b..7c05bc722104 100644 --- a/ui/appui-abstract/package.json +++ b/ui/appui-abstract/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/appui-abstract", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js UI abstractions", "main": "lib/cjs/appui-abstract.js", "module": "lib/esm/appui-abstract.js", @@ -36,7 +36,7 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/core-bentley": "workspace:^3.0.0-dev.137" + "@itwin/core-bentley": "workspace:^3.0.0-dev.138" }, "//devDependencies": [ "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install", diff --git a/ui/appui-layout-react/package.json b/ui/appui-layout-react/package.json index ce274dfe9d9a..1f8462576968 100644 --- a/ui/appui-layout-react/package.json +++ b/ui/appui-layout-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/appui-layout-react", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js Nine-zone React UI components", "main": "lib/cjs/appui-layout-react.js", "module": "lib/esm/appui-layout-react.js", @@ -37,9 +37,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-react": "workspace:^3.0.0-dev.137", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-react": "workspace:^3.0.0-dev.138", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/ui/appui-react/package.json b/ui/appui-react/package.json index 9f5b03fc552e..3f9d48cbcc15 100644 --- a/ui/appui-react/package.json +++ b/ui/appui-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/appui-react", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "UI framework", "main": "lib/cjs/appui-react.js", "module": "lib/esm/appui-react.js", @@ -41,20 +41,20 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@bentley/itwin-client": "workspace:^3.0.0-dev.137", - "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", - "@itwin/appui-layout-react": "workspace:^3.0.0-dev.137", - "@itwin/components-react": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/core-markup": "workspace:^3.0.0-dev.137", - "@itwin/core-quantity": "workspace:^3.0.0-dev.137", - "@itwin/core-react": "workspace:^3.0.0-dev.137", - "@itwin/imodel-components-react": "workspace:^3.0.0-dev.137", - "@itwin/presentation-common": "workspace:^3.0.0-dev.137", - "@itwin/presentation-frontend": "workspace:^3.0.0-dev.137", + "@bentley/itwin-client": "workspace:^3.0.0-dev.138", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.138", + "@itwin/appui-layout-react": "workspace:^3.0.0-dev.138", + "@itwin/components-react": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/core-markup": "workspace:^3.0.0-dev.138", + "@itwin/core-quantity": "workspace:^3.0.0-dev.138", + "@itwin/core-react": "workspace:^3.0.0-dev.138", + "@itwin/imodel-components-react": "workspace:^3.0.0-dev.138", + "@itwin/presentation-common": "workspace:^3.0.0-dev.138", + "@itwin/presentation-frontend": "workspace:^3.0.0-dev.138", "react": "^17.0.0", "react-dom": "^17.0.0", "react-redux": "^7.2.2", diff --git a/ui/components-react/package.json b/ui/components-react/package.json index b60e7b4c1dd1..153c2b7c8b88 100644 --- a/ui/components-react/package.json +++ b/ui/components-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/components-react", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js UI complex components", "main": "lib/cjs/components-react.js", "module": "lib/esm/components-react.js", @@ -38,9 +38,9 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-react": "workspace:^3.0.0-dev.137", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-react": "workspace:^3.0.0-dev.138", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/ui/core-react/package.json b/ui/core-react/package.json index 8c518efebf04..21aea9883153 100644 --- a/ui/core-react/package.json +++ b/ui/core-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/core-react", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iModel.js UI core components", "main": "lib/cjs/core-react.js", "module": "lib/esm/core-react.js", @@ -40,8 +40,8 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", "react": "^17.0.0", "react-dom": "^17.0.0" }, diff --git a/ui/imodel-components-react/package.json b/ui/imodel-components-react/package.json index ab786ab06900..edf0cf681bf8 100644 --- a/ui/imodel-components-react/package.json +++ b/ui/imodel-components-react/package.json @@ -1,6 +1,6 @@ { "name": "@itwin/imodel-components-react", - "version": "3.0.0-dev.137", + "version": "3.0.0-dev.138", "description": "iTwin.js UI IModel Components", "main": "lib/cjs/imodel-components-react.js", "module": "lib/esm/imodel-components-react.js", @@ -38,14 +38,14 @@ "url": "http://www.bentley.com" }, "peerDependencies": { - "@itwin/appui-abstract": "workspace:^3.0.0-dev.137", - "@itwin/components-react": "workspace:^3.0.0-dev.137", - "@itwin/core-bentley": "workspace:^3.0.0-dev.137", - "@itwin/core-common": "workspace:^3.0.0-dev.137", - "@itwin/core-frontend": "workspace:^3.0.0-dev.137", - "@itwin/core-geometry": "workspace:^3.0.0-dev.137", - "@itwin/core-quantity": "workspace:^3.0.0-dev.137", - "@itwin/core-react": "workspace:^3.0.0-dev.137", + "@itwin/appui-abstract": "workspace:^3.0.0-dev.138", + "@itwin/components-react": "workspace:^3.0.0-dev.138", + "@itwin/core-bentley": "workspace:^3.0.0-dev.138", + "@itwin/core-common": "workspace:^3.0.0-dev.138", + "@itwin/core-frontend": "workspace:^3.0.0-dev.138", + "@itwin/core-geometry": "workspace:^3.0.0-dev.138", + "@itwin/core-quantity": "workspace:^3.0.0-dev.138", + "@itwin/core-react": "workspace:^3.0.0-dev.138", "react": "^17.0.0", "react-dom": "^17.0.0" }, From 1a2ad0051076d364333b33c79513d1a549222494 Mon Sep 17 00:00:00 2001 From: Caleb Shafer <31107829+calebmshafer@users.noreply.github.com> Date: Thu, 2 Dec 2021 09:25:55 -0500 Subject: [PATCH 007/395] Clean up uses of iModel.js in documentation (#2776) * Clean up uses of iModel.js in the documentation and various other places. --- .github/workflows/extract-api.yaml | 2 +- clients/imodelhub/src/imodelhub/iModels.ts | 2 +- .../telemetry/src/FrontendTelemetryClient.ts | 4 ++-- common/api/core-backend.api.md | 2 +- ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-30-15-21.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-30-15-21.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-30-15-21.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-30-15-21.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-30-15-21.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ ...cleanup-imodeljs-refs_2021-11-24-02-30.json | 10 ++++++++++ common/config/azure-pipelines/ci.yaml | 4 ++-- ...ration-client-regression-pr-validation.yaml | 2 +- .../azure-pipelines/jobs/version-bump.yaml | 2 +- .../azure-pipelines/templates/core-build.yaml | 2 +- core/backend/src/DevTools.ts | 4 ++-- core/backend/src/ECDb.ts | 2 +- core/backend/src/ECSqlStatement.ts | 18 +++++++++--------- core/backend/src/ExportGraphics.ts | 2 +- core/backend/src/IModelDb.ts | 4 ++-- core/backend/src/IModelHost.ts | 6 +++--- core/backend/src/Relationship.ts | 14 +++++++------- .../src/test/element/ExcludedElements.test.ts | 1 - core/backend/src/test/misc/DevTools.test.ts | 2 +- core/bentley/src/Compare.ts | 2 +- core/bentley/src/Disposable.ts | 2 +- core/bentley/src/SortedArray.ts | 2 +- core/bentley/src/core-bentley.ts | 8 -------- core/common/src/ConcurrentQuery.ts | 4 ++-- core/common/src/ECSqlTypes.ts | 6 +++--- core/ecschema-editing/package.json | 5 +++-- core/ecschema-locaters/package.json | 4 ++-- core/ecschema-metadata/package.json | 5 +++-- core/express-server/package.json | 8 +++++--- .../frontend-devtools/src/frontend-devtools.ts | 2 +- core/frontend/src/IModelApp.ts | 12 ++++++------ core/frontend/src/IModelConnection.ts | 2 +- core/frontend/src/IModeljs-css.ts | 2 +- core/frontend/src/Viewport.ts | 2 +- core/frontend/src/core-frontend.ts | 2 +- core/hypermodeling/package.json | 4 ++-- core/i18n/package.json | 4 ++-- core/i18n/src/ITwinLocalization.ts | 4 ++-- core/markup/package.json | 4 ++-- core/markup/src/core-markup.ts | 2 +- .../Base.lproj/Main.storyboard | 2 +- core/transformer/README.md | 2 +- core/webgl-compatibility/package.json | 4 ++-- .../src/webgl-compatibility.ts | 4 ++-- docs/changehistory/NextVersion.md | 2 +- docs/learning/App.md | 6 +++--- docs/learning/Capabilities.md | 4 ++-- docs/learning/CommunityResources.md | 2 +- docs/learning/Portability.md | 6 +++--- docs/learning/backend/AccessingIModels.md | 2 +- docs/learning/backend/CrashReporting.md | 2 +- docs/learning/backend/IModelHost.md | 2 +- docs/learning/geometry/CurveFactory.md | 8 ++++---- docs/learning/geometry/CurvePrimitive.md | 2 +- docs/learning/geometry/PlanarSubdivision.md | 8 ++++---- docs/learning/geometry/PolyfaceClip.md | 12 ++++++------ docs/learning/geometry/PolyfaceQuery.md | 16 ++++++++-------- docs/learning/geometry/RegionOps.md | 12 ++++++------ docs/learning/geometry/Triangulation.md | 8 ++++---- .../guidelines/documentation-link-syntax.md | 2 +- .../guidelines/npm-scripts-guidelines.md | 8 ++++---- docs/learning/ui/abstract/UiAdmin.md | 2 +- docs/learning/ui/abstract/UiItemsProvider.md | 2 +- docs/learning/ui/components/Tree.md | 5 ----- docs/learning/ui/core/ContextMenu.md | 2 +- docs/learning/ui/index.md | 2 +- editor/backend/package.json | 4 ++-- editor/common/package.json | 4 ++-- editor/frontend/package.json | 4 ++-- .../src/backend/IModelBankBackendCloudEnv.ts | 1 - .../src/frontend/setup/TestContext.ts | 2 +- .../ecschema-rpc-interface/src/test/backend.ts | 2 +- .../ecschema-rpc-interface/template.env | 2 +- .../src/imodelhub/IModelBankCloudEnv.ts | 1 - full-stack-tests/rpc-interface/package.json | 6 +++--- .../src/frontend/DevToolsRpc.test.ts | 2 +- .../src/frontend/setup/TestContext.ts | 2 +- .../rpc-interface/src/test/backend.ts | 2 +- presentation/backend/package.json | 7 ++++--- presentation/common/package.json | 4 ++-- .../common/src/presentation-common/KeySet.ts | 2 +- presentation/components/package.json | 7 ++++--- presentation/frontend/package.json | 4 ++-- presentation/testing/package.json | 4 ++-- .../src/backend/WebMain.ts | 2 +- test-apps/display-test-app/README.md | 10 +++++----- test-apps/display-test-app/android/README.md | 2 +- .../src/backend/DtaElectronMain.ts | 4 ++-- .../src/backend/SetToStandalone.ts | 2 +- .../display-test-app/src/backend/WebMain.ts | 2 +- test-apps/imodel-transformer/.env.template | 4 ++-- .../presentation-test-app/public/index.html | 2 +- .../presentation-test-app/public/manifest.json | 4 ++-- .../src/ui/dialogs/UnitsPopup.ts | 2 +- test-apps/ui-test-app/public/index.html | 2 +- test-apps/ui-test-app/public/manifest.json | 2 +- tools/backend-webpack/package.json | 4 ++-- tools/certa/package.json | 4 ++-- tools/ecschema2ts/README.md | 12 ++++++------ tools/ecschema2ts/package.json | 4 ++-- tools/eslint-plugin/README.md | 2 +- tools/eslint-plugin/package.json | 4 ++-- tools/perf-tools/package.json | 4 ++-- tools/webpack-core/package.json | 4 ++-- .../plugins/IModeljsLibraryExportsPlugin.ts | 2 +- .../src/plugins/IModeljsLibraryUtils.ts | 2 +- ui/appui-abstract/package.json | 5 +++-- ui/appui-layout-react/README.md | 10 ---------- ui/appui-layout-react/package.json | 4 ++-- ui/appui-react/README.md | 6 +++--- .../messages/AppNotificationManager.ts | 2 +- .../src/appui-react/redux/StateManager.ts | 2 +- .../appui-react/tools/CoreToolDefinitions.tsx | 2 +- ui/components-react/package.json | 4 ++-- ui/core-react/package.json | 4 ++-- .../src/core-react/select/ThemedSelect.tsx | 2 +- ui/core-react/src/core-react/utils/UiEvent.ts | 2 +- ui/imodel-components-react/package.json | 2 +- 155 files changed, 616 insertions(+), 245 deletions(-) create mode 100644 common/changes/@bentley/imodelhub-client/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/appui-abstract/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/appui-layout-react/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/appui-react/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/backend-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/certa/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-bentley/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-common/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-i18n/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-markup/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-mobile/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-react/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/core-transformer/cleanup-imodeljs-refs_2021-11-30-15-21.json create mode 100644 common/changes/@itwin/core-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/ecschema-editing/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/ecschema-locaters/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/ecschema-metadata/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/ecschema-rpcinterface-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/ecschema2ts/cleanup-imodeljs-refs_2021-11-30-15-21.json create mode 100644 common/changes/@itwin/editor-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/editor-common/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/editor-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/eslint-plugin/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/express-server/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/frontend-devtools/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/hypermodeling-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/imodel-components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/imodelhub-client-tests/cleanup-imodeljs-refs_2021-11-30-15-21.json create mode 100644 common/changes/@itwin/perf-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/presentation-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/presentation-common/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/presentation-components/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/presentation-frontend/cleanup-imodeljs-refs_2021-11-30-15-21.json create mode 100644 common/changes/@itwin/presentation-testing/cleanup-imodeljs-refs_2021-11-30-15-21.json create mode 100644 common/changes/@itwin/rpcinterface-full-stack-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json create mode 100644 common/changes/@itwin/webgl-compatibility/cleanup-imodeljs-refs_2021-11-24-02-30.json diff --git a/.github/workflows/extract-api.yaml b/.github/workflows/extract-api.yaml index f8f7ecf19070..d73297dceb93 100644 --- a/.github/workflows/extract-api.yaml +++ b/.github/workflows/extract-api.yaml @@ -1,4 +1,4 @@ -# iModel.js Extract API Build +# iTwin.js Extract API Build name: Extract API diff --git a/clients/imodelhub/src/imodelhub/iModels.ts b/clients/imodelhub/src/imodelhub/iModels.ts index d7719452f217..1fd8f5d87195 100644 --- a/clients/imodelhub/src/imodelhub/iModels.ts +++ b/clients/imodelhub/src/imodelhub/iModels.ts @@ -20,7 +20,7 @@ const loggerCategory: string = IModelHubClientLoggerCategory.IModelHub; /** * HubIModel represents an iModel on iModelHub. Getting a valid HubIModel instance from iModelHub is required for majority of iModelHub method calls, as wsgId of this object needs to be passed as iModelId argument to those methods. * - * For iModel representation in iModel.js, see [IModel]($common). For the file that is used for that iModel, see [BriefcaseDb]($backend). + * For iModel representation in iTwin.js, see [IModel]($common). For the file that is used for that iModel, see [BriefcaseDb]($backend). * @internal */ @ECJsonTypeMap.classToJson("wsg", "ContextScope.iModel", { schemaPropertyName: "schemaName", classPropertyName: "className" }) diff --git a/clients/telemetry/src/FrontendTelemetryClient.ts b/clients/telemetry/src/FrontendTelemetryClient.ts index a9319d8601b6..eecbb4a03c6d 100644 --- a/clients/telemetry/src/FrontendTelemetryClient.ts +++ b/clients/telemetry/src/FrontendTelemetryClient.ts @@ -15,8 +15,8 @@ import { TelemetryClient, TelemetryEvent } from "./TelemetryClient"; * General telemetry event data augmented with data obtained from an [[AuthorizedClientRequestContext]] */ export class ClientTelemetryEvent extends TelemetryEvent { - protected static readonly _iModelJsVersion: string = require("../../package.json").version; // eslint-disable-line @typescript-eslint/no-var-requires - public get iModelJsVersion(): string { return ClientTelemetryEvent._iModelJsVersion; } + protected static readonly _iTwinJsVersion: string = require("../../package.json").version; // eslint-disable-line @typescript-eslint/no-var-requires + public get iTwinJsVersion(): string { return ClientTelemetryEvent._iTwinJsVersion; } /** Unique identifier for the current activity. Useful for correlating any actions performed during a specific activity. */ public readonly activityId?: GuidString; /** Unique identifier for the current user session. */ diff --git a/common/api/core-backend.api.md b/common/api/core-backend.api.md index 8550cd668046..d55abd00722a 100644 --- a/common/api/core-backend.api.md +++ b/common/api/core-backend.api.md @@ -928,7 +928,7 @@ export class DevTools { static stats(): DevToolsStats; static versions(): { application: string; - iModelJs: any; + iTwinJs: any; }; } diff --git a/common/changes/@bentley/imodelhub-client/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@bentley/imodelhub-client/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..e782d91f067a --- /dev/null +++ b/common/changes/@bentley/imodelhub-client/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@bentley/imodelhub-client", + "comment": "", + "type": "none" + } + ], + "packageName": "@bentley/imodelhub-client" +} \ No newline at end of file diff --git a/common/changes/@itwin/appui-abstract/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/appui-abstract/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..28e49225d58a --- /dev/null +++ b/common/changes/@itwin/appui-abstract/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/appui-abstract", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/appui-abstract" +} \ No newline at end of file diff --git a/common/changes/@itwin/appui-layout-react/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/appui-layout-react/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..d19f639ab6ef --- /dev/null +++ b/common/changes/@itwin/appui-layout-react/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/appui-layout-react", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/appui-layout-react" +} \ No newline at end of file diff --git a/common/changes/@itwin/appui-react/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/appui-react/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..3393c35368c5 --- /dev/null +++ b/common/changes/@itwin/appui-react/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/appui-react", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/appui-react" +} \ No newline at end of file diff --git a/common/changes/@itwin/backend-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/backend-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..5861e9367463 --- /dev/null +++ b/common/changes/@itwin/backend-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/backend-webpack-tools", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/backend-webpack-tools" +} \ No newline at end of file diff --git a/common/changes/@itwin/certa/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/certa/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..e594204cd8fe --- /dev/null +++ b/common/changes/@itwin/certa/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/certa", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/certa" +} \ No newline at end of file diff --git a/common/changes/@itwin/components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..d2d24b087cf6 --- /dev/null +++ b/common/changes/@itwin/components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/components-react", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/components-react" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..99b35bb89b62 --- /dev/null +++ b/common/changes/@itwin/core-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-backend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-backend" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-bentley/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-bentley/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..f2bd3c5133b7 --- /dev/null +++ b/common/changes/@itwin/core-bentley/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-bentley", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-bentley" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-common/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-common/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..d1ac065f5d72 --- /dev/null +++ b/common/changes/@itwin/core-common/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-common", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-common" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..ac11a63efe7e --- /dev/null +++ b/common/changes/@itwin/core-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-frontend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-frontend" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-i18n/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-i18n/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..6e3adc7db470 --- /dev/null +++ b/common/changes/@itwin/core-i18n/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-i18n", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-i18n" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-markup/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-markup/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..7a94265251a1 --- /dev/null +++ b/common/changes/@itwin/core-markup/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-markup", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-markup" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-mobile/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-mobile/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..55fa0784386a --- /dev/null +++ b/common/changes/@itwin/core-mobile/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-mobile", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-mobile" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-react/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-react/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..17ffb5584189 --- /dev/null +++ b/common/changes/@itwin/core-react/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-react", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-react" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-transformer/cleanup-imodeljs-refs_2021-11-30-15-21.json b/common/changes/@itwin/core-transformer/cleanup-imodeljs-refs_2021-11-30-15-21.json new file mode 100644 index 000000000000..751f0e4758f9 --- /dev/null +++ b/common/changes/@itwin/core-transformer/cleanup-imodeljs-refs_2021-11-30-15-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-transformer", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-transformer" +} \ No newline at end of file diff --git a/common/changes/@itwin/core-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/core-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..b17782ff877e --- /dev/null +++ b/common/changes/@itwin/core-webpack-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-webpack-tools", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/core-webpack-tools" +} \ No newline at end of file diff --git a/common/changes/@itwin/ecschema-editing/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/ecschema-editing/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..b0e7d3b96542 --- /dev/null +++ b/common/changes/@itwin/ecschema-editing/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/ecschema-editing", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/ecschema-editing" +} \ No newline at end of file diff --git a/common/changes/@itwin/ecschema-locaters/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/ecschema-locaters/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..be9107090da4 --- /dev/null +++ b/common/changes/@itwin/ecschema-locaters/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/ecschema-locaters", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/ecschema-locaters" +} \ No newline at end of file diff --git a/common/changes/@itwin/ecschema-metadata/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/ecschema-metadata/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..5dd8c0e532c0 --- /dev/null +++ b/common/changes/@itwin/ecschema-metadata/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/ecschema-metadata", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/ecschema-metadata" +} \ No newline at end of file diff --git a/common/changes/@itwin/ecschema-rpcinterface-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/ecschema-rpcinterface-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..097a0a761e80 --- /dev/null +++ b/common/changes/@itwin/ecschema-rpcinterface-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/ecschema-rpcinterface-tests", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/ecschema-rpcinterface-tests" +} \ No newline at end of file diff --git a/common/changes/@itwin/ecschema2ts/cleanup-imodeljs-refs_2021-11-30-15-21.json b/common/changes/@itwin/ecschema2ts/cleanup-imodeljs-refs_2021-11-30-15-21.json new file mode 100644 index 000000000000..a63f999cea79 --- /dev/null +++ b/common/changes/@itwin/ecschema2ts/cleanup-imodeljs-refs_2021-11-30-15-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/ecschema2ts", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/ecschema2ts" +} \ No newline at end of file diff --git a/common/changes/@itwin/editor-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/editor-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..661f0360be67 --- /dev/null +++ b/common/changes/@itwin/editor-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/editor-backend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/editor-backend" +} \ No newline at end of file diff --git a/common/changes/@itwin/editor-common/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/editor-common/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..72655a58332c --- /dev/null +++ b/common/changes/@itwin/editor-common/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/editor-common", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/editor-common" +} \ No newline at end of file diff --git a/common/changes/@itwin/editor-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/editor-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..8aa55b01d270 --- /dev/null +++ b/common/changes/@itwin/editor-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/editor-frontend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/editor-frontend" +} \ No newline at end of file diff --git a/common/changes/@itwin/eslint-plugin/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/eslint-plugin/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..7b137345d283 --- /dev/null +++ b/common/changes/@itwin/eslint-plugin/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/eslint-plugin", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/eslint-plugin" +} \ No newline at end of file diff --git a/common/changes/@itwin/express-server/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/express-server/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..e622b1b8741e --- /dev/null +++ b/common/changes/@itwin/express-server/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/express-server", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/express-server" +} \ No newline at end of file diff --git a/common/changes/@itwin/frontend-devtools/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/frontend-devtools/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..3704c5ffd7e2 --- /dev/null +++ b/common/changes/@itwin/frontend-devtools/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/frontend-devtools", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/frontend-devtools" +} \ No newline at end of file diff --git a/common/changes/@itwin/hypermodeling-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/hypermodeling-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..43c6ffed45ca --- /dev/null +++ b/common/changes/@itwin/hypermodeling-frontend/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/hypermodeling-frontend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/hypermodeling-frontend" +} \ No newline at end of file diff --git a/common/changes/@itwin/imodel-components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/imodel-components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..98181801665f --- /dev/null +++ b/common/changes/@itwin/imodel-components-react/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/imodel-components-react", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/imodel-components-react" +} \ No newline at end of file diff --git a/common/changes/@itwin/imodelhub-client-tests/cleanup-imodeljs-refs_2021-11-30-15-21.json b/common/changes/@itwin/imodelhub-client-tests/cleanup-imodeljs-refs_2021-11-30-15-21.json new file mode 100644 index 000000000000..4a3bd0f8b9c7 --- /dev/null +++ b/common/changes/@itwin/imodelhub-client-tests/cleanup-imodeljs-refs_2021-11-30-15-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/imodelhub-client-tests", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/imodelhub-client-tests" +} \ No newline at end of file diff --git a/common/changes/@itwin/perf-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/perf-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..6eedc1365564 --- /dev/null +++ b/common/changes/@itwin/perf-tools/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/perf-tools", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/perf-tools" +} \ No newline at end of file diff --git a/common/changes/@itwin/presentation-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/presentation-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..8cf278a0fc94 --- /dev/null +++ b/common/changes/@itwin/presentation-backend/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/presentation-backend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/presentation-backend" +} \ No newline at end of file diff --git a/common/changes/@itwin/presentation-common/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/presentation-common/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..832da0bf5908 --- /dev/null +++ b/common/changes/@itwin/presentation-common/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/presentation-common", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/presentation-common" +} \ No newline at end of file diff --git a/common/changes/@itwin/presentation-components/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/presentation-components/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..b948b4b931af --- /dev/null +++ b/common/changes/@itwin/presentation-components/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/presentation-components", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/presentation-components" +} \ No newline at end of file diff --git a/common/changes/@itwin/presentation-frontend/cleanup-imodeljs-refs_2021-11-30-15-21.json b/common/changes/@itwin/presentation-frontend/cleanup-imodeljs-refs_2021-11-30-15-21.json new file mode 100644 index 000000000000..fee45652689b --- /dev/null +++ b/common/changes/@itwin/presentation-frontend/cleanup-imodeljs-refs_2021-11-30-15-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/presentation-frontend", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/presentation-frontend" +} \ No newline at end of file diff --git a/common/changes/@itwin/presentation-testing/cleanup-imodeljs-refs_2021-11-30-15-21.json b/common/changes/@itwin/presentation-testing/cleanup-imodeljs-refs_2021-11-30-15-21.json new file mode 100644 index 000000000000..bde99cb24707 --- /dev/null +++ b/common/changes/@itwin/presentation-testing/cleanup-imodeljs-refs_2021-11-30-15-21.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/presentation-testing", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/presentation-testing" +} \ No newline at end of file diff --git a/common/changes/@itwin/rpcinterface-full-stack-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/rpcinterface-full-stack-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..f4ac0f33aed4 --- /dev/null +++ b/common/changes/@itwin/rpcinterface-full-stack-tests/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/rpcinterface-full-stack-tests", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/rpcinterface-full-stack-tests" +} \ No newline at end of file diff --git a/common/changes/@itwin/webgl-compatibility/cleanup-imodeljs-refs_2021-11-24-02-30.json b/common/changes/@itwin/webgl-compatibility/cleanup-imodeljs-refs_2021-11-24-02-30.json new file mode 100644 index 000000000000..02a2bb6bf631 --- /dev/null +++ b/common/changes/@itwin/webgl-compatibility/cleanup-imodeljs-refs_2021-11-24-02-30.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/webgl-compatibility", + "comment": "", + "type": "none" + } + ], + "packageName": "@itwin/webgl-compatibility" +} \ No newline at end of file diff --git a/common/config/azure-pipelines/ci.yaml b/common/config/azure-pipelines/ci.yaml index 771d24b1975a..4824d0a9f447 100644 --- a/common/config/azure-pipelines/ci.yaml +++ b/common/config/azure-pipelines/ci.yaml @@ -6,11 +6,11 @@ # which require several webpacking steps. Due to the time it takes to run, these are only used in a limited number of cases. # # The main CI build used is the ./jobs/fast-ci.yaml due to it running on a set of faster machines. However, those are currently -# only available to members of the iModel.js GitHub Organization for security reasons. This may change in the future but for now +# only available to members of the iTwin GitHub Organization for security reasons. This may change in the future but for now # the limitation will exist. # # This build is not automatically queued for fork-based PRs and needs to be manually triggered by using a comment trigger in the PR. -# Anyone in the iModel.js Org can trigger this pipeline by adding this comment, +# Anyone in the iTwin Org can trigger this pipeline by adding this comment, # `/azp run imodeljs.imodeljs` trigger: none diff --git a/common/config/azure-pipelines/integration-client-regression-pr-validation.yaml b/common/config/azure-pipelines/integration-client-regression-pr-validation.yaml index ab070bb54ee3..e88ca01fd5a6 100644 --- a/common/config/azure-pipelines/integration-client-regression-pr-validation.yaml +++ b/common/config/azure-pipelines/integration-client-regression-pr-validation.yaml @@ -1,4 +1,4 @@ -# iModel.js Integration Client Regression PR Validation Build +# iTwin.js Core Integration Client Regression PR Validation Build # # This integration test job uses the older internal 'imsoidcui' IMS authority and # OIDC clients to make sure that workflow is still supported. diff --git a/common/config/azure-pipelines/jobs/version-bump.yaml b/common/config/azure-pipelines/jobs/version-bump.yaml index 019923f1ba7f..55b7b6830415 100644 --- a/common/config/azure-pipelines/jobs/version-bump.yaml +++ b/common/config/azure-pipelines/jobs/version-bump.yaml @@ -1,4 +1,4 @@ -# The following build handles everything needed to bump the iModel.js package versions +# The following build handles everything needed to bump the iTwin.js Core package versions # # There are currently 4 different types of version bumps: # - Nightly diff --git a/common/config/azure-pipelines/templates/core-build.yaml b/common/config/azure-pipelines/templates/core-build.yaml index 4b844e0a9a27..dda599cdc039 100644 --- a/common/config/azure-pipelines/templates/core-build.yaml +++ b/common/config/azure-pipelines/templates/core-build.yaml @@ -1,4 +1,4 @@ -# This defines the core steps for building and validating iModel.js +# This defines the core steps for building and validating iTwin.js Core parameters: - name: workingDir diff --git a/core/backend/src/DevTools.ts b/core/backend/src/DevTools.ts index 592be3ff2e33..fe6069a36aa2 100644 --- a/core/backend/src/DevTools.ts +++ b/core/backend/src/DevTools.ts @@ -200,11 +200,11 @@ export class DevTools { return oldLevel; } - /** Obtains the backend application and iModel.js versions */ + /** Obtains the backend application and iTwin.js Core versions */ public static versions() { return { application: IModelHost.applicationVersion, - iModelJs: require("../../package.json").version, // eslint-disable-line @typescript-eslint/no-var-requires + iTwinJs: require("../../package.json").version, // eslint-disable-line @typescript-eslint/no-var-requires }; } } diff --git a/core/backend/src/ECDb.ts b/core/backend/src/ECDb.ts index 746240f8f60f..5de3a3e03784 100644 --- a/core/backend/src/ECDb.ts +++ b/core/backend/src/ECDb.ts @@ -326,7 +326,7 @@ export class ECDb implements IDisposable { * * @param ecsql The ECSQL statement to execute * @param params The values to bind to the parameters (if the ECSQL has any). - * See "[iModel.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" for details. + * See "[iTwin.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" for details. * @returns Return row count. * @throws [IModelError]($common) If the statement is invalid */ diff --git a/core/backend/src/ECSqlStatement.ts b/core/backend/src/ECSqlStatement.ts index 6e0d5df19ca9..e3b81813df83 100644 --- a/core/backend/src/ECSqlStatement.ts +++ b/core/backend/src/ECSqlStatement.ts @@ -47,8 +47,8 @@ export class ECSqlInsertResult { * > The key to making this strategy work is to phrase a statement in a general way and use placeholders to represent parameters that will vary on each use. * * See also - * - [Executing ECSQL]($docs/learning/backend/ExecutingECSQL) provides more background on ECSQL and an introduction on how to execute ECSQL with the iModel.js API. - * - [Code Examples]($docs/learning/backend/ECSQLCodeExamples) illustrate the use of the iModel.js API for executing and working with ECSQL + * - [Executing ECSQL]($docs/learning/backend/ExecutingECSQL) provides more background on ECSQL and an introduction on how to execute ECSQL with the iTwin.js API. + * - [Code Examples]($docs/learning/backend/ECSQLCodeExamples) illustrate the use of the iTwin.js API for executing and working with ECSQL * @public */ export class ECSqlStatement implements IterableIterator, IDisposable { @@ -116,8 +116,8 @@ export class ECSqlStatement implements IterableIterator, IDisposable { } /** Binds the specified value to the specified ECSQL parameter. - * The section "[iModel.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" describes the - * iModel.js types to be used for the different ECSQL parameter types. + * The section "[iTwin.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" describes the + * iTwin.js types to be used for the different ECSQL parameter types. * @param parameter Index (1-based) or name of the parameter */ public bindValue(parameter: number | string, val: any): void { this.getBinder(parameter).bind(val); } @@ -230,8 +230,8 @@ export class ECSqlStatement implements IterableIterator, IDisposable { * Pass an *object of the values keyed on the parameter name* for *named parameters*. * The values in either the array or object must match the respective types of the parameter. * - * The section "[iModel.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" describes the - * iModel.js types to be used for the different ECSQL parameter types. + * The section "[iTwin.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" describes the + * iTwin.js types to be used for the different ECSQL parameter types. * * See also these [Code Samples]($docs/learning/backend/ECSQLCodeExamples#binding-to-all-parameters-at-once) */ @@ -401,8 +401,8 @@ export class ECSqlBinder { public constructor(binder: IModelJsNative.ECSqlBinder) { this._binder = binder; } /** Binds the specified value to the ECSQL parameter. - * The section "[iModel.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" describes the - * iModel.js types to be used for the different ECSQL parameter types. + * The section "[iTwin.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" describes the + * iTwin.js types to be used for the different ECSQL parameter types. * @param val Value to bind */ public bind(val: any): void { @@ -725,7 +725,7 @@ class ECSqlBindingHelper { /** Binds the specified value to the specified binder * @param binder Parameter Binder to bind to - * @param val Value to be bound. (See [iModel.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)) + * @param val Value to be bound. (See [iTwin.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)) * @throws IModelError in case of errors */ public static bindValue(binder: ECSqlBinder, val: any): void { diff --git a/core/backend/src/ExportGraphics.ts b/core/backend/src/ExportGraphics.ts index 94f258ed11a4..c31453a271e4 100644 --- a/core/backend/src/ExportGraphics.ts +++ b/core/backend/src/ExportGraphics.ts @@ -113,7 +113,7 @@ export interface ExportPartInstanceInfo { /** The base display properties when the [GeometryPart]($core-backend) was referenced. */ displayProps: ExportPartDisplayInfo; /** A row-major storage 4x3 transform for this instance. - * See export-gltf under test-apps in the iModel.js monorepo for a working reference. + * See export-gltf under test-apps in the iTwin.js monorepo for a working reference. */ transform?: Float64Array; } diff --git a/core/backend/src/IModelDb.ts b/core/backend/src/IModelDb.ts index d87c995fe443..8e69d6c6b170 100644 --- a/core/backend/src/IModelDb.ts +++ b/core/backend/src/IModelDb.ts @@ -481,7 +481,7 @@ export abstract class IModelDb extends IModel { * * @param ecsql The ECSQL statement to execute * @param params The values to bind to the parameters (if the ECSQL has any). - * See "[iModel.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" for details. + * See "[iTwin.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" for details. * @returns Return row count. * @throws [IModelError]($common) If the statement is invalid */ @@ -1138,7 +1138,7 @@ export abstract class IModelDb extends IModel { * that list. * * The results of changing [ExportPartGraphicsOptions]($core-backend) during the * [ExportPartGraphicsOptions.onPartGraphics]($core-backend) callback are not defined. - * * See export-gltf under test-apps in the iModel.js monorepo for a working reference. + * * See export-gltf under test-apps in the iTwin.js monorepo for a working reference. * @returns 0 is successful, status otherwise * @public */ diff --git a/core/backend/src/IModelHost.ts b/core/backend/src/IModelHost.ts index 7a654f8ffbd3..c4056706a47f 100644 --- a/core/backend/src/IModelHost.ts +++ b/core/backend/src/IModelHost.ts @@ -74,7 +74,7 @@ export interface CrashReportingConfig { export class IModelHostConfiguration { /** - * Root of the directory holding all the files that iModel.js caches + * Root of the directory holding all the files that iTwin.js caches * - If not specified at startup a platform specific default is used - * - Windows: $(HOMEDIR)/AppData/Local/iModelJs/ * - Mac/iOS: $(HOMEDIR)/Library/Caches/iModelJs/ @@ -327,7 +327,7 @@ export class IModelHost { private static _isValid = false; /** Returns true if IModelHost is started. */ public static get isValid() { return this._isValid; } - /** This method must be called before any iModel.js services are used. + /** This method must be called before any iTwin.js services are used. * @param configuration Host configuration data. * Raises [[onAfterStartup]]. * @see [[shutdown]]. @@ -445,7 +445,7 @@ export class IModelHost { this._briefcaseCacheDir = path.join(this._cacheDir, "imodels"); } - /** This method must be called when an iModel.js services is shut down. Raises [[onBeforeShutdown]] */ + /** This method must be called when an iTwin.js services is shut down. Raises [[onBeforeShutdown]] */ public static async shutdown(): Promise { // NB: This method is set as a node listener where `this` is unbound if (!IModelHost._isValid) diff --git a/core/backend/src/Relationship.ts b/core/backend/src/Relationship.ts index 5df401a17f56..ff6528fa8c9b 100644 --- a/core/backend/src/Relationship.ts +++ b/core/backend/src/Relationship.ts @@ -252,8 +252,8 @@ export interface ElementDrivesElementProps extends RelationshipProps { * * Inputs - The sources of all edges that point to the element. This includes all upstream elements that flow into the element. * * Outputs - The targets of all edges that point out of the element. This includes all downstream elements. * - * #Subgraph Processing - * When changes are made, iModel.js finds and processes only the part of the overall graph that is affected. So, for example, + * # Subgraph Processing + * When changes are made, only the part of the overall graph that is affected will be processed. So, for example, * suppose we have this graph: * ``` * e1 --> e2 --> e3 @@ -291,7 +291,7 @@ export interface ElementDrivesElementProps extends RelationshipProps { * e31 * ``` * # Callbacks - * Once iModel.js has found the affected subgraph to process, it propagates changes through it by making callbacks. + * Once the affected subgraph to process is found, it propagates changes through it by making callbacks. * Classes for both elements (nodes) and ElementDrivesElements relationships (edges) can receive callbacks. * * ## ElementDrivesElement Callbacks @@ -367,7 +367,7 @@ export interface ElementDrivesElementProps extends RelationshipProps { * involved in a cycle will have their status set to 1, indicating a failure. * * A callback may call txnManager.reportError to reject an invalid change. It can classify the error as fatal or just a warning. - * A callback make set the status value of an ElementDrivesElement instance to 1 to indicate a processing falure in that edge. + * A callback make set the status value of an ElementDrivesElement instance to 1 to indicate a processing failure in that edge. * * After BriefcaseDb.saveChanges is called, an app should check db.txns.validationErrors and db.txns.hasFatalError to find out if graph-evaluation failed. * @@ -377,9 +377,9 @@ export class ElementDrivesElement extends Relationship implements ElementDrivesE /** @internal */ public static override get className(): string { return "ElementDrivesElement"; } /** Relationship status - * * 0 indicates no errors. iModel.js sets this after a successful evaluation. - * * 1 indicates that this driving relationship could not be evaluated. The callback itself can set this to indicate that it failed to process the input changes. Also, iModel.js sets this if it finds that the relationship is part of a circular dependency. - * * 0x80 The app or callback can set this to tell iModel.js not propagate changes through this relationship. + * * 0 indicates no errors. Set after a successful evaluation. + * * 1 indicates that this driving relationship could not be evaluated. The callback itself can set this to indicate that it failed to process the input changes. Also, it is set if the relationship is part of a circular dependency. + * * 0x80 The app or callback can set this to indicate to not propagate changes through this relationship. */ public status: number; /** Affects the order in which relationships are processed in the case where two relationships have the same output. */ diff --git a/core/backend/src/test/element/ExcludedElements.test.ts b/core/backend/src/test/element/ExcludedElements.test.ts index 0a166f56cb89..0dfebcbdd181 100644 --- a/core/backend/src/test/element/ExcludedElements.test.ts +++ b/core/backend/src/test/element/ExcludedElements.test.ts @@ -56,7 +56,6 @@ describe("ExcludedElements", () => { // Unless compressed Ids explicitly requested, the Ids are always decompressed regardless of how they are stored. // This is to preserve compatibility with older front-ends that don't understand the compressed Ids; it's an unfortunate default. - // ###TODO change the default in iModel.js 3.0. expect(getStyle().jsonProperties.styles.excludedElements).to.deep.equal(excludedElementIds); expect(getStyle(false).jsonProperties.styles.excludedElements).to.deep.equal(excludedElementIds); expect(getStyle(true).jsonProperties.styles.excludedElements).to.equal(excludedElements); diff --git a/core/backend/src/test/misc/DevTools.test.ts b/core/backend/src/test/misc/DevTools.test.ts index 5893086de08a..fcb3b97fd660 100644 --- a/core/backend/src/test/misc/DevTools.test.ts +++ b/core/backend/src/test/misc/DevTools.test.ts @@ -81,7 +81,7 @@ describe("DevTools", () => { it("Get the backend versions", () => { const versions = DevTools.versions(); assert.isDefined(versions.application); - assert.isDefined(versions.iModelJs); + assert.isDefined(versions.iTwinJs); }); } ); diff --git a/core/bentley/src/Compare.ts b/core/bentley/src/Compare.ts index d5b98d25be1a..52840c65676c 100644 --- a/core/bentley/src/Compare.ts +++ b/core/bentley/src/Compare.ts @@ -8,7 +8,7 @@ /** * A function that returns a numerical value indicating how two objects are ordered in relation to one another. - * Such functions are used by various collection classes in the iModel.js library. + * Such functions are used by various collection classes throughout the library. * Given values `lhs` and `rhs`, the function returns: * - Zero if lhs == rhs * - A negative number if lhs < rhs diff --git a/core/bentley/src/Disposable.ts b/core/bentley/src/Disposable.ts index ca4dddaf5697..12570bdc598a 100644 --- a/core/bentley/src/Disposable.ts +++ b/core/bentley/src/Disposable.ts @@ -17,7 +17,7 @@ * * IDisposable tends to be contagious; that is, if a type has members which implement IDisposable, that type should also implement IDisposable to dispose of those members. * - * Implementations of IDisposable tend to be more "low-level" types. The disposal of such types is often handled on your behalf by imodel.js. + * Implementations of IDisposable tend to be more "low-level" types. The disposal of such types is often handled on your behalf. * However, always consult the documentation for an IDisposable type to determine under what circumstances you are expected to explicitly dispose of it. * @public */ diff --git a/core/bentley/src/SortedArray.ts b/core/bentley/src/SortedArray.ts index 7fb91f5a673f..9989b32665bb 100644 --- a/core/bentley/src/SortedArray.ts +++ b/core/bentley/src/SortedArray.ts @@ -9,7 +9,7 @@ import { OrderedComparator } from "./Compare"; /** - * A function that, given a value of type T, returns a copy of that value. Such functions are used by various collection classes in the iModel.js library. + * A function that, given a value of type T, returns a copy of that value. Such functions are used by various collection classes. * It is up to the function to decide how deeply or shallowly the value is cloned. For example, [[shallowClone]] simply returns the input. * @public */ diff --git a/core/bentley/src/core-bentley.ts b/core/bentley/src/core-bentley.ts index 339857589c0f..905beaadb3f4 100644 --- a/core/bentley/src/core-bentley.ts +++ b/core/bentley/src/core-bentley.ts @@ -33,10 +33,6 @@ export * from "./Time"; export * from "./UnexpectedErrors"; export * from "./UtilityTypes"; -/** @packageDocumentation - * @module Utils - */ - /** @docs-package-description * The core-bentley package contains classes to solve problems that are common for both client and server use cases. */ @@ -44,10 +40,6 @@ export * from "./UtilityTypes"; * @docs-group-description BeSQLite * Classes for working with SQLite databases. SQLite underlies IModelDb and ECDb - see [Executing ECSQL]($docs/learning/ECSQL.md) */ -/** - * @docs-group-description Configuration - * Class for easily managing configuration variables for an iModel.js application. - */ /** * @docs-group-description Errors * Classes for working with errors. diff --git a/core/common/src/ConcurrentQuery.ts b/core/common/src/ConcurrentQuery.ts index 0487f3cd63ea..5579ca120e6b 100644 --- a/core/common/src/ConcurrentQuery.ts +++ b/core/common/src/ConcurrentQuery.ts @@ -13,7 +13,7 @@ import { Point2d, Point3d } from "@itwin/core-geometry"; * [IModelConnection]($frontend), [IModelDb]($backend), and [ECDb]($backend). * * @public - * */ + */ export enum QueryRowFormat { /** Each row is an object in which each non-null column value can be accessed by its name as defined in the ECSql. * Null values are omitted. @@ -24,7 +24,7 @@ export enum QueryRowFormat { */ UseECSqlPropertyIndexes, /** Each row is an object in which each non-null column value can be accessed by a [remapped property name]($docs/learning/ECSqlRowFormat.md). - * This format is backwards-compatible with the format produced by iModel.js version 2.x. Null values are omitted. + * This format is backwards-compatible with the format produced by iTwin.js 2.x. Null values are omitted. */ UseJsPropertyNames, } diff --git a/core/common/src/ECSqlTypes.ts b/core/common/src/ECSqlTypes.ts index fee8d94cb79c..536e79c78f22 100644 --- a/core/common/src/ECSqlTypes.ts +++ b/core/common/src/ECSqlTypes.ts @@ -107,13 +107,13 @@ export enum ECSqlSystemProperty { PointZ, } -/** Utility to format ECProperty names according to the iModel.js formatting rules. +/** Utility to format ECProperty names according to the iTwin.js formatting rules. * See also [ECSQL Row Format]($docs/learning/ECSQLRowFormat). * @public */ export class ECJsNames { - /** Formats the specified ECProperty name according to the iModel.js formatting rules. + /** Formats the specified ECProperty name according to the iTwin.js formatting rules. * * See [ECSQL Row Format]($docs/learning/ECSQLRowFormat) which describes the formatting rules. * @@ -190,7 +190,7 @@ export class ECJsNames { } /** Returns the name of the specified ECSQL system property according to the - * iModel.js formatting rules. + * iTwin.js formatting rules. * * See [ECSQL Row Format]($docs/learning/ECSQLRowFormat) which describes the formatting rules. * @param systemPropertyType System property type diff --git a/core/ecschema-editing/package.json b/core/ecschema-editing/package.json index 3498dfbc0bc6..8cba27f191ec 100644 --- a/core/ecschema-editing/package.json +++ b/core/ecschema-editing/package.json @@ -26,7 +26,8 @@ "keywords": [ "Bentley", "iModel", - "iModel.js", + "iTwin", + "iTwin.js", "EC" ], "author": { @@ -75,4 +76,4 @@ "@typescript-eslint/explicit-member-accessibility": "warn" } } -} +} \ No newline at end of file diff --git a/core/ecschema-locaters/package.json b/core/ecschema-locaters/package.json index 0fb54042e4cc..31362b089fe1 100644 --- a/core/ecschema-locaters/package.json +++ b/core/ecschema-locaters/package.json @@ -25,7 +25,7 @@ "keywords": [ "Bentley", "iModel", - "iModel.js", + "iTwin.js", "EC" ], "author": { @@ -71,4 +71,4 @@ "radix": "warn" } } -} +} \ No newline at end of file diff --git a/core/ecschema-metadata/package.json b/core/ecschema-metadata/package.json index f5d8437eb1e4..a3db17160b92 100644 --- a/core/ecschema-metadata/package.json +++ b/core/ecschema-metadata/package.json @@ -26,7 +26,8 @@ "keywords": [ "Bentley", "iModel", - "iModel.js", + "iTwin", + "iTwin.js", "EC" ], "author": { @@ -97,4 +98,4 @@ } ] } -} +} \ No newline at end of file diff --git a/core/express-server/package.json b/core/express-server/package.json index 40107cb34bd0..17d769e2efe6 100644 --- a/core/express-server/package.json +++ b/core/express-server/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/express-server", "version": "3.0.0-dev.138", - "description": "iModel.js express utilities", + "description": "iTwin.js express utilities", "main": "lib/cjs/ExpressServer.js", "typings": "lib/cjs/ExpressServer", "license": "MIT", @@ -26,7 +26,9 @@ "keywords": [ "Bentley", "BIM", - "iModel" + "iModel", + "iTwin", + "iTwin.js" ], "author": { "name": "Bentley Systems, Inc.", @@ -70,4 +72,4 @@ "nyc": { "extends": "./node_modules/@itwin/build-tools/.nycrc" } -} +} \ No newline at end of file diff --git a/core/frontend-devtools/src/frontend-devtools.ts b/core/frontend-devtools/src/frontend-devtools.ts index 6a7f7caccdac..9d54f99f9a66 100644 --- a/core/frontend-devtools/src/frontend-devtools.ts +++ b/core/frontend-devtools/src/frontend-devtools.ts @@ -67,7 +67,7 @@ export * from "./widgets/TileStatisticsTracker"; export * from "./widgets/ToolSettingsTracker"; /** @docs-package-description - * The frontend-devtools package contains various tools and widgets for monitoring and debugging the front-end state of an iModel.js application. + * The frontend-devtools package contains various tools and widgets for monitoring and debugging the front-end state of an iTwin.js application. */ /** diff --git a/core/frontend/src/IModelApp.ts b/core/frontend/src/IModelApp.ts index 10923a4750b3..8b4408f8b331 100644 --- a/core/frontend/src/IModelApp.ts +++ b/core/frontend/src/IModelApp.ts @@ -155,11 +155,11 @@ interface IModelAppForDebugger { } /** - * Global singleton that connects the user interface with the iModel.js services. There can be only one IModelApp active in a session. All + * Global singleton that connects the user interface with the iTwin.js services. There can be only one IModelApp active in a session. All * members of IModelApp are static, and it serves as a singleton object for gaining access to session information. * * Before any interactive operations may be performed by the `@itwin/core-frontend package`, [[IModelApp.startup]] must be called and awaited. - * Applications may customize the frontend behavior of iModel.js by supplying options to [[IModelApp.startup]]. + * Applications may customize the frontend behavior of iTwin.js by supplying options to [[IModelApp.startup]]. * * @public */ @@ -327,7 +327,7 @@ export class IModelApp { (window as IModelAppForDebugger).iModelAppForDebugger = this; this.sessionId = opts.sessionId ?? Guid.createValue(); - this._applicationId = opts.applicationId ?? "2686"; // Default to product id of iModel.js + this._applicationId = opts.applicationId ?? "2686"; // Default to product id of iTwin.js this._applicationVersion = opts.applicationVersion ?? "1.0.0"; this.authorizationClient = opts.authorizationClient; this._hubAccess = opts.hubAccess; @@ -658,13 +658,13 @@ export class IModelApp { return card; } - /** Make the logo card for the iModel.js library itself. This card gets placed at the top of the stack. + /** Make the logo card for the library itself. This card gets placed at the top of the stack. * @internal */ public static makeIModelJsLogoCard() { return this.makeLogoCard({ iconSrc: "images/about-imodeljs.svg", - heading: `${this.localization.getLocalizedString("Notices.PoweredBy")} iModel.js`, + heading: `${this.localization.getLocalizedString("Notices.PoweredBy")} iTwin.js`, notice: `${require("../../package.json").version}
${copyrightNotice}`, // eslint-disable-line @typescript-eslint/no-var-requires }); } @@ -680,7 +680,7 @@ export class IModelApp { return div; } - /** Localize an error status from iModel.js + /** Localize an error status * @param status one of the status values from [BentleyStatus]($core-bentley), [IModelStatus]($core-bentley) or [DbResult]($core-bentley) * @returns a localized error message * @beta diff --git a/core/frontend/src/IModelConnection.ts b/core/frontend/src/IModelConnection.ts index db44bc5ba045..bebc7d3eab9d 100644 --- a/core/frontend/src/IModelConnection.ts +++ b/core/frontend/src/IModelConnection.ts @@ -285,7 +285,7 @@ export abstract class IModelConnection extends IModel { * * @param ecsql The ECSQL statement to execute * @param params The values to bind to the parameters (if the ECSQL has any). - * See "[iModel.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" for details. + * See "[iTwin.js Types used in ECSQL Parameter Bindings]($docs/learning/ECSQLParameterTypes)" for details. * @returns Return row count. * @throws [IModelError]($common) If the statement is invalid */ diff --git a/core/frontend/src/IModeljs-css.ts b/core/frontend/src/IModeljs-css.ts index 6f233e0970aa..f5220c4beb4f 100644 --- a/core/frontend/src/IModeljs-css.ts +++ b/core/frontend/src/IModeljs-css.ts @@ -143,7 +143,7 @@ let iModelJsCss: string | undefined = ` } `; -// add the iModel.js frontend .css styles into DOM head when we load +// add the iTwin.js frontend .css styles into DOM head when we load (() => { // Skip adding the css to document if document does not exist. if ("undefined" === typeof document) diff --git a/core/frontend/src/Viewport.ts b/core/frontend/src/Viewport.ts index 8b125898b935..8ac93d2d7e0a 100644 --- a/core/frontend/src/Viewport.ts +++ b/core/frontend/src/Viewport.ts @@ -2780,7 +2780,7 @@ export class ScreenViewport extends Viewport { return div; } - /** The HTMLImageElement of the iModel.js logo displayed in this ScreenViewport + /** The HTMLImageElement of the iTwin.js logo displayed in this ScreenViewport * @beta */ public get logo() { return this._logo; } diff --git a/core/frontend/src/core-frontend.ts b/core/frontend/src/core-frontend.ts index 363c3416d1a1..b717a5dcb38c 100644 --- a/core/frontend/src/core-frontend.ts +++ b/core/frontend/src/core-frontend.ts @@ -128,7 +128,7 @@ export * from "./RealityDataSource"; /** * @docs-group-description IModelApp - * Classes for configuring and administering an iModel.js application. + * Classes for configuring and administering an iTwin.js application. * See [the learning articles]($docs/learning/frontend/index.md). */ /** diff --git a/core/hypermodeling/package.json b/core/hypermodeling/package.json index b5d6df3d786a..9cc200ff93af 100644 --- a/core/hypermodeling/package.json +++ b/core/hypermodeling/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/hypermodeling-frontend", "version": "3.0.0-dev.138", - "description": "iModel.js hypermodeling package", + "description": "iTwin.js hypermodeling package", "main": "lib/cjs/hypermodeling-frontend.js", "module": "lib/esm/hypermodeling-frontend.js", "typings": "lib/cjs/hypermodeling-frontend", @@ -77,4 +77,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/core/i18n/package.json b/core/i18n/package.json index efccddbde536..201ef4d76801 100644 --- a/core/i18n/package.json +++ b/core/i18n/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/core-i18n", "version": "3.0.0-dev.138", - "description": "iModel.js localization code", + "description": "iTwin.js localization code", "main": "lib/cjs/core-i18n.js", "module": "lib/esm/core-i18n.js", "typings": "lib/cjs/core-i18n", @@ -68,4 +68,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/core/i18n/src/ITwinLocalization.ts b/core/i18n/src/ITwinLocalization.ts index e16b55dd8d69..2c801058cf99 100644 --- a/core/i18n/src/ITwinLocalization.ts +++ b/core/i18n/src/ITwinLocalization.ts @@ -11,7 +11,7 @@ import i18nextBrowserLanguageDetector, { DetectorOptions } from "i18next-browser import { BackendOptions } from "i18next-http-backend"; import XHR from "i18next-xhr-backend"; import { Logger } from "@itwin/core-bentley"; -import { Localization } from "@itwin/core-common"; +import type { Localization } from "@itwin/core-common"; /** Options for ITwinLocalization * @public @@ -185,7 +185,7 @@ export class ITwinLocalization implements Localization { * @note - The registerNamespace method starts fetching the appropriate version of the JSON localization file from the server, * based on the current locale. To make sure that fetch is complete before performing translations from this namespace, await * fulfillment of the readPromise Promise property of the returned LocalizationNamespace. - * @see [Localization in iModel.js]($docs/learning/frontend/Localization.md) + * @see [Localization in iTwin.js]($docs/learning/frontend/Localization.md) * @public */ public async registerNamespace(name: string): Promise { diff --git a/core/markup/package.json b/core/markup/package.json index 15800a1065a2..d096b0c4c67f 100644 --- a/core/markup/package.json +++ b/core/markup/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/core-markup", "version": "3.0.0-dev.138", - "description": "iModel.js markup package", + "description": "iTwin.js markup package", "main": "lib/cjs/core-markup.js", "module": "lib/esm/core-markup.js", "typings": "lib/cjs/core-markup", @@ -79,4 +79,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/core/markup/src/core-markup.ts b/core/markup/src/core-markup.ts index bf2cf7b79ed6..ebcf78853962 100644 --- a/core/markup/src/core-markup.ts +++ b/core/markup/src/core-markup.ts @@ -11,7 +11,7 @@ export * from "./Undo"; export * from "./SvgJsExt"; /** @docs-package-description - * The core-markup package supplies tools for creating, editing, and saving SVG-based markups of iModel.js Viewports. + * The core-markup package supplies tools for creating, editing, and saving SVG-based markups of Viewports. */ /** * @docs-group-description MarkupApp diff --git a/core/mobile/src/test/ios/imodeljs-backend-test-app/imodeljs-backend-test-app/Base.lproj/Main.storyboard b/core/mobile/src/test/ios/imodeljs-backend-test-app/imodeljs-backend-test-app/Base.lproj/Main.storyboard index 937df4233d4f..e6079cc03e1b 100644 --- a/core/mobile/src/test/ios/imodeljs-backend-test-app/imodeljs-backend-test-app/Base.lproj/Main.storyboard +++ b/core/mobile/src/test/ios/imodeljs-backend-test-app/imodeljs-backend-test-app/Base.lproj/Main.storyboard @@ -17,7 +17,7 @@ - + diff --git a/core/transformer/README.md b/core/transformer/README.md index cf176734c0a7..7e73c1c0c158 100644 --- a/core/transformer/README.md +++ b/core/transformer/README.md @@ -4,7 +4,7 @@ Copyright © Bentley Systems, Incorporated. All rights reserved. See LICENSE.md ## Description -The __@bentley/imodeljs-trasnformer__ package contains classes that handle traversing iModels for exporting and importing their parts. +The __@itwin/core-trasnformer__ package contains classes that handle traversing iModels for exporting and importing their parts. ## Documentation diff --git a/core/webgl-compatibility/package.json b/core/webgl-compatibility/package.json index 2e73579dee5d..d556fda3b442 100644 --- a/core/webgl-compatibility/package.json +++ b/core/webgl-compatibility/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/webgl-compatibility", "version": "3.0.0-dev.138", - "description": "APIs for determining the level of compatibility of a browser+device with the iModel.js rendering system.", + "description": "APIs for determining the level of compatibility of a browser+device with the iTwin.js rendering system.", "license": "MIT", "main": "lib/cjs/webgl-compatibility.js", "module": "lib/esm/webgl-compatibility.js", @@ -61,4 +61,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/core/webgl-compatibility/src/webgl-compatibility.ts b/core/webgl-compatibility/src/webgl-compatibility.ts index 7309cd9613e7..56761276faeb 100644 --- a/core/webgl-compatibility/src/webgl-compatibility.ts +++ b/core/webgl-compatibility/src/webgl-compatibility.ts @@ -6,10 +6,10 @@ export * from "./Capabilities"; export * from "./RenderCompatibility"; /** @docs-package-description - * The webgl-compatibility package provides APIs for determining the level of compatibility of a browser+device with the iModel.js rendering system. + * The webgl-compatibility package provides APIs for determining the level of compatibility of a browser+device with the iTwin.js rendering system. */ /** * @docs-group-description Compatibility - * APIs for evaluating compatibility with the iModel.js rendering system. + * APIs for evaluating compatibility with the iTwin.js rendering system. */ diff --git a/docs/changehistory/NextVersion.md b/docs/changehistory/NextVersion.md index c8d148045b08..470931ee7bd3 100644 --- a/docs/changehistory/NextVersion.md +++ b/docs/changehistory/NextVersion.md @@ -234,7 +234,7 @@ The [AsyncFunction]($core-bentley), [AsyncMethodsOf]($core-bentley), and [Promis ## Continued transition to `ChangesetIndex` -Every Changeset has both an Id (a string hash of its content and parent changeset) and an Index (a small integer representing its relative position on the iModel's timeline.) Either value can be used to uniquely identify a changeset. However, it is often necessary to compare two changeset identifiers to determine relative order, or to supply a range of changesets of interest. In this case, Id is not useful and must be converted to an index via a round-trip to an iModelHub server. Unfortunately, much of the iModel.js api uses only [ChangesetId]($common) to identify a changeset. That was unfortunate, since [ChangesetIndex]($common) is frequently needed and `ChangesetId` is rarely useful. For this reason we are migrating the api to prefer `ChangesetIndex` over several releases. +Every Changeset has both an Id (a string hash of its content and parent changeset) and an Index (a small integer representing its relative position on the iModel's timeline.) Either value can be used to uniquely identify a changeset. However, it is often necessary to compare two changeset identifiers to determine relative order, or to supply a range of changesets of interest. In this case, Id is not useful and must be converted to an index via a round-trip to an iModelHub server. Unfortunately, much of the iTwin.js API uses only [ChangesetId]($common) to identify a changeset. That was unfortunate, since [ChangesetIndex]($common) is frequently needed and `ChangesetId` is rarely useful. For this reason we are migrating the API to prefer `ChangesetIndex` over several releases. In version 2.19, we introduced the type [ChangesetIdWithIndex]($common) to begin that migration. However, for 2.x compatibility we could not use it several places where it would have been helpful: diff --git a/docs/learning/App.md b/docs/learning/App.md index d97a09bc91e7..395df233e195 100644 --- a/docs/learning/App.md +++ b/docs/learning/App.md @@ -15,7 +15,7 @@ iModel agents and services are apps that have no interactive user interface. The Agents and services are [backend](../learning/Glossary.md#Backend) code. Their main concern is to access and process the content of iModels. They use [briefcases](../learning/Glossary.md#Briefcase) to access iModels. -Agents and services are written in TypeScript and depend on the `@itwin/core-backend` package. They may also depend on utility packages such as imodeljs-common, bentleyjs-core, or geometry-core. They frequently also use third-party JavaScript packages, as well as the services built into Node.js. +Agents and services are written in TypeScript and depend on the `@itwin/core-backend` package. They may also depend on utility packages such as `@itwin/core-common`, `@itwin/core-bentley`, or `@itwin/core-geometry`. They frequently also use third-party JavaScript packages, as well as the services built into Node.js. Agents and Services use [logging](../learning/common/Logging.md) to enable users to monitor their operations and to help with diagnosing problems. @@ -79,7 +79,7 @@ An app can use a pre-existing or general-purpose [service](#imodel-services) as An app may require data-access operations that are specific to and intrinsically part of the app. One reason is performance. An analysis that must make many related queries on iModel content, perhaps based on knowledge of a domain schema, to produce a single, combined result should be done close to the data. Another reason for app-specific backends is the [backends-for-frontends pattern](./AppTailoring.md#backends-for-frontends). App-specific backends are easy to write using [RpcInterfaces](./RpcInterface.md) and are encouraged. -App-specific backends are written in TypeScript/JavaScript and depend on `@itwin/core-backend`. A backend may also depend on common packages such as imodeljs-common, bentleyjs-core, or geometry-core. See [backend portability](../learning/Portability.md#backend-portability). +App-specific backends are written in TypeScript/JavaScript and depend on `@itwin/core-backend`. A backend may also depend on common packages such as `@itwin/core-common`, `@itwin/core-bentley`, or `@itwin/core-geometry`. See [backend portability](../learning/Portability.md#backend-portability). An app can use many services, both general-purpose and app-specific. @@ -91,6 +91,6 @@ The UI-specific part of an app is called the [frontend](https://en.wikipedia.org The frontend is written in TypeScript or JavaScript. The frontend should use Web technologies only, including HTML, CSS, and JavaScript. The frontend can use any Web app framework, such as React or Angular. -The frontend makes requests on backend services to access iModel content. The frontend uses [RpcInterfaces](./RpcInterface.md) to communicate with the app's backend(s) and other services. The frontend should depend on `@itwin/core-frontend`. The frontend may also depend on common packages such as imodeljs-common, bentleyjs-core, or geometry-core. It may also depend on Web-specific packages. Both the UI and functionality of the app frontend [can be tailored](./AppTailoring.md) to best fit each desired configuration and target platform. +The frontend makes requests on backend services to access iModel content. The frontend uses [RpcInterfaces](./RpcInterface.md) to communicate with the app's backend(s) and other services. The frontend should depend on `@itwin/core-frontend`. The frontend may also depend on common packages such as `@itwin/core-common`, `@itwin/core-bentley`, or `@itwin/core-geometry`. It may also depend on Web-specific packages. Both the UI and functionality of the app frontend [can be tailored](./AppTailoring.md) to best fit each desired configuration and target platform. See [the learning article](./frontend/index.md) for how to write a frontend. diff --git a/docs/learning/Capabilities.md b/docs/learning/Capabilities.md index 61fd75537802..0c179130759d 100644 --- a/docs/learning/Capabilities.md +++ b/docs/learning/Capabilities.md @@ -342,11 +342,11 @@ Desktop and Mobile device Web browsers. ## Further Resources -- [GitHub](https://github.com/iTwin/itwinjs-core): the imodeljs repository along with samples. +- [GitHub](https://github.com/iTwin/itwinjs-core): the iTwin.js Core repository. - [Documentation](https://www.itwinjs.org/learning/): - Learning articles: explaining the iTwin.js library structure and architecture. - BIS docs: for understanding BIS schemas and the ECSql data query language. - - API reference: can be used in conjunction with the imodeljs repository above to find code samples for API calls. Function/Class names can be searched within the repository to find relevant samples. + - API reference: can be used in conjunction with the iTwin.js Core repository above to find code samples for API calls. Function/Class names can be searched within the repository to find relevant samples. - [Stack Overflow](https://stackoverflow.com/questions/tagged/imodeljs): don't forget to add the **imodeljs** tag to your question. This will make it easier for us to respond. - [YouTube Channel](https://www.youtube.com/channel/UCs4HxiWI4o4bzayG5QnxaIA): Informational videos for guidance and training. - Sample Apps: can be used as a starting point for your app. diff --git a/docs/learning/CommunityResources.md b/docs/learning/CommunityResources.md index 93d45a164b5a..e34115b5e5d5 100644 --- a/docs/learning/CommunityResources.md +++ b/docs/learning/CommunityResources.md @@ -10,7 +10,7 @@ The iTwin.js development team closely monitors our GitHub: - [Enhancement Requests](https://github.com/iTwin/itwinjs-core/labels/enhancement) - [Bug Reports](https://github.com/iTwin/itwinjs-core/labels/bug) -See the [CONTRIBUTING.md](https://github.com/iTwin/itwinjs-core/blob/master/CONTRIBUTING.md) in the root of the imodeljs repository for additional instructions. +See the [CONTRIBUTING.md](https://github.com/iTwin/itwinjs-core/blob/master/CONTRIBUTING.md) in the root of the iTwin.js Core repository for additional instructions. ### Questions and Advice diff --git a/docs/learning/Portability.md b/docs/learning/Portability.md index 64261e52b450..1592c69d0994 100644 --- a/docs/learning/Portability.md +++ b/docs/learning/Portability.md @@ -63,9 +63,9 @@ For example, a backend can use node builtins in guarded code, like this: ### Avoiding Node.js dependencies -A backend can use the following portable imodeljs-backend classes to avoid unnecessary node dependencies: +A backend can use the following portable `@itwin/core-backend` classes to avoid unnecessary node dependencies: -|Node builtin|imodeljs-backend portable substitute| +|Node builtin|portable substitute| |---|---| |fs|[IModelJsFs]($backend) |os|[Platform]($backend) @@ -75,7 +75,7 @@ A backend can use the following portable imodeljs-backend classes to avoid unnec |console|[Logger]($bentley) |path|[path](#path)| -In most cases, the imodeljs-backend substitutes do *not* provide all of the properties of the node global. That is by design, as not all of the features offered by node are portable. +In most cases, the substitutes do *not* provide all of the properties of the node global. That is by design, as not all of the features offered by node are portable. #### path diff --git a/docs/learning/backend/AccessingIModels.md b/docs/learning/backend/AccessingIModels.md index 673d06585b3b..f533766026af 100644 --- a/docs/learning/backend/AccessingIModels.md +++ b/docs/learning/backend/AccessingIModels.md @@ -49,4 +49,4 @@ The `@bentley/imodeljs-native` module is written in C++, is delivered as a platf `@bentley/imodeljs-native` implements the authentication and access enforcement expressed by iModel owners for (non-Snapshot) iModels. User authentication and access rights are a service of Bentley Systems, as a part of if its iTwin Services offerings. Bentley may also license third parties to supply similar services. **This is Bentley Systems' commercial motivation for creating iTwin.js**. Any attempt to circumvent or disrupt this checking is a violation of the [license agreement](https://github.com/iTwin/itwinjs-core/blob/master/core/backend/src/imodeljs-native-LICENSE.md). -> Note that only the imodeljs-backend module has a dependency on imodeljs-native. Frontend applications do not require a right-to-run (the iTwin.js libraries are MIT Licensed), though they may connect to a backend that does. +> Note that only the `@itwin/core-backend` module has a dependency on imodeljs-native. Frontend applications do not require a right-to-run (the iTwin.js libraries are MIT Licensed), though they may connect to a backend that does. diff --git a/docs/learning/backend/CrashReporting.md b/docs/learning/backend/CrashReporting.md index 88a2430f14f4..293c7bb922ca 100644 --- a/docs/learning/backend/CrashReporting.md +++ b/docs/learning/backend/CrashReporting.md @@ -13,7 +13,7 @@ See [CrashReportingConfig]($backend) for all of the options. ## Native-Code Crashes -An unhandled exception in the native-code portion of imodeljs-backend or any addon will cause the backend program to terminate prematurely. The backend can cause a crash dump to be written in such an event. A crash dump contains information about what native code was running at the time of the crash, including native call stacks for all threads, and may also contain a copy of the contents of memory. +An unhandled exception in the native-code portion of `@itwin/core-backend` or any addon will cause the backend program to terminate prematurely. The backend can cause a crash dump to be written in such an event. A crash dump contains information about what native code was running at the time of the crash, including native call stacks for all threads, and may also contain a copy of the contents of memory. diff --git a/docs/learning/ui/core/ContextMenu.md b/docs/learning/ui/core/ContextMenu.md index 00d8d886e561..c11e04256515 100644 --- a/docs/learning/ui/core/ContextMenu.md +++ b/docs/learning/ui/core/ContextMenu.md @@ -13,7 +13,7 @@ The [PopupContextMenu]($core-react) React component displays a ContextMenu withi These lower level components can be used to display a context menu. However, there is an easier API to use: IModelApp.uiAdmin.showContextMenu. UiAdmin.showContextMenu will show a context menu at a particular location. -[UiAdmin]($appui-abstract) controls various UI components and is callable from IModelApp.uiAdmin in the imodeljs-frontend package. +[UiAdmin]($appui-abstract) controls various UI components and is callable from `IModelApp.uiAdmin` in the `@itwin/core-frontend` package. UiAdmin.showContextMenu uses the [ContextMenu]($core-react:ContextMenu) components to display the context menu. ### Menu Items diff --git a/docs/learning/ui/index.md b/docs/learning/ui/index.md index fa56d931b4f5..dd7c0bb938f9 100644 --- a/docs/learning/ui/index.md +++ b/docs/learning/ui/index.md @@ -15,7 +15,7 @@ The iTwin.js UI library is divided into these NPM packages in the `@bentley` sco |[ui‑abstract](./abstract/index)|Abstractions for UI controls and items, such as Toolbar, Button, Menu, Backstage, StatusBar and Widget. |[ui‑core](./core/index)|General purpose React components, such as Input, Button, Dialog, MessageBox, SearchBox, RadialMenu and SplitButton. |[ui‑components](./components/index)|React components that are data-oriented, such as PropertyGrid, Table and Tree. -|[ui‑imodel‑components](./imodel-components/index)|React components that depend on the imodeljs-frontend, imodeljs-common or imodeljs-quantity packages. The components pertain to Color, Cube, LineWeight, Navigation Aids, Quantity Inputs, Timeline and Viewport. +|[ui‑imodel‑components](./imodel-components/index)|React components that depend on the `@itwin/core-frontend`, `@itwin/core-common` or `@itwin/core-quantity` packages. The components pertain to Color, Cube, LineWeight, Navigation Aids, Quantity Inputs, Timeline and Viewport. |[ui‑framework](./framework/index)|Classes and components for specifying the application UI consisting of the Backstage, Frontstages, Content Views, Tool Bars, Status Bars, Widgets and Panels. See also: diff --git a/editor/backend/package.json b/editor/backend/package.json index 3b4fad198536..fec8c6b3e1c1 100644 --- a/editor/backend/package.json +++ b/editor/backend/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/editor-backend", "version": "3.0.0-dev.138", - "description": "iModel.js editor backend", + "description": "iTwin.js editor backend", "main": "lib/cjs/editor-backend.js", "typings": "lib/cjs/editor-backend", "license": "MIT", @@ -64,4 +64,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/editor/common/package.json b/editor/common/package.json index 4a54a7ce2b05..ffac790d83be 100644 --- a/editor/common/package.json +++ b/editor/common/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/editor-common", "version": "3.0.0-dev.138", - "description": "iModel.js editing properties common to frontend and backend", + "description": "iTwin.js editing properties common to frontend and backend", "main": "lib/cjs/editor-common.js", "module": "lib/esm/editor-common.js", "typings": "lib/cjs/editor-common", @@ -61,4 +61,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/editor/frontend/package.json b/editor/frontend/package.json index 83b774d4f1a2..2867bf2722a8 100644 --- a/editor/frontend/package.json +++ b/editor/frontend/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/editor-frontend", "version": "3.0.0-dev.138", - "description": "iModel.js frontend components", + "description": "iTwin.js frontend components", "main": "lib/cjs/editor-frontend.js", "module": "lib/esm/editor-frontend.js", "typings": "lib/cjs/editor-frontend", @@ -71,4 +71,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/full-stack-tests/core/src/backend/IModelBankBackendCloudEnv.ts b/full-stack-tests/core/src/backend/IModelBankBackendCloudEnv.ts index 9dd5c40c2efa..46da1b129cf9 100644 --- a/full-stack-tests/core/src/backend/IModelBankBackendCloudEnv.ts +++ b/full-stack-tests/core/src/backend/IModelBankBackendCloudEnv.ts @@ -20,7 +20,6 @@ export const assetsPath = `${__dirname}/../../../lib/test/assets/`; export const workDir = `${__dirname}/../../../lib/test/output/`; // To run tests with imodel-bank integration: -// set NODE_EXTRA_CA_CERTS=D:\dev\imodeljs\full-stack-tests\rpc\local_dev_server.crt // set IMJS_TEST_IMODEL_BANK to true to run tests with imodel-bank. Then either: // set IMJS_TEST_IMODEL_BANK_URL to specify the url to locally deployed orchestrator // or set the following so the tests would deploy a local orchestrator themselves: diff --git a/full-stack-tests/ecschema-rpc-interface/src/frontend/setup/TestContext.ts b/full-stack-tests/ecschema-rpc-interface/src/frontend/setup/TestContext.ts index 8cf2e17a24ab..3e69891a1c3a 100644 --- a/full-stack-tests/ecschema-rpc-interface/src/frontend/setup/TestContext.ts +++ b/full-stack-tests/ecschema-rpc-interface/src/frontend/setup/TestContext.ts @@ -48,7 +48,7 @@ export class TestContext { // Print out the configuration console.log(this.settings.toString()); // eslint-disable-line - // Configure iModel.js frontend logging to go to the console + // Configure iTwin.js frontend logging to go to the console Logger.initializeToConsole(); Logger.setLevelDefault(this.settings.logLevel === undefined ? LogLevel.Warning : this.settings.logLevel); diff --git a/full-stack-tests/ecschema-rpc-interface/src/test/backend.ts b/full-stack-tests/ecschema-rpc-interface/src/test/backend.ts index 4e6e9a0c7b54..31c142275846 100644 --- a/full-stack-tests/ecschema-rpc-interface/src/test/backend.ts +++ b/full-stack-tests/ecschema-rpc-interface/src/test/backend.ts @@ -3,7 +3,7 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -// Sets up a local backend to be used for testing within the iModel.js repo. +// Sets up a local backend to be used for testing within the iTwin.js Core repo. import * as path from "path"; import { IModelJsExpressServer } from "@itwin/express-server"; diff --git a/full-stack-tests/ecschema-rpc-interface/template.env b/full-stack-tests/ecschema-rpc-interface/template.env index 0060f4124ad7..f60a8be2a4c4 100644 --- a/full-stack-tests/ecschema-rpc-interface/template.env +++ b/full-stack-tests/ecschema-rpc-interface/template.env @@ -20,7 +20,7 @@ USER_WITH_ACCESS_PASSWORD=#{USER_WITH_ACCESS_PASSWORD}# # REQUIRED: OIDC Client Information ## One can be created by going to https://developer.bentley.com/register/ OIDC_CLIENT_ID=#{OIDC_CLIENT_ID}# -# The scopes must be a space separated list of scopes, i.e. "openid imodelhub context-registry-service imodeljs-router". +# The scopes must be a space separated list of scopes, i.e. "openid itwinjs". OIDC_SCOPES=#{OIDC_SCOPES}# # REQUIRED: iModel Information diff --git a/full-stack-tests/imodelhub-client/src/imodelhub/IModelBankCloudEnv.ts b/full-stack-tests/imodelhub-client/src/imodelhub/IModelBankCloudEnv.ts index ae1e9f94ecbe..985f4d61d167 100644 --- a/full-stack-tests/imodelhub-client/src/imodelhub/IModelBankCloudEnv.ts +++ b/full-stack-tests/imodelhub-client/src/imodelhub/IModelBankCloudEnv.ts @@ -18,7 +18,6 @@ import { TestIModelHubOidcAuthorizationClient } from "../TestIModelHubOidcAuthor import { AuthorizationClient } from "@itwin/core-common"; // To run tests with imodel-bank integration: -// set NODE_EXTRA_CA_CERTS=D:\dev\imodeljs\full-stack-tests\rpc\local_dev_server.crt // set IMJS_TEST_IMODEL_BANK to true to run tests with imodel-bank. Then either: // set IMJS_TEST_IMODEL_BANK_URL to specify the url to locally deployed orchestrator // or set the following so the tests would deploy a local orchestrator themselves: diff --git a/full-stack-tests/rpc-interface/package.json b/full-stack-tests/rpc-interface/package.json index c40f64b10428..0e8dc8a7fac3 100644 --- a/full-stack-tests/rpc-interface/package.json +++ b/full-stack-tests/rpc-interface/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/rpcinterface-full-stack-tests", "version": "3.0.0-dev.138", - "description": "Test the full iModel.js stack (frontend and backend) using standard RPC interfaces", + "description": "Test the full iTwin.js Core stack (frontend and backend) using standard RPC interfaces", "license": "MIT", "scripts": { "build": "tsc 1>&2 && npm run -s webpack:frontend", @@ -25,7 +25,7 @@ "keywords": [ "Bentley", "Presentation", - "iModelJS", + "iTwin.js", "Testing" ], "author": { @@ -81,4 +81,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/full-stack-tests/rpc-interface/src/frontend/DevToolsRpc.test.ts b/full-stack-tests/rpc-interface/src/frontend/DevToolsRpc.test.ts index 6b4e61708181..b9d48f9c480f 100644 --- a/full-stack-tests/rpc-interface/src/frontend/DevToolsRpc.test.ts +++ b/full-stack-tests/rpc-interface/src/frontend/DevToolsRpc.test.ts @@ -53,6 +53,6 @@ describe("DevTools", () => { it("can get the versions", async () => { const versions = await devTools.versions(); assert.isDefined(versions.application); - assert.isDefined(versions.iModelJs); + assert.isDefined(versions.iTwinJs); }); }); diff --git a/full-stack-tests/rpc-interface/src/frontend/setup/TestContext.ts b/full-stack-tests/rpc-interface/src/frontend/setup/TestContext.ts index f8810db9b733..5861503565f1 100644 --- a/full-stack-tests/rpc-interface/src/frontend/setup/TestContext.ts +++ b/full-stack-tests/rpc-interface/src/frontend/setup/TestContext.ts @@ -57,7 +57,7 @@ export class TestContext { // Print out the configuration console.log(this.settings.toString()); - // Configure iModel.js frontend logging to go to the console + // Configure iTwin.js frontend logging to go to the console Logger.initializeToConsole(); Logger.setLevelDefault(this.settings.logLevel === undefined ? LogLevel.Warning : this.settings.logLevel); diff --git a/full-stack-tests/rpc-interface/src/test/backend.ts b/full-stack-tests/rpc-interface/src/test/backend.ts index 0300da9b857b..edcfc1d8e1bf 100644 --- a/full-stack-tests/rpc-interface/src/test/backend.ts +++ b/full-stack-tests/rpc-interface/src/test/backend.ts @@ -3,7 +3,7 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -// Sets up a local backend to be used for testing within the iModel.js repo. +// Sets up a local backend to be used for testing within the iTwin.js Core repo. import * as path from "path"; import { IModelHubBackend } from "@bentley/imodelhub-client/lib/cjs/imodelhub-node"; diff --git a/presentation/backend/package.json b/presentation/backend/package.json index 79c634835731..f4a38e84d2ec 100644 --- a/presentation/backend/package.json +++ b/presentation/backend/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/presentation-backend", "version": "3.0.0-dev.138", - "description": "Backend of iModel.js Presentation library", + "description": "Backend of iTwin.js Presentation library", "license": "MIT", "repository": { "type": "git", @@ -11,7 +11,8 @@ "Bentley", "EC", "Presentation", - "iModelJS", + "iTwin", + "iTwin.js", "Backend" ], "author": { @@ -96,4 +97,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/presentation/common/package.json b/presentation/common/package.json index 79f28ed510ae..a611a98c286d 100644 --- a/presentation/common/package.json +++ b/presentation/common/package.json @@ -12,7 +12,7 @@ "Bentley", "EC", "Presentation", - "iModelJS" + "iTwin.js" ], "author": { "name": "Bentley Systems, Inc.", @@ -96,4 +96,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/presentation/common/src/presentation-common/KeySet.ts b/presentation/common/src/presentation-common/KeySet.ts index 8c0eb998c14b..53cf59791d54 100644 --- a/presentation/common/src/presentation-common/KeySet.ts +++ b/presentation/common/src/presentation-common/KeySet.ts @@ -13,7 +13,7 @@ import { PresentationError, PresentationStatus } from "./Error"; import { NodeKey, NodeKeyJSON } from "./hierarchy/Key"; /** - * A single key that identifies something in iModel.js application + * A single key that identifies something in an iTwin.js application * @public */ export type Key = Readonly | Readonly | Readonly; diff --git a/presentation/components/package.json b/presentation/components/package.json index f437af42491b..6aabaa802925 100644 --- a/presentation/components/package.json +++ b/presentation/components/package.json @@ -1,7 +1,7 @@ { "name": "@itwin/presentation-components", "version": "3.0.0-dev.138", - "description": "React components based on iModel.js Presentation library", + "description": "React components based on iTwin.js Presentation library", "main": "lib/cjs/presentation-components.js", "module": "lib/esm/presentation-components.js", "typings": "lib/cjs/presentation-components", @@ -15,7 +15,8 @@ "Bentley", "EC", "Presentation", - "iModelJS", + "iTwin", + "iTwin.js", "Frontend", "React", "Component" @@ -124,4 +125,4 @@ ], "extends": "plugin:@itwin/ui" } -} +} \ No newline at end of file diff --git a/presentation/frontend/package.json b/presentation/frontend/package.json index 095c4b8332a7..370cd8fcf51d 100644 --- a/presentation/frontend/package.json +++ b/presentation/frontend/package.json @@ -15,7 +15,7 @@ "Bentley", "EC", "Presentation", - "iModelJS", + "iTwin.js", "Frontend" ], "author": { @@ -95,4 +95,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/presentation/testing/package.json b/presentation/testing/package.json index 783890a3fb82..daf2ebac9a21 100644 --- a/presentation/testing/package.json +++ b/presentation/testing/package.json @@ -10,7 +10,7 @@ "keywords": [ "Bentley", "Presentation", - "iModelJS", + "iTwin.js", "Testing" ], "author": { @@ -94,4 +94,4 @@ ], "extends": "plugin:@itwin/itwinjs-recommended" } -} +} \ No newline at end of file diff --git a/test-apps/display-performance-test-app/src/backend/WebMain.ts b/test-apps/display-performance-test-app/src/backend/WebMain.ts index 973e5c03cc5f..33420cee9ad8 100644 --- a/test-apps/display-performance-test-app/src/backend/WebMain.ts +++ b/test-apps/display-performance-test-app/src/backend/WebMain.ts @@ -86,7 +86,7 @@ function startWebServer() { app.get("/v3/swagger.json", (req, res) => cloudConfig.protocol.handleOpenApiDescriptionRequest(req, res)); app.post("*", async (req, res) => cloudConfig.protocol.handleOperationPostRequest(req, res)); app.get(/\/imodel\//, async (req, res) => cloudConfig.protocol.handleOperationGetRequest(req, res)); - app.use("*", (_req, res) => { res.send("

IModelJs RPC Server

"); }); + app.use("*", (_req, res) => { res.send("

iTwin.js RPC Server

"); }); // --------------------------------------------- // Run the server... diff --git a/test-apps/display-test-app/README.md b/test-apps/display-test-app/README.md index 8c77fde2fb04..8e62b83119b5 100644 --- a/test-apps/display-test-app/README.md +++ b/test-apps/display-test-app/README.md @@ -13,7 +13,7 @@ The application contained within this directory provides a test environment for * Assets (images, icons, fonts) * frontend/ * The main application body of code that runs on initialization of the Electron app, as well setting up event handlers for parts of the UI - * Extended API functionality build on top of the imodeljs-core frontend dependency + * Extended API functionality build on top of the `@itwin/core-frontend` dependency * backend/ * Specifications for initializing the Electron application, as well as event handlers for Electron events. @@ -105,8 +105,8 @@ For the backend, restart the debugger config to pick up the changes. ## Dependencies * Installed dependencies for display-test-app may be found in the generated node_modules directory. Since display-test-app is but a part of a larger monorepo, the dependencies here are provided as symlinks into a master node_modules directory managed by the build tool Rush. -* Any changes made to imodeljs-core files outside of this directory will not immediately be reflected in display-test-app. The entire imodeljs-core monorepo must be rebuilt in order for changes to take effect. -* If dependencies have changed after pulling the most recent version of imodeljs-core, it is often necessary to do a clean reinstall of all dependencies in order to avoid build errors. +* Any changes made to itwinjs-core files outside of this directory will not immediately be reflected in display-test-app. The entire monorepo must be rebuilt in order for changes to take effect. +* If dependencies have changed after pulling the most recent version of the repo, it is often necessary to do a clean reinstall of all dependencies in order to avoid build errors. ```cmd rush install -c @@ -193,7 +193,7 @@ You can use these environment variables to alter the default behavior of various ## Key-ins -display-test-app has access to all key-ins defined in the imodeljs-frontend and frontend-devtools packages. It also provides the following additional key-ins. The windowId of a viewport is an integer shown inside brackets in the viewport's title bar. +display-test-app has access to all key-ins defined in the `@itwin/core-frontend` and `@itwin/frontend-devtools` packages. It also provides the following additional key-ins. The windowId of a viewport is an integer shown inside brackets in the viewport's title bar. * `win resize` width height *windowId* - resize the content area of the specified of focused window to specified width and height. * `win focus` windowId - give focus to the specified window. @@ -257,7 +257,7 @@ Using an editing scope is optional, but outside of a scope, the viewport's graph ### Editing key-ins -display-test-app has access to all key-ins defined in the imodeljs-editor-frontend package. It also provides the following additional key-ins. +display-test-app has access to all key-ins defined in the `@itwin/editor-frontend` package. It also provides the following additional key-ins. * `dta edit` - begin a new editing scope, or end the current editing scope. The title of the window or browser tab will update to reflect the current state: "[R/W]" indicating no current editing scope, or "[EDIT]" indicating an active editing scope. * `dta place line string` - start placing a line string. Each data point defines another point in the string; a reset (right mouse button) finishes. The element is placed into the first spatial model and spatial category in the viewport's model and category selectors. diff --git a/test-apps/display-test-app/android/README.md b/test-apps/display-test-app/android/README.md index fb7b30534c4b..70501a0ac14d 100644 --- a/test-apps/display-test-app/android/README.md +++ b/test-apps/display-test-app/android/README.md @@ -1,4 +1,4 @@ -# imodeljs-test-app +# Display Test App ## Prerequisites diff --git a/test-apps/display-test-app/src/backend/DtaElectronMain.ts b/test-apps/display-test-app/src/backend/DtaElectronMain.ts index 36bd34033d8a..13ac4add0d82 100644 --- a/test-apps/display-test-app/src/backend/DtaElectronMain.ts +++ b/test-apps/display-test-app/src/backend/DtaElectronMain.ts @@ -39,8 +39,8 @@ class DtaHandler extends IpcHandler implements DtaIpcInterface { /** * This is the function that gets called when we start display-test-app via `electron DtaElectronMain.js` from the command line. - * It runs in the Electron main process and hosts the iModeljs backend (IModelHost) code. It starts the render (frontend) process - * that starts from the file "index.ts". That launches the iModel.js frontend (IModelApp). + * It runs in the Electron main process and hosts the iTwin.js backend (IModelHost) code. It starts the render (frontend) process + * that starts from the file "index.ts". That launches the iTwin.js frontend (IModelApp). */ const dtaElectronMain = async () => { // Need to load the config first to get the electron options diff --git a/test-apps/display-test-app/src/backend/SetToStandalone.ts b/test-apps/display-test-app/src/backend/SetToStandalone.ts index 8af83c4a8724..e84d2a939cab 100644 --- a/test-apps/display-test-app/src/backend/SetToStandalone.ts +++ b/test-apps/display-test-app/src/backend/SetToStandalone.ts @@ -32,7 +32,7 @@ function log(msg: string) { * * To run: ``` - cd imodeljs\test-apps\display-test-app + cd test-apps\display-test-app npm run build:backend node lib\backend\SetToStandalone.js [iModel-filename] ``` diff --git a/test-apps/display-test-app/src/backend/WebMain.ts b/test-apps/display-test-app/src/backend/WebMain.ts index 81612eb60a95..51dd0e237d4e 100644 --- a/test-apps/display-test-app/src/backend/WebMain.ts +++ b/test-apps/display-test-app/src/backend/WebMain.ts @@ -65,7 +65,7 @@ const dtaWebMain = (async () => { fallthrough: false, index: false, })); - app.use("*", (_req: any, res: any) => { res.send("

IModelJs RPC Server

"); }); + app.use("*", (_req: any, res: any) => { res.send("

iTwin.js RPC Server

"); }); // --------------------------------------------- // Run the server... diff --git a/test-apps/imodel-transformer/.env.template b/test-apps/imodel-transformer/.env.template index b5cd196e1482..e67cf70cd385 100644 --- a/test-apps/imodel-transformer/.env.template +++ b/test-apps/imodel-transformer/.env.template @@ -1,6 +1,6 @@ # imodel transformer test app environment variables -# you must configure an app, you can follow the instructions here: -# https://github.com/imodeljs/imodeljs-samples/blob/master/README.md#interactive-app-development-setup +# you must configure an app, you can follow the instructions here to get the information required: +# https://www.itwinjs.org/learning/tutorials/develop-desktop-viewer/#setup IMJS_OIDC_ELECTRON_TEST_CLIENT_ID= IMJS_OIDC_ELECTRON_TEST_REDIRECT_URI= diff --git a/test-apps/presentation-test-app/public/index.html b/test-apps/presentation-test-app/public/index.html index b832786a0b92..5a2d4e095288 100644 --- a/test-apps/presentation-test-app/public/index.html +++ b/test-apps/presentation-test-app/public/index.html @@ -20,7 +20,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - iModel.js Presentation Test App + iTwin.js Presentation Test App diff --git a/test-apps/presentation-test-app/public/manifest.json b/test-apps/presentation-test-app/public/manifest.json index a1322bc62e3f..68bd85ab7bc2 100644 --- a/test-apps/presentation-test-app/public/manifest.json +++ b/test-apps/presentation-test-app/public/manifest.json @@ -1,6 +1,6 @@ { "short_name": "PresentationTestApp", - "name": "iModel.js Presentation Test App", + "name": "iTwin.js Presentation Test App", "icons": [ { "src": "favicon.ico", @@ -12,4 +12,4 @@ "display": "standalone", "theme_color": "#000000", "background_color": "#ffffff" -} +} \ No newline at end of file diff --git a/test-apps/ui-items-providers-test/src/ui/dialogs/UnitsPopup.ts b/test-apps/ui-items-providers-test/src/ui/dialogs/UnitsPopup.ts index 8822b2d9b2af..f4d32ed52c23 100644 --- a/test-apps/ui-items-providers-test/src/ui/dialogs/UnitsPopup.ts +++ b/test-apps/ui-items-providers-test/src/ui/dialogs/UnitsPopup.ts @@ -12,7 +12,7 @@ import { import { UiItemsProvidersTest } from "../../ui-items-providers-test"; /** UnitsPopup is a modal dialog with only one DialogItem. It is intended to be a very basic example of using DialogItem interfaces and the DialogLayoutDataProvider to create React UI - * in an iModel.js app and to apply changes only when the user hits the OK button. + * in an iTwin.js app and to apply changes only when the user hits the OK button. */ export class UnitsPopupUiDataProvider extends DialogLayoutDataProvider { constructor() { diff --git a/test-apps/ui-test-app/public/index.html b/test-apps/ui-test-app/public/index.html index 5f41375c29ec..39c7b6ed1f2b 100644 --- a/test-apps/ui-test-app/public/index.html +++ b/test-apps/ui-test-app/public/index.html @@ -11,7 +11,7 @@ --> - iModel.js UI Test App + iTwin.js UI Test App