Skip to content

TagSpaces is an offline, open source, document manager with tagging support

build fix

sytolk41669d1ab183
diff --git a/.erb/scripts/link-modules.ts b/.erb/scripts/link-modules.ts
index 602c4f19b..10cda3608 100644
--- a/.erb/scripts/link-modules.ts
+++ b/.erb/scripts/link-modules.ts
@@ -25,7 +25,13 @@ try {
console.error('Error removing file:' + targetNodeModules, err);
}
if (fs.existsSync(appNodeModulesPath)) {
- fs.symlinkSync(appNodeModulesPath, targetNodeModules, 'junction');
+ try {
+ fs.symlinkSync(appNodeModulesPath, targetNodeModules, 'junction');
+ } catch (err) {
+ console.error(
+ 'Error creating link target:' + targetNodeModules + ':' + err.message,
+ );
+ }
}
////////link .env
diff --git a/.github/workflows/workflow_scheduled_mac_electron.yml b/.github/workflows/workflow_scheduled_mac_electron.yml
index 90ef9b691..c2bf75039 100644
--- a/.github/workflows/workflow_scheduled_mac_electron.yml
+++ b/.github/workflows/workflow_scheduled_mac_electron.yml
@@ -25,14 +25,12 @@ jobs:
- name: Running npm install, prettier and type checks
run: |
npm install
- npm run prepare-node
npm run prettier-check
npm run type-check
- name: Run Unit tests
run: npm run test-unit
- name: Run Electron tests
run: |
- npm run build:main
npm run build-e2e
npm run test-playwright
- uses: actions/upload-artifact@v3
diff --git a/.github/workflows/workflow_scheduled_win_electron_pro.yml b/.github/workflows/workflow_scheduled_win_electron_pro.yml
index bfce737d9..b622067f8 100644
--- a/.github/workflows/workflow_scheduled_win_electron_pro.yml
+++ b/.github/workflows/workflow_scheduled_win_electron_pro.yml
@@ -32,14 +32,12 @@ jobs:
- name: Running npm install, prettier and type checks
run: |
npm install
- npm run prepare-node
npm run prettier-check
npm run type-check
- name: Run Unit tests
run: npm run test-unit
- name: Run Electron tests
run: |
- npm run build:main
npm run build-e2e
npm run test-playwright-pro
- uses: actions/upload-artifact@v3
diff --git a/package-lock.json b/package-lock.json
index 60158783a..fdbe58d28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,9 +19,9 @@
"@mui/lab": "^5.0.0-alpha.148",
"@mui/material": "^5.14.13",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.0.1",
- "@tagspaces/tagspaces-md": "4.0.1",
- "@tagspaces/tagspaces-platforms": "4.0.1",
+ "@tagspaces/tagspaces-common": "4.0.2",
+ "@tagspaces/tagspaces-md": "4.0.2",
+ "@tagspaces/tagspaces-platforms": "4.0.2",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
"classnames": "^2.3.1",
@@ -88,7 +88,7 @@
"@playwright/test": "1.38.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
"@svgr/webpack": "^8.1.0",
- "@tagspaces/dynamic-packages-loading": "^4.0.1",
+ "@tagspaces/dynamic-packages-loading": "^4.0.2",
"@teamsupercell/typings-for-css-modules-loader": "^2.5.2",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^14.0.0",
@@ -12419,9 +12419,9 @@
}
},
"node_modules/@tagspaces/dynamic-packages-loading": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@tagspaces/dynamic-packages-loading/-/dynamic-packages-loading-4.0.1.tgz",
- "integrity": "sha512-W+6uXcnXR/zG4TblSxl99K/91l1JlhaurvndtWeVG9nwyk66CHaTCQJD0RIX0VNvjUKmBF9oEuF6oC1q/0bReQ==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@tagspaces/dynamic-packages-loading/-/dynamic-packages-loading-4.0.2.tgz",
+ "integrity": "sha512-pKmYruvAzsim3MeZ/75vD4ZGf815VnEdC2ZHFpWLaQ29PjcKYPq6ONhKmx20lu1n7K1s1bBi/CZj4oOIluu9UA==",
"dev": true,
"dependencies": {
"yargs": "^17.5.1"
@@ -12435,9 +12435,9 @@
}
},
"node_modules/@tagspaces/tagspaces-common": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.0.1.tgz",
- "integrity": "sha512-2AcRCGYj961+WaKa4n+Id+zrXA7KINiVnCcH5HsF4fZkVJWVkFg+uiXxyo2MuIIhhiZNjm8MzTdqk8H94YZ21w==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-common/-/tagspaces-common-4.0.2.tgz",
+ "integrity": "sha512-nHLEdKqe/PH+KBb8H8gTvA4JwIjGyG48nPF7Db0dGofLa3PfWScwIl2lqrMEHCJ6vK5Wl0Y5amnkAJFp2ZB70Q==",
"dependencies": {
"dotenv": "^16.0.2",
"micromatch": "^4.0.5",
@@ -12464,9 +12464,9 @@
}
},
"node_modules/@tagspaces/tagspaces-md": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-4.0.1.tgz",
- "integrity": "sha512-n3qX0IAJRAwUfmcayIubNKroHbSxuJUAh/W9m73B48Wi1M1HqZr2gwkyNRtWwPQXhy+ki54uvcDADIVR8oFc7Q==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-4.0.2.tgz",
+ "integrity": "sha512-6Ye9eCg+RAwmKymdd9JaNv2RZITH8dOYf5f7L6EdCTaxtmvEceQyAlSCN78TepksxgG9S62v/ZSrWLoFi9SQoQ==",
"dependencies": {
"@milkdown/core": "7.2.4",
"@milkdown/ctx": "7.2.4",
@@ -12502,9 +12502,9 @@
}
},
"node_modules/@tagspaces/tagspaces-platforms": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-4.0.1.tgz",
- "integrity": "sha512-gOCw+RLMWC1o3JMdBk6weuI6nVk+Cl5Zh6CnXGJFX0oNbjq0Wtc8bARM1NGBfxJuUxVjTBgCJJ3J6qaQjLgQew==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-4.0.2.tgz",
+ "integrity": "sha512-dd1R1s3B9N93fC3xZ7VKH/ej/j2znMswzVfz9ckEZSeHKqpjxait16o1zhZdMzv/nPpN1gaw/7ShoTdoQUjJpA==",
"hasInstallScript": true
},
"node_modules/@teamsupercell/typings-for-css-modules-loader": {
diff --git a/package.json b/package.json
index d1dd65b91..720aa8a96 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
"build-e2e": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test npm run build",
"build-e2e-dev": "ts-node ./.erb/scripts/clean.js && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:web\"",
"build-e2e-web": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test && npm run prepare-web-pro && npm run build:web",
- "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && npm run prepare-node && npm run build:dll",
+ "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && node -r ts-node/register ./.erb/scripts/link-modules.ts && npm run prepare-node && npm run build:dll",
"lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
"package": "ts-node ./.erb/scripts/clean.js && npm run build && electron-builder build --publish never && npm run build:dll",
"rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
@@ -45,9 +45,9 @@
"start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
"test": "jest",
"browserslist:update": "npx browserslist@latest --update-db",
- "bs": "npm run build && node -r ts-node/register ./.erb/scripts/link-modules.ts && npm run run-electron",
+ "bs": "npm run build && npm run run-electron",
"run-electron": "npx electron ./release/app/dist/main/main.js",
- "prebuild": "rimraf release/app/dist && npm run prepare-node && npm run generate-extensions",
+ "prebuild": "rimraf release/app/dist && npm run prepare-node && npm run generate-extensions && node -r ts-node/register ./.erb/scripts/link-modules.ts",
"bump-version": "cd release/app && yarn version && cd .. && npm run version-meta",
"clean": "npx rimraf node_modules && npx rimraf src/renderer/dist",
"clean-maps": "rimraf app/dist/**/*.map && rimraf web/dist/**/*.map",
@@ -58,7 +58,7 @@
"cordova-list-emulators": "cd cordova && cordova run --list --emulator && cd ..",
"cordova-remove-android": "cd cordova && cordova platform remove android && cd ..",
"cordova-remove-ios": "cd cordova && cordova platform remove ios && cd ..",
- "dev": "node -r ts-node/register ./.erb/scripts/link-modules.ts && npm run prepare-node && npm run generate-extensions && shx mkdir -p public/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* public/modules/@tagspaces/extensions/ && npm run start",
+ "dev": "npm run prepare-node && npm run generate-extensions && shx mkdir -p public/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* public/modules/@tagspaces/extensions/ && npm run start",
"start-main-debug": "npm run dev --inspect=5858 --remote-debugging-port=9223",
"dev-open-file": "git apply run-with-args.patch && npm run dev",
"generate-jwt": "node scripts/jwt_generate.js",
@@ -162,9 +162,9 @@
"@mui/lab": "^5.0.0-alpha.148",
"@mui/material": "^5.14.13",
"@mui/x-date-pickers": "^5.0.20",
- "@tagspaces/tagspaces-common": "4.0.1",
- "@tagspaces/tagspaces-md": "4.0.1",
- "@tagspaces/tagspaces-platforms": "4.0.1",
+ "@tagspaces/tagspaces-common": "4.0.2",
+ "@tagspaces/tagspaces-md": "4.0.2",
+ "@tagspaces/tagspaces-platforms": "4.0.2",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
"classnames": "^2.3.1",
@@ -289,7 +289,7 @@
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0",
"@playwright/test": "1.38.1",
- "@tagspaces/dynamic-packages-loading": "^4.0.1",
+ "@tagspaces/dynamic-packages-loading": "^4.0.2",
"@types/leaflet": "^1.9.4",
"@types/react-redux": "^7.1.24",
"@types/react-router-dom": "^5.3.3",
diff --git a/release/app/package.json b/release/app/package.json
index df4e6f861..5d2709a84 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -21,8 +21,8 @@
"@tagspaces/extensions": "1.0.90"
},
"nodeDependencies": {
- "@tagspaces/tagspaces-common-node": "4.0.1",
- "@tagspaces/tagspaces-ws": "4.0.1",
+ "@tagspaces/tagspaces-common-node": "4.0.2",
+ "@tagspaces/tagspaces-ws": "4.0.2",
"@tagspaces/extensions": "1.0.90",
"sharp": "0.31.3",
"@elife/pm2": "3.6.1",
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index b499e48e0..0565a2de5 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -42,6 +42,8 @@ if (!process.env.PD_PLATFORM) {
let install = false;
if (process.env.PD_PLATFORM === 'electron') {
if (
+ !isInstalled('@tagspaces/tagspaces-common-aws') ||
+ !isInstalled('@tagspaces/tagspaces-common-webdav') ||
isInstalled('@tagspaces/tagspaces-common-node') ||
isInstalled('@tagspaces/tagspaces-common-cordova')
) {