Reduce nesting

.github/CODEOWNERS

@@ -10,38 +10,38 @@
 # review when someone opens a pull request.
 *  @itwin/viewer-components-reviewers
 
-/packages/itwin/test-utilities  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
+/packages/test-utilities  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 
 /apps/test-viewer  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 /apps/learning-snippets  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 /apps/performance-tests  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 
-/packages/itwin/property-grid  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
+/packages/property-grid  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 /change/@itwin-property-grid-react*  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 
-/packages/itwin/tree-widget  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
+/packages/tree-widget  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 /change/@itwin-tree-widget-react*  @itwin/viewer-components-reviewers @itwin/itwinjs-core-presentation
 
-/packages/itwin/measure-tools  @itwin/viewer-components-reviewers @simnorm @a-gagnon @bsy-nicholasw
+/packages/measure-tools  @itwin/viewer-components-reviewers @simnorm @a-gagnon @bsy-nicholasw
 /change/@itwin-measure-tools-react*  @itwin/viewer-components-reviewers @simnorm @a-gagnon @bsy-nicholasw
 
-/packages/itwin/grouping-mapping-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
+/packages/grouping-mapping-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 /change/@itwin-grouping-mapping-widget*  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 
-/packages/itwin/one-click-lca-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
+/packages/one-click-lca-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 /change/@itwin-one-click-lca-react*  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 
-/packages/itwin/reports-config-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
+/packages/reports-config-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 /change/@itwin-reports-config-widget-react*  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 
-/packages/itwin/geo-tools  @itwin/viewer-components-reviewers @mdastous-bentley
+/packages/geo-tools  @itwin/viewer-components-reviewers @mdastous-bentley
 /change/@itwin-geo-tools-react*  @itwin/viewer-components-reviewers @mdastous-bentley
 
-/packages/itwin/ec3-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
+/packages/ec3-widget  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 /change/@itwin-ec3-widget-react*  @itwin/viewer-components-reviewers @itwin/insights-and-reporting-platform
 
-/packages/itwin/map-layers  @itwin/viewer-components-reviewers @mdastous-bentley @eringram
+/packages/map-layers  @itwin/viewer-components-reviewers @mdastous-bentley @eringram
 /change/@itwin-map-layers*  @itwin/viewer-components-reviewers @mdastous-bentley @eringram
 
-/packages/itwin/quantity-formatting @itwin/itwinjs-core-presentation @hl662
+/packages/quantity-formatting @itwin/itwinjs-core-presentation @hl662
 /change/@itwin-quantity-formatting-react* @itwin/itwinjs-core-presentation @hl662

.github/workflows/benchmark-pr-tree-widget.yml

@@ -6,7 +6,7 @@ on:
       - master
     paths:
       - apps/performance-tests/**
-      - packages/itwin/tree-widget/**
+      - packages/tree-widget/**
       - .github/workflows/benchmark-pr-tree-widget.yml
     types: [opened, synchronize, reopened, ready_for_review]
 

.github/workflows/benchmark-tree-widget.yml

@@ -7,7 +7,7 @@ on:
       - master
     paths:
       - apps/performance-tests/**
-      - packages/itwin/tree-widget/**
+      - packages/tree-widget/**
 
 jobs:
   benchmark:

.github/workflows/e2e.yml

@@ -26,9 +26,9 @@ jobs:
             test_viewer:
               - 'apps/test-viewer/**'
             tree_widget:
-              - 'packages/itwin/tree-widget/**'
+              - 'packages/tree-widget/**'
             property_grid:
-              - 'packages/itwin/property-grid/**'
+              - 'packages/property-grid/**'
 
   build-test-viewer:
     name: Build test-viewer
@@ -89,7 +89,7 @@ jobs:
           cache: 'pnpm'
 
       - name: Install dependencies
-        run: pnpm install -D --filter ./packages/itwin/tree-widget
+        run: pnpm install -D --filter ./packages/tree-widget
 
       - name: Download test-viewer artifact
         id: test-viewer-artifact
@@ -105,14 +105,14 @@ jobs:
           IMJS_AUTH_CLIENT_CLIENT_ID: ${{ secrets.IMJS_AUTH_CLIENT_CLIENT_ID }}
           IMJS_USER_EMAIL: ${{ secrets.IMJS_USER_EMAIL }}
           IMJS_USER_PASSWORD: ${{ secrets.IMJS_USER_PASSWORD }}
-        run: pnpm run --dir packages/itwin/tree-widget test:e2e
+        run: pnpm run --dir packages/tree-widget test:e2e
 
       - name: Publish test results artifact
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
           name: tree-widget-e2e-test-results
-          path: packages/itwin/tree-widget/e2e-out
+          path: packages/tree-widget/e2e-out
 
   run-tests-property-grid:
     name: Run property-grid tests
@@ -135,7 +135,7 @@ jobs:
           cache: 'pnpm'
 
       - name: Install dependencies
-        run: pnpm install -D --filter ./packages/itwin/property-grid
+        run: pnpm install -D --filter ./packages/property-grid
 
       - name: Download test-viewer artifact
         id: test-viewer-artifact
@@ -151,11 +151,11 @@ jobs:
           IMJS_AUTH_CLIENT_CLIENT_ID: ${{ secrets.IMJS_AUTH_CLIENT_CLIENT_ID }}
           IMJS_USER_EMAIL: ${{ secrets.IMJS_USER_EMAIL }}
           IMJS_USER_PASSWORD: ${{ secrets.IMJS_USER_PASSWORD }}
-        run: pnpm run --dir packages/itwin/property-grid test:e2e
+        run: pnpm run --dir packages/property-grid test:e2e
 
       - name: Publish test results artifact
         if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
           name: property-grid-e2e-test-results
-          path: packages/itwin/property-grid/e2e-out
+          path: packages/property-grid/e2e-out

.github/workflows/extract-api.yml

@@ -6,8 +6,8 @@ on:
   pull_request:
     branches: [master]
     paths:
-      - packages/itwin/property-grid/**
-      - packages/itwin/tree-widget/**
+      - packages/property-grid/**
+      - packages/tree-widget/**
     types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:

.prettierignore

@@ -13,23 +13,23 @@ dist
 # Ignore archived packages
 packages/archive
 
-# Ignore everything under packages/itwin/
-packages/itwin/**
+# Ignore everything under packages/
+packages/**
 
 # Except for the following directories
-!packages/itwin/tree-widget/
-!packages/itwin/tree-widget/**
-!packages/itwin/test-utilities/
-!packages/itwin/test-utilities/**
-!packages/itwin/property-grid/
-!packages/itwin/property-grid/**
+!packages/tree-widget/
+!packages/tree-widget/**
+!packages/test-utilities/
+!packages/test-utilities/**
+!packages/property-grid/
+!packages/property-grid/**
 
 # Ignore README files due to extractions
-packages/itwin/tree-widget/README.md
-packages/itwin/property-grid/README.md
+packages/tree-widget/README.md
+packages/property-grid/README.md
 
 # Ignore extracted api definitions
-packages/itwin/**/api
+packages/**/api
 
 # Ignore auto-generated files
 CHANGELOG.md

