Skip to content

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

add cordova support

sytolk956fe12e75b3
diff --git a/configs/webpack.config.cordova.dev.babel.js b/.erb/configs/webpack.config.cordova.dev.ts
similarity index 75%
rename from configs/webpack.config.cordova.dev.babel.js
rename to .erb/configs/webpack.config.cordova.dev.ts
index dd32e920c..ddd433cd2 100644
--- a/configs/webpack.config.cordova.dev.babel.js
+++ b/.erb/configs/webpack.config.cordova.dev.ts
@@ -4,17 +4,17 @@
import path from 'path';
import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import merge from 'webpack-merge';
import NodePolyfillPlugin from 'node-polyfill-webpack-plugin';
import baseConfig from './webpack.config.base';
+import webpackPaths from './webpack.paths';
// import CheckNodeEnv from '../internals/scripts/CheckNodeEnv';
-const targetPlatform = 'cordova-io'; // electron-io | webdav-io | cordova-io | process.env.APP_TARGET ||
-
// CheckNodeEnv('development');
-export default merge(baseConfig, {
+const configuration: webpack.Configuration = {
cache: false,
devtool: 'inline-source-map',
@@ -22,12 +22,13 @@ export default merge(baseConfig, {
target: 'web',
- entry: path.join(__dirname, '..', 'app/index'),
+ //entry: path.join(__dirname, '..', 'app/index'),
+ entry: path.join(webpackPaths.srcRendererPath, 'index.tsx'),
// entry: ['babel-polyfill', './app/index'],
output: {
libraryTarget: 'window', // 'window', // 'commonjs2',
- path: path.join(__dirname, '../cordova/www/dist'),
+ path: path.join(__dirname, '../../cordova/www/dist'),
publicPath: './dist/',
filename: 'bundle.js',
sourceMapFilename: '[file].map',
@@ -125,15 +126,22 @@ export default merge(baseConfig, {
},
// WOFF Font
{
+ test: /\.(woff|woff2|eot|ttf|otf)$/i,
+ type: 'asset/resource',
+ generator: {
+ filename: 'fonts/[hash][ext][query]',
+ },
+ },
+ /*{
test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
use: {
loader: 'url-loader',
options: {
limit: 10000,
- mimetype: 'application/font-woff',
- },
+ mimetype: 'application/font-woff'
+ }
},
- type: 'javascript/auto',
+ type: 'javascript/auto'
},
// WOFF2 Font
{
@@ -142,10 +150,10 @@ export default merge(baseConfig, {
loader: 'url-loader',
options: {
limit: 10000,
- mimetype: 'application/font-woff',
- },
+ mimetype: 'application/font-woff'
+ }
},
- type: 'javascript/auto',
+ type: 'javascript/auto'
},
// TTF Font
{
@@ -154,19 +162,19 @@ export default merge(baseConfig, {
loader: 'url-loader',
options: {
limit: 10000,
- mimetype: 'application/octet-stream',
- },
+ mimetype: 'application/octet-stream'
+ }
},
- type: 'javascript/auto',
+ type: 'javascript/auto'
},
// EOT Font
{
test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
use: 'file-loader',
- type: 'javascript/auto',
- },
+ type: 'javascript/auto'
+ },*/
// SVG Font
- {
+ /*{
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
use: {
loader: 'url-loader',
@@ -176,13 +184,8 @@ export default merge(baseConfig, {
},
},
type: 'javascript/auto',
- },
- // Text files
- {
- test: /\.(txt)$/,
- use: 'raw-loader',
- type: 'javascript/auto',
- },
+ },*/
+
// Common Image Formats
{
test: /\.(?:ico|gif|png|jpg|jpeg|webp)$/,
@@ -195,22 +198,35 @@ export default merge(baseConfig, {
fullySpecified: false,
},
},
+ // Text files
+ {
+ test: /\.(txt)$/,
+ use: 'raw-loader',
+ type: 'javascript/auto',
+ },
+ // SVG
+ {
+ test: /\.svg$/,
+ use: [
+ {
+ loader: '@svgr/webpack',
+ options: {
+ prettier: false,
+ svgo: false,
+ svgoConfig: {
+ plugins: [{ removeViewBox: false }],
+ },
+ titleProp: true,
+ ref: true,
+ },
+ },
+ 'file-loader',
+ ],
+ },
],
},
plugins: [
- /**
- * Create global constants which can be configured at compile time.
- *
- * Useful for allowing different behaviour between development builds and
- * release builds
- *
- * NODE_ENV should be production so that modules do not perform certain
- * development checks
- */
- new webpack.EnvironmentPlugin({
- NODE_ENV: 'development',
- }),
new NodePolyfillPlugin(),
new MiniCssExtractPlugin({
@@ -227,6 +243,19 @@ export default merge(baseConfig, {
}
), */
+ new HtmlWebpackPlugin({
+ filename: path.join('index.html'),
+ template: path.join(webpackPaths.srcRendererPath, 'appd.html'),
+ minify: {
+ collapseWhitespace: true,
+ removeAttributeQuotes: true,
+ removeComments: true,
+ },
+ isBrowser: false,
+ env: process.env.NODE_ENV,
+ isDevelopment: process.env.NODE_ENV !== 'production',
+ nodeModules: webpackPaths.appNodeModulesPath,
+ }),
/* new webpack.NormalModuleReplacementPlugin(
/(.*)_PDFDISTLIB_(\.*)/,
resource => {
@@ -243,4 +272,6 @@ export default merge(baseConfig, {
openAnalyzer: process.env.OPEN_ANALYZER === 'true',
}),
],
-});
+};
+
+export default merge(baseConfig, configuration);
diff --git a/configs/webpack.config.cordova.prod.babel.js b/.erb/configs/webpack.config.cordova.prod.ts
similarity index 76%
rename from configs/webpack.config.cordova.prod.babel.js
rename to .erb/configs/webpack.config.cordova.prod.ts
index c6e608fd0..226d3bd45 100644
--- a/configs/webpack.config.cordova.prod.babel.js
+++ b/.erb/configs/webpack.config.cordova.prod.ts
@@ -4,30 +4,31 @@
import path from 'path';
import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
import merge from 'webpack-merge';
import NodePolyfillPlugin from 'node-polyfill-webpack-plugin';
import baseConfig from './webpack.config.base';
+import webpackPaths from './webpack.paths';
// import CheckNodeEnv from '../internals/scripts/CheckNodeEnv';
-const targetPlatform = 'cordova-io'; // electron-io | webdav-io | cordova-io | process.env.APP_TARGET ||
-
// CheckNodeEnv('production');
-export default merge(baseConfig, {
- devtool: 'source-map', // 'inline-source-map',
+const configuration: webpack.Configuration = {
+ devtool: 'source-map',
mode: 'production',
target: 'web',
- entry: path.join(__dirname, '..', 'app/index'),
+ //entry: path.join(__dirname, '..', 'app/index'),
+ entry: path.join(webpackPaths.srcRendererPath, 'index.tsx'),
// entry: ['babel-polyfill', './app/index'],
output: {
libraryTarget: 'window', // 'window', // 'commonjs2',
- path: path.join(__dirname, '../cordova/www/dist'),
+ path: path.join(__dirname, '../../cordova/www/dist'),
publicPath: './dist/',
filename: 'bundle.js',
},
@@ -124,15 +125,22 @@ export default merge(baseConfig, {
},
// WOFF Font
{
+ test: /\.(woff|woff2|eot|ttf|otf)$/i,
+ type: 'asset/resource',
+ generator: {
+ filename: 'fonts/[hash][ext][query]',
+ },
+ },
+ /*{
test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
use: {
loader: 'url-loader',
options: {
limit: 10000,
- mimetype: 'application/font-woff',
- },
+ mimetype: 'application/font-woff'
+ }
},
- type: 'javascript/auto',
+ type: 'javascript/auto'
},
// WOFF2 Font
{
@@ -141,10 +149,10 @@ export default merge(baseConfig, {
loader: 'url-loader',
options: {
limit: 10000,
- mimetype: 'application/font-woff',
- },
+ mimetype: 'application/font-woff'
+ }
},
- type: 'javascript/auto',
+ type: 'javascript/auto'
},
// TTF Font
{
@@ -153,19 +161,19 @@ export default merge(baseConfig, {
loader: 'url-loader',
options: {
limit: 10000,
- mimetype: 'application/octet-stream',
- },
+ mimetype: 'application/octet-stream'
+ }
},
- type: 'javascript/auto',
+ type: 'javascript/auto'
},
// EOT Font
{
test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
use: 'file-loader',
- type: 'javascript/auto',
- },
+ type: 'javascript/auto'
+ },*/
// SVG Font
- {
+ /*{
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
use: {
loader: 'url-loader',
@@ -175,13 +183,8 @@ export default merge(baseConfig, {
},
},
type: 'javascript/auto',
- },
- // Text files
- {
- test: /\.(txt)$/,
- use: 'raw-loader',
- type: 'javascript/auto',
- },
+ },*/
+
// Common Image Formats
{
test: /\.(?:ico|gif|png|jpg|jpeg|webp)$/,
@@ -194,6 +197,31 @@ export default merge(baseConfig, {
fullySpecified: false,
},
},
+ // Text files
+ {
+ test: /\.(txt)$/,
+ use: 'raw-loader',
+ type: 'javascript/auto',
+ },
+ // SVG
+ {
+ test: /\.svg$/,
+ use: [
+ {
+ loader: '@svgr/webpack',
+ options: {
+ prettier: false,
+ svgo: false,
+ svgoConfig: {
+ plugins: [{ removeViewBox: false }],
+ },
+ titleProp: true,
+ ref: true,
+ },
+ },
+ 'file-loader',
+ ],
+ },
],
},
@@ -216,18 +244,6 @@ export default merge(baseConfig, {
},
plugins: [
- /**
- * Create global constants which can be configured at compile time.
- *
- * Useful for allowing different behaviour between development builds and
- * release builds
- *
- * NODE_ENV should be production so that modules do not perform certain
- * development checks
- */
- new webpack.EnvironmentPlugin({
- NODE_ENV: 'production',
- }),
new NodePolyfillPlugin(),
new MiniCssExtractPlugin({
@@ -244,6 +260,19 @@ export default merge(baseConfig, {
}
), */
+ new HtmlWebpackPlugin({
+ filename: path.join('index.html'),
+ template: path.join(webpackPaths.srcRendererPath, 'appd.html'),
+ minify: {
+ collapseWhitespace: true,
+ removeAttributeQuotes: true,
+ removeComments: true,
+ },
+ isBrowser: false,
+ env: process.env.NODE_ENV,
+ isDevelopment: process.env.NODE_ENV !== 'production',
+ nodeModules: webpackPaths.appNodeModulesPath,
+ }),
/* new webpack.NormalModuleReplacementPlugin(
/(.*)_PDFDISTLIB_(\.*)/,
resource => {
@@ -260,4 +289,6 @@ export default merge(baseConfig, {
openAnalyzer: process.env.OPEN_ANALYZER === 'true',
}),
],
-});
+};
+
+export default merge(baseConfig, configuration);
diff --git a/package.json b/package.json
index 9c55a3c9a..7257b4a78 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,8 @@
"build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
"build:web": "rimraf web/dist && cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.web.prod.ts",
"build:web:dev": "rimraf web/dist && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.web.dev.ts",
+ "build:cordova": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.prod.ts",
+ "build:cordova:dev": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.cordova.dev.ts",
"postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && 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 dist && npm run build && electron-builder build --publish never && npm run build:dll",
@@ -42,8 +44,6 @@
"browserslist:update": "npx browserslist@latest --update-db",
"bs": "npm run build && npm run start",
"prebuild": "rimraf release/app/dist && npm run version-meta && npm run prepare-node && npm run generate-jwt && npm run generate-extensions",
- "build-cordova": "webpack --config ./configs/webpack.config.cordova.prod.babel.js",
- "build-cordova-dev": "webpack --config ./configs/webpack.config.cordova.dev.babel.js",
"build-dll": "webpack --config ./configs/webpack.config.renderer.dev.dll.babel.js",
"build-e2e": "node scripts/setup-tests.js && cross-env E2E_BUILD=true NODE_ENV=test npm run build",
"build-e2e-dev": "rimraf release/app/dist && npm run version-meta && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build-main\" \"npm run build-renderer\" \"npm run build-web-dev\"",
@@ -81,7 +81,7 @@
"minio-start": "./tests/bin/minio server ./tests/testdata-tmp/file-structure",
"minio-start-windows": ".\\tests\\bin\\minio.exe server ./tests/testdata-tmp/file-structure",
"package:old": "npm run build && npm run package-win && npm run package-linux && npm run package-mac && npm run package-web",
- "package-android": "npm run build-cordova && cd cordova && npm install && cordova build --release android",
+ "package-android": "npm run build:cordova && cd cordova && npm install && cordova build --release android",
"package-ci": "npm run postinstall && npm run build && electron-builder --publish always",
"package-linux": "npm run install-ext-node-linux && electron-builder --linux --config resources/builder.json",
"package-linux-pro": "npm run install-ext-node-linux && electron-builder --linux --config extensions/tagspacespro/resources/builder-pro.json",
@@ -105,16 +105,16 @@
"postinstall-web-check": "cross-env PD_PLATFORM=web node scripts/postinstall.js",
"precommit": "lint-staged",
"prepare": "husky install",
- "prepare-cordova": "npm run install-ext-web-check && npm run postinstall-cordova-check && rimraf cordova/www/dist && rimraf cordova/www/node_modules && shx cp -rL app/node_modules cordova/www && shx cp LICENSE.txt cordova/www",
- "prepare-cordova-pro": "npm run install-ext-web-check && npm run postinstall-cordova-check && rimraf cordova/www/dist && rimraf cordova/www/node_modules && shx cp -rL app/node_modules cordova/www && shx cp extensions/tagspacespro/EULA.txt cordova/www",
+ "prepare-cordova": "npm run install-ext-web-check && npm run postinstall-cordova-check && rimraf cordova/www/dist && rimraf cordova/www/node_modules && shx cp -rL release/app/node_modules cordova/www && shx cp LICENSE.txt cordova/www",
+ "prepare-cordova-pro": "npm run install-ext-web-check && npm run postinstall-cordova-check && rimraf cordova/www/dist && rimraf cordova/www/node_modules && shx cp -rL release/app/node_modules cordova/www && shx cp extensions/tagspacespro/EULA.txt cordova/www",
"prepare-node": "npm run install-ext-node-check && npm run postinstall-electron-check",
"prepare-web": "npm run version-meta && npm run install-ext-web-check && npm run postinstall-aws-check && rimraf web/modules && shx mkdir -p web/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* web/modules/@tagspaces/extensions/ && shx cp LICENSE.txt web && npm run build:web && node scripts/genswconf.js && npm run clean-maps",
"prepare-web-pro": "npm run version-meta && npm run install-ext-web-check && npm run postinstall-aws-check && rimraf web/modules && shx mkdir -p web/modules/@tagspaces/extensions && shx cp -rL release/app/node_modules/@tagspaces/extensions/* web/modules/@tagspaces/extensions/ && shx cp extensions/tagspacespro/EULA.txt web && npm run build:web && node scripts/genswconf.js && npm run clean-maps",
"prettier-check": "prettier --check --ignore-path=.prettierignore \"**/*.{js,jsx,json,ts,tsx,yml}\"",
"prettier-format": "prettier --ignore-path=.prettierignore --write \"**/*.{js,jsx,json,ts,tsx,yml}\"",
- "run-android": "npm run prepare-cordova && npm run build-cordova && cd cordova && cordova run android && cd ..",
- "run-android-dev": "npm run prepare-cordova && npm run build-cordova-dev && cd cordova && cordova run android && cd ..",
- "run-ios-dev": "npm run prepare-cordova && npm run build-cordova-dev && cd cordova && cordova run ios && cd ..",
+ "run-android": "npm run prepare-cordova && npm run build:cordova && cd cordova && cordova run android && cd ..",
+ "run-android-dev": "npm run prepare-cordova && npm run build:cordova:dev && cd cordova && cordova run android && cd ..",
+ "run-ios-dev": "npm run prepare-cordova && npm run build:cordova:dev && cd cordova && cordova run ios && cd ..",
"run-web": "npm run prepare-web-pro && node scripts/webserver.js",
"run-web-server": "node scripts/webserver.js",
"run-web-aws": "npm run prepare-web-pro && node scripts/webserver.js",
diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.ts
index 25fd7875b..ac7a43b08 100644
--- a/src/renderer/services/utils-io.ts
+++ b/src/renderer/services/utils-io.ts
@@ -305,6 +305,9 @@ export function findExtensionPathForId(
if (AppConfig.isWeb) {
return 'modules/' + extensionId;
}
+ if (AppConfig.isCordova) {
+ return 'node_modules/' + extensionId;
+ }
return process.env.NODE_ENV === 'development'
? 'modules/' + extensionId
: '../../node_modules/' + extensionId;