Skip to content

Commit a7f866b

Browse files
authored
Merge branch 'develop' into fix-datalake-workspace-migration
Signed-off-by: Alexander Onnikov <[email protected]>
2 parents 9871144 + 80574fb commit a7f866b

File tree

62 files changed

+2493
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2493
-297
lines changed

.vscode/launch.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -928,9 +928,7 @@
928928
"PORT": "4009",
929929
"SECRET": "secret",
930930
"ACCOUNTS_URL": "http://localhost:3000",
931-
"MINIO_ENDPOINT": "localhost",
932-
"MINIO_ACCESS_KEY": "minioadmin",
933-
"MINIO_SECRET_KEY": "minioadmin",
931+
"STORAGE_CONFIG": "datalake|http://huly.local:4030",
934932
"TRANSACTOR_URL": "ws://localhost:3333",
935933
"SERVICE_ID": "export-service"
936934
},

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ sudo npm install -g @microsoft/rush
320320

321321
#### WSL Configuration
322322

323-
Edit the `/etc/wsl.conf` file in WSL (e.g., `sudo nano /etc/wsl.conf`) and add the following content if it doesn't exist:
323+
If the source code is located on a Windows NTFS drive, then edit the `/etc/wsl.conf` file in WSL (e.g., `sudo nano /etc/wsl.conf`) and add the following content if it doesn't exist:
324324

325325
```ini
326326
[automount]
@@ -332,6 +332,8 @@ options = "metadata,umask=22,fmask=11"
332332
appendWindowsPath = false
333333
```
334334

335+
However, we recommend storing the repository on a WSL disk, as this dramatically improves build and maintenance operations.
336+
335337
### Running the Application
336338

337339
After these preparations, the build instructions should work without issues.

common/config/rush/pnpm-lock.yaml

Lines changed: 60 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

desktop/jest.config.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = {
2+
projects: [
3+
{
4+
displayName: 'node',
5+
testEnvironment: 'node',
6+
preset: 'ts-jest',
7+
testMatch: ['<rootDir>/src/__test__/main/**/*.test.ts']
8+
},
9+
{
10+
displayName: 'jsdom',
11+
testEnvironment: 'jsdom',
12+
preset: 'ts-jest',
13+
testMatch: ['<rootDir>/src/__test__/ui/**/*.test.ts']
14+
}
15+
],
16+
roots: ["./src", "./tests"],
17+
coverageReporters: ["text-summary", "html"],
18+
}

desktop/package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
"build:watch": "tsc",
99
"_phase:package": "rushx package",
1010
"_phase:validate": "compile validate",
11+
"_phase:test": "jest --passWithNoTests --silent --forceExit --detectOpenHandles",
1112
"package": "rushx bump && cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production NODE_OPTIONS='--max-old-space-size=4094' webpack --stats-error-details && echo 'done'",
1213
"webpack": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development webpack --stats-error-details --progress -w",
1314
"devp": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production CLIENT_TYPE=dev webpack --progress -w",
1415
"dev": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development webpack --progress -w",
1516
"start": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=production electron --no-sandbox .",
1617
"start-dev": "cross-env MODEL_VERSION=$(node ../common/scripts/show_version.js) VERSION=$(node ../common/scripts/show_tag.js) NODE_ENV=development electron --no-sandbox .",
18+
"test": "jest --passWithNoTests --silent --forceExit --verbose --detectOpenHandles",
19+
"test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --no-cache",
1720
"format": "format",
1821
"bump": "bump-package-version"
1922
},
@@ -61,7 +64,11 @@
6164
"esbuild": "^0.24.2",
6265
"esbuild-loader": "^4.0.3",
6366
"svelte-preprocess": "^5.1.3",
64-
"@types/ws": "^8.5.11"
67+
"@types/ws": "^8.5.11",
68+
"jest": "^29.7.0",
69+
"ts-jest": "^29.1.1",
70+
"@types/jest": "^29.5.5",
71+
"@testing-library/jest-dom": "^6.6.3"
6572
},
6673
"dependencies": {
6774
"@hcengineering/platform": "^0.6.11",
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//
2+
// Copyright © 2025 Hardcore Engineering Inc.
3+
//
4+
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License. You may
6+
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
//
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
//
15+
16+
describe('node environment self checking', () => {
17+
test('check Jest\'s node environment', () => {
18+
const isNodeAvailable = typeof process !== 'undefined';
19+
expect(isNodeAvailable).toBe(true);
20+
})
21+
22+
})

0 commit comments

Comments
 (0)