Skip to content

Commit

Permalink
Merge branch 'main' into raplemie/ciUpdates
Browse files Browse the repository at this point in the history
  • Loading branch information
calebmshafer committed Nov 10, 2023
2 parents 3e61ef3 + 1769af0 commit 5d67777
Show file tree
Hide file tree
Showing 19 changed files with 482 additions and 74 deletions.

This file was deleted.

54 changes: 51 additions & 3 deletions common/config/rush/pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion packages/apps/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@itwin/create-imodel-react": "^1.0.0",
"@itwin/delete-imodel-react": "^1.0.0",
"@itwin/delete-itwin-react": "^1.0.0",
"@itwin/imodel-browser-react": "~1.0.1",
"@itwin/imodel-browser-react": "~1.1.1",
"@itwin/itwinui-react": "^2.11.4",
"@itwin/manage-versions-react": "~1.0.0",
"@itwin/storybook-auth-addon": "^0.1.0",
Expand Down
27 changes: 27 additions & 0 deletions packages/modules/imodel-browser/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
{
"name": "@itwin/imodel-browser-react",
"entries": [
{
"version": "1.1.1",
"tag": "@itwin/imodel-browser-react_v1.1.1",
"date": "Thu, 14 Sep 2023 16:51:06 GMT",
"comments": {
"patch": [
{
"comment": "Adding default iModel thumbnail for iModel grids in case API fails."
}
]
}
},
{
"version": "1.1.0",
"tag": "@itwin/imodel-browser-react_v1.1.0",
"date": "Thu, 07 Sep 2023 20:13:33 GMT",
"comments": {
"minor": [
{
"comment": "Ability to limit iModel tiles"
},
{
"comment": "Added table view for itwin grid"
}
]
}
},
{
"version": "1.0.1",
"tag": "@itwin/imodel-browser-react_v1.0.1",
Expand Down
17 changes: 16 additions & 1 deletion packages/modules/imodel-browser/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Change Log - @itwin/imodel-browser-react

This log was last generated on Wed, 02 Aug 2023 21:41:58 GMT and should not be manually modified.
This log was last generated on Thu, 14 Sep 2023 16:51:06 GMT and should not be manually modified.

## 1.1.1
Thu, 14 Sep 2023 16:51:06 GMT

### Patches

- Adding default iModel thumbnail for iModel grids in case API fails.

## 1.1.0
Thu, 07 Sep 2023 20:13:33 GMT

### Minor changes

- Ability to limit iModel tiles
- Added table view for itwin grid

## 1.0.1
Wed, 02 Aug 2023 21:41:58 GMT
Expand Down
6 changes: 5 additions & 1 deletion packages/modules/imodel-browser/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
* See LICENSE.md in the project root for license terms and full copyright notice.
*--------------------------------------------------------------------------------------------*/
module.exports = {
roots: ["<rootDir>/src"],
transform: {
Expand All @@ -9,7 +13,7 @@ module.exports = {
],
moduleNameMapper: {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|svg?.+)$":
"<rootDir>/src/tests/mocks/fileMock.js",
"<rootDir>/src/tests/mocks/fileMock.ts",
"\\.(css|less|scss|sass)$": "identity-obj-proxy",
},
verbose: true,
Expand Down
17 changes: 9 additions & 8 deletions packages/modules/imodel-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@itwin/imodel-browser-react",
"description": "Components that let the user browse the iModels of a context and select one.",
"repository": "https://github.com/iTwin/admin-components-react/tree/main/packages/modules/imodel-browser",
"version": "1.0.1",
"version": "1.1.1",
"main": "cjs/index.js",
"module": "esm/index.js",
"types": "cjs/index.d.ts",
Expand Down Expand Up @@ -36,47 +36,48 @@
},
"devDependencies": {
"@rollup/plugin-commonjs": "~17.1.0",
"@rollup/plugin-url": "^8.0.1",
"@svgr/rollup": "^5.5.0",
"@testing-library/react-hooks": "^5.1.0",
"@testing-library/react": "^11.1.0",
"@testing-library/react-hooks": "^5.1.0",
"@types/jest": "^26.0.0",
"@types/react": "^17.0.37",
"@types/react-dom": "^17.0.0",
"@types/react-table": "~7.7.14",
"@typescript-eslint/eslint-plugin": "^4.20.0",
"@typescript-eslint/parser": "^4.20.0",
"babel-eslint": "^10.0.0",
"eslint": "^7.4.0",
"eslint-config-airbnb": "^0.0.4",
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react-hooks": "^4.0.7",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-react-hooks": "^4.0.7",
"eslint-plugin-simple-import-sort": "^5.0.3",
"eslint": "^7.4.0",
"identity-obj-proxy": "^3.0.0",
"jest-fetch-mock": "^3.0.3",
"jest": "^26.0.0",
"jest-fetch-mock": "^3.0.3",
"msw": "^0.27.1",
"node-sass": "^6.0.0",
"postcss": "8.4.20",
"prettier": "^2.0.5",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-test-renderer": "^17.0.2",
"react": "^17.0.2",
"rimraf": "^3.0.2",
"rollup": "^2.42.4",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-postcss": "^4.0.0",
"rollup-plugin-typescript2": "^0.30.0",
"rollup": "^2.42.4",
"stylelint": "^13.6.1",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-sass-guidelines": "^7.0.0",
"stylelint-prettier": "^1.1.2",
"stylelint-scss": "^3.18.0",
"stylelint": "^13.6.1",
"ts-jest": "^26.0.0",
"tslib": "^2.1.0",
"typescript": "^4.2.3"
Expand Down
6 changes: 6 additions & 0 deletions packages/modules/imodel-browser/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* See LICENSE.md in the project root for license terms and full copyright notice.
*--------------------------------------------------------------------------------------------*/
import commonjs from "@rollup/plugin-commonjs";
import url from "@rollup/plugin-url";
import svgr from "@svgr/rollup";
import peerDepsExternal from "rollup-plugin-peer-deps-external";
import postcss from "rollup-plugin-postcss";
Expand Down Expand Up @@ -37,6 +38,11 @@ const rollupConfig = {
},
}),
terser(),
url({
limit: 10 * 1024, // Adjust the limit as needed (e.g., 10 KB)
include: ["**/*.png"], // Include file extensions you want to handle (e.g., PNG)
emitFiles: true, // Emit the files to the output directory
}),
],
};

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
* See LICENSE.md in the project root for license terms and full copyright notice.
*--------------------------------------------------------------------------------------------*/
.iac-iTwinCell {
display: flex;
flex-direction: column;
justify-content: center;
overflow: hidden;

>* {
overflow: hidden;
text-overflow: ellipsis;
max-width: 100%;
}
}

.iac-list-structure {
margin-top: 20px;
}

.iui-menu-item {
border-radius: var(--iui-border-radius-0);
}
Loading

0 comments on commit 5d67777

Please sign in to comment.