Skip to content

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

migrate to @tagspaces namespace

sytolk73b28bce214c
diff --git a/app/main.dev.ts b/app/main.dev.ts
index 7d6629db3..76833e03c 100644
--- a/app/main.dev.ts
+++ b/app/main.dev.ts
@@ -555,12 +555,15 @@ app.on('ready', async () => {
let script;
let envPath;
if (devMode || testMode) {
- filepath = path.join(__dirname, 'node_modules/tagspaces-ws/build');
+ filepath = path.join(
+ __dirname,
+ 'node_modules/@tagspaces/tagspaces-ws/build'
+ );
script = 'index.js';
envPath = path.join(__dirname, '.env');
} else {
filepath = process.resourcesPath;
- script = 'app.asar/node_modules/tagspaces-ws/build/index.js';
+ script = 'app.asar/node_modules/@tagspaces/tagspaces-ws/build/index.js';
envPath = path.join(process.resourcesPath, 'app.asar/.env');
}
const properties = propertiesReader(envPath);
diff --git a/app/package-template.json b/app/package-template.json
index ca1f4843a..112da951e 100644
--- a/app/package-template.json
+++ b/app/package-template.json
@@ -4,7 +4,7 @@
},
"nodeDependencies": {
"@tagspaces/extensions": "1.0.0",
- "sharp": "^0.29.1",
- "tagspaces-ws": "^1.0.43"
+ "sharp": "^0.28.3",
+ "@tagspaces/tagspaces-ws": "^1.0.5"
}
}
diff --git a/app/package.json b/app/package.json
index 917c2c0c7..90df50835 100644
--- a/app/package.json
+++ b/app/package.json
@@ -15,6 +15,6 @@
"dependencies": {
"@tagspaces/extensions": "1.0.0",
"sharp": "^0.28.3",
- "tagspaces-ws": "^1.0.44"
+ "@tagspaces/tagspaces-ws": "^1.0.5"
}
}
diff --git a/app/reducers/location-index.ts b/app/reducers/location-index.ts
index 0f200d61a..7091ee9d5 100644
--- a/app/reducers/location-index.ts
+++ b/app/reducers/location-index.ts
@@ -16,7 +16,7 @@
*
*/
-import { loadIndex, hasIndex } from 'tagspaces-platforms/indexer';
+import { loadIndex, hasIndex } from '@tagspaces/tagspaces-platforms/indexer';
import { getLocation, getLocationByPath, getLocations } from './locations';
import { createDirectoryIndex } from '-/services/utils-io';
import {
diff --git a/app/services/platform-io.ts b/app/services/platform-io.ts
index c0345eb6a..7088d8cbd 100644
--- a/app/services/platform-io.ts
+++ b/app/services/platform-io.ts
@@ -48,7 +48,7 @@ export default class PlatformIO {
) {
resolve();
} else {
- import('tagspaces-platforms/index')
+ import('@tagspaces/tagspaces-platforms/index')
.then(IO => {
// { default: IO }) => {
objectStoreAPI = IO;
diff --git a/app/services/utils-io.ts b/app/services/utils-io.ts
index 8a425f2aa..da5d638bc 100644
--- a/app/services/utils-io.ts
+++ b/app/services/utils-io.ts
@@ -19,9 +19,10 @@
import uuidv1 from 'uuid';
import {
loadIndex,
+ enhanceDirectoryIndex,
persistIndex,
createIndex
-} from 'tagspaces-platforms/indexer';
+} from '@tagspaces/tagspaces-platforms/indexer';
import { saveAs } from 'file-saver';
import micromatch from 'micromatch';
import PlatformIO from './platform-io';
@@ -467,7 +468,7 @@ export function createDirectoryIndex(
persistIndex(param, directoryIndex).then(success => {
if (success) {
console.log('Index generated in folder: ' + directoryPath);
- return directoryIndex;
+ return enhanceDirectoryIndex(dirPath, directoryIndex);
}
return undefined;
})
diff --git a/package.json b/package.json
index 036e45527..e613eeeb8 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
"paste-android-linux": "adb shell input text '$(xclip -selection c -o)'",
"paste-android-macos": "adb shell input text \"'$(pbpaste)'\"",
"postinstall-node-check": "cross-env PD_PLATFORM=node node scripts/postinstall.js",
- "postinstall-node": "cross-env PD_PLATFORM=node yarn add tagspaces-platforms",
+ "postinstall-node": "cross-env PD_PLATFORM=node yarn add @tagspaces/tagspaces-platforms",
"postinstall-web-check": "cross-env PD_PLATFORM=web node scripts/postinstall.js",
- "postinstall-web": "cross-env PD_PLATFORM=web yarn add tagspaces-platforms",
+ "postinstall-web": "cross-env PD_PLATFORM=web yarn add @tagspaces/tagspaces-platforms",
"clean": "rimraf node_modules && rimraf app/dist",
"clean-pro": "yarn clean-maps",
"clean-maps": "rimraf app/dist/**/*.map && rimraf web/dist/**/*.map",
@@ -256,7 +256,7 @@
"rimraf": "^2.6.3",
"sass-loader": "^7.1.0",
"serve-static": "^1.14.1",
- "sharp": "^0.29.1",
+ "sharp": "^0.28.3",
"shelljs": "^0.8.3",
"shx": "^0.3.2",
"sinon": "^2.3.1",
@@ -285,6 +285,7 @@
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.57",
"@material-ui/pickers": "^3.2.10",
+ "@tagspaces/tagspaces-platforms": "^1.0.6",
"aws-amplify": "^3.3.27",
"aws-sdk": "^2.984.0",
"babel-polyfill": "^6.26.0",
@@ -340,7 +341,6 @@
"semver": "^5.5.0",
"source-map-support": "^0.5.11",
"sync-fetch": "^0.3.0",
- "tagspaces-platforms": "^1.0.1",
"tiff.js": "^1.0.0",
"ts-react-splitter": "^2.1.1",
"use-state-with-callback": "^2.0.3",
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
index ff1191e7e..29e6dcb8f 100644
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -5,7 +5,7 @@ const npm = require('npm');
function isInstalled(npmPackage) {
// TODO check installed version
try {
- const path = require.resolve('tagspaces-platforms');
+ const path = require.resolve('@tagspaces/tagspaces-platforms');
if (
!fs.existsSync(path) ||
!fs.existsSync(pathLib.join(path, '..', 'node_modules'))
@@ -20,7 +20,7 @@ function isInstalled(npmPackage) {
}
}
if (process.env.PD_PLATFORM === 'node') {
- if (!isInstalled('tagspaces-common-node')) {
+ if (!isInstalled('@tagspaces/tagspaces-common-node')) {
npm.load(er => {
if (er) {
console.log('err:', er);
@@ -37,7 +37,7 @@ if (process.env.PD_PLATFORM === 'node') {
});
}
} else if (process.env.PD_PLATFORM === 'web') {
- if (!isInstalled('tagspaces-common-aws')) {
+ if (!isInstalled('@tagspaces/tagspaces-common-aws')) {
npm.load(er => {
if (er) {
console.log('err:', er);
diff --git a/yarn.lock b/yarn.lock
index d8d0a6bf8..9385ed1e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3362,6 +3362,11 @@
dependencies:
defer-to-connect "^1.0.1"
+"@tagspaces/tagspaces-platforms@^1.0.6":
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-1.0.6.tgz#1c9a04851d3d52d1946dd71ffae45a3492fab78d"
+ integrity sha512-SE34J6vdGPKo28xbyWXPPThS3LWkfuJNzUDcg3v/IxYl6vJJ3bcr5u5LWTm+kia/qN5V0xUtfOKPefxqJaR96Q==
+
"@testim/chrome-version@^1.0.7":
version "1.0.7"
resolved "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.0.7.tgz"
@@ -5988,7 +5993,7 @@ collection-visit@^1.0.0:
map-visit "^1.0.0"
object-visit "^1.0.0"
-color-convert@^1.9.0, color-convert@^1.9.1:
+color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
version "1.9.3"
resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -6041,12 +6046,12 @@ color@^3.0.0:
color-convert "^1.9.1"
color-string "^1.5.2"
-color@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/color/-/color-4.0.1.tgz#21df44cd10245a91b1ccf5ba031609b0e10e7d67"
- integrity sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==
+color@^3.1.3:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
+ integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
dependencies:
- color-convert "^2.0.1"
+ color-convert "^1.9.3"
color-string "^1.6.0"
colorette@^1.2.1, colorette@^1.3.0:
@@ -13695,10 +13700,10 @@ node-addon-api@^1.6.3:
resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz"
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
-node-addon-api@^4.1.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.2.0.tgz#117cbb5a959dff0992e1c586ae0393573e4d2a87"
- integrity sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==
+node-addon-api@^3.2.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+ integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
node-emoji@^1.10.0:
version "1.11.0"
@@ -15414,7 +15419,7 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2
source-map "^0.6.1"
supports-color "^6.1.0"
-prebuild-install@^6.1.4:
+prebuild-install@^6.1.2:
version "6.1.4"
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f"
integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==
@@ -17331,15 +17336,15 @@ shallowequal@^1.1.0:
resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz"
integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
-sharp@^0.29.1:
- version "0.29.1"
- resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.29.1.tgz#f60b50f24f399464a24187c86bd2da41aae50b85"
- integrity sha512-DpgdAny9TuS+oWCQ7MRS8XyY9x6q1+yW3a5wNx0J3HrGuB/Jot/8WcT+lElHY9iJu2pwtegSGxqMaqFiMhs4rQ==
+sharp@^0.28.3:
+ version "0.28.3"
+ resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.28.3.tgz#ecd74cefd020bee4891bb137c9850ee2ce277a8b"
+ integrity sha512-21GEP45Rmr7q2qcmdnjDkNP04Ooh5v0laGS5FDpojOO84D1DJwUijLiSq8XNNM6e8aGXYtoYRh3sVNdm8NodMA==
dependencies:
- color "^4.0.1"
+ color "^3.1.3"
detect-libc "^1.0.3"
- node-addon-api "^4.1.0"
- prebuild-install "^6.1.4"
+ node-addon-api "^3.2.0"
+ prebuild-install "^6.1.2"
semver "^7.3.5"
simple-get "^3.1.0"
tar-fs "^2.1.1"
@@ -18371,11 +18376,6 @@ table@^5.0.0, table@^5.2.3:
slice-ansi "^2.1.0"
string-width "^3.0.0"
-tagspaces-platforms@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/tagspaces-platforms/-/tagspaces-platforms-1.0.1.tgz#00e2d6806c0a4c97e2490c9c2e0fefbadcdce830"
- integrity sha512-jPUcqcWmtPv8rzZmTRnWhP1kuFyWMpRVIxm2FU2GbXftfkR4sFuv2wTQeXygpItSIqwDRI5t/LZX5ypCsH4wgA==
-
tapable@^0.1.8:
version "0.1.10"
resolved "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"