Skip to content

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

add web support

sytolk457d77e7a502
diff --git a/configs/webpack.config.web.dev.babel.js b/.erb/configs/webpack.config.web.dev.ts
similarity index 77%
rename from configs/webpack.config.web.dev.babel.js
rename to .erb/configs/webpack.config.web.dev.ts
index 94b47d391..c3e1862be 100644
--- a/configs/webpack.config.web.dev.babel.js
+++ b/.erb/configs/webpack.config.web.dev.ts
@@ -4,18 +4,20 @@
import path from 'path';
import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
// import OptimizeCSSAssetsPlugin from 'optimize-css-assets-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 = 'webdav-io'; // electron-io | webdav-io | cordova-io | process.env.APP_TARGET ||
// CheckNodeEnv('production');
-export default merge(baseConfig, {
+const configuration: webpack.Configuration = {
cache: false,
devtool: 'inline-source-map',
@@ -23,12 +25,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, '../web/dist'),
+ path: path.join(__dirname, '../../web/dist'),
publicPath: '../dist/',
filename: 'bundle.js',
},
@@ -131,49 +134,8 @@ export default merge(baseConfig, {
filename: 'fonts/[hash][ext][query]',
},
},
- /*{
- test: /\.woff(\?v=\d+\.\d+\.\d+)?$/,
- use: {
- loader: 'url-loader',
- options: {
- limit: 10000,
- mimetype: 'application/font-woff'
- }
- },
- type: 'javascript/auto'
- },
- // WOFF2 Font
- {
- test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/,
- use: {
- loader: 'url-loader',
- options: {
- limit: 10000,
- mimetype: 'application/font-woff'
- }
- },
- type: 'javascript/auto'
- },
- // TTF Font
- {
- test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
- use: {
- loader: 'url-loader',
- options: {
- limit: 10000,
- mimetype: 'application/octet-stream'
- }
- },
- type: 'javascript/auto'
- },
- // EOT Font
- {
- test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
- use: 'file-loader',
- type: 'javascript/auto'
- },*/
// SVG Font
- {
+ /*{
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
use: {
loader: 'url-loader',
@@ -183,13 +145,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)$/,
@@ -202,22 +159,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({
@@ -234,6 +204,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 => {
@@ -250,4 +233,6 @@ export default merge(baseConfig, {
openAnalyzer: process.env.OPEN_ANALYZER === 'true',
}),
],
-});
+};
+
+export default merge(baseConfig, configuration);
diff --git a/configs/webpack.config.web.prod.babel.js b/.erb/configs/webpack.config.web.prod.ts
similarity index 83%
rename from configs/webpack.config.web.prod.babel.js
rename to .erb/configs/webpack.config.web.prod.ts
index 867eec46d..81b465e34 100644
--- a/configs/webpack.config.web.prod.babel.js
+++ b/.erb/configs/webpack.config.web.prod.ts
@@ -4,30 +4,33 @@
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 = 'webdav-io'; // electron-io | webdav-io | cordova-io | process.env.APP_TARGET ||
// CheckNodeEnv('production');
-export default merge(baseConfig, {
+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, '../web/dist'),
+ path: path.join(__dirname, '../../web/dist'),
publicPath: '../dist/',
filename: 'bundle.js',
},
@@ -172,7 +175,7 @@ export default merge(baseConfig, {
type: 'javascript/auto'
},*/
// SVG Font
- {
+ /*{
test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
use: {
loader: 'url-loader',
@@ -182,13 +185,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)$/,
@@ -201,6 +199,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',
+ ],
+ },
],
},
@@ -223,18 +246,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({
@@ -251,6 +262,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 => {
@@ -267,4 +291,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 174dd7357..9c55a3c9a 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,8 @@
"build:dll": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts",
"build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
"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",
"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",
@@ -48,8 +50,6 @@
"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",
"build-main": "webpack --config ./configs/webpack.config.main.prod.babel.js",
"build-renderer": "webpack --config ./configs/webpack.config.renderer.prod.babel.js",
- "build-web": "rimraf web/dist && webpack --config ./configs/webpack.config.web.prod.babel.js",
- "build-web-dev": "rimraf web/dist && webpack --config ./configs/webpack.config.web.dev.babel.js",
"bump-version": "npm run third-party && cd src/renderer && npm run 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",
@@ -108,8 +108,8 @@
"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-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 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 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",
+ "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 ..",
@@ -118,7 +118,7 @@
"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",
- "run-web-dev": "npm run prepare-web-pro && npm run build-web-dev && node scripts/webserver.js",
+ "run-web-dev": "npm run prepare-web-pro && npm run build:web:dev && node scripts/webserver.js",
"setup-ext": "node scripts/setupextensions.js",
"setup-pro": "node scripts/setuppro.js",
"setup-tests": "node scripts/setup-tests.js",