.vscode/launch.json

@@ -24,9 +24,9 @@
       "request": "launch",
       "autoAttachChildProcesses": true,
       "skipFiles": ["<node_internals>/**", "**/node_modules/**"],
-      "program": "${workspaceFolder}/packages/itwin/measure-tools/node_modules/vitest/vitest.mjs",
+      "program": "${workspaceFolder}/packages/measure-tools/node_modules/vitest/vitest.mjs",
       "args": ["--inspect-brk", "--no-file-parallelism"],
-      "cwd": "${workspaceFolder}/packages/itwin/measure-tools",
+      "cwd": "${workspaceFolder}/packages/measure-tools",
       "smartStep": true,
       "console": "integratedTerminal",
     },
@@ -44,7 +44,7 @@
       "webRoot": "${workspaceFolder}/apps/test-viewer",
       "outFiles": [
         "${workspaceFolder}/apps/test-viewer/lib/**/*.js",
-        "${workspaceFolder}/packages/itwin/*/lib/**/*.js",
+        "${workspaceFolder}/packages/*/lib/**/*.js",
       ],
     },
     { /* Partial */
@@ -57,7 +57,7 @@
     },
     {
       "name": "Tests: Tree-widget",
-      "cwd": "${workspaceFolder}/packages/itwin/tree-widget",
+      "cwd": "${workspaceFolder}/packages/tree-widget",
       "type": "node",
       "request": "launch",
       "runtimeExecutable": "node",
@@ -66,8 +66,8 @@
         "--experimental-test-module-mocks",
         "--enable-source-maps",
         "--import",
-        "../../../node-hooks/ignore-styles/register.cjs",
-        "${workspaceFolder}/packages/itwin/tree-widget/node_modules/mocha/bin/mocha.js"
+        "../../node-hooks/ignore-styles/register.cjs",
+        "${workspaceFolder}/packages/tree-widget/node_modules/mocha/bin/mocha.js"
       ],
       "args": [
         "--config",
@@ -78,34 +78,20 @@
         "NODE_ENV": "development"
       },
       "outFiles": [
-        "${workspaceFolder}/packages/itwin/tree-widget/lib/**/*.js"
-      ]
-    },
-    {
-      "name": "Tests: Breakdown-trees",
-      "cwd": "${workspaceFolder}/packages/itwin/breakdown-trees",
-      "type": "node",
-      "request": "launch",
-      "outputCapture": "std",
-      "program": "${workspaceFolder}/packages/itwin/breakdown-trees/node_modules/mocha/bin/_mocha",
-      "args": [
-        "./lib/cjs/test/**/*.test.js"
-      ],
-      "outFiles": [
-        "${workspaceFolder}/packages/itwin/breakdown-trees/lib/**/*.js"
+        "${workspaceFolder}/packages/tree-widget/lib/**/*.js"
       ]
     },
     {
       "name": "Tests: map-layers",
-      "cwd": "${workspaceFolder}/packages/itwin/map-layers",
+      "cwd": "${workspaceFolder}/packages/map-layers",
       "type": "node",
       "request": "launch",
       "runtimeExecutable": "npm",
       "runtimeArgs": [
         "test"
       ],
       "outFiles": [
-        "${workspaceFolder}/packages/itwin/map-layers/lib/**/*.js"
+        "${workspaceFolder}/packages/map-layers/lib/**/*.js"
       ]
     },
   ]