Skip to content

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

scripts changes

sytolk07264814515a
diff --git a/.erb/configs/webpack.config.base.ts b/.erb/configs/webpack.config.base.ts
index c1e4faecb..cdbefcf6f 100644
--- a/.erb/configs/webpack.config.base.ts
+++ b/.erb/configs/webpack.config.base.ts
@@ -9,6 +9,10 @@ import webpackPaths from './webpack.paths';
import { dependencies as externals } from '../../release/app/package.json';
import NodePolyfillPlugin from 'node-polyfill-webpack-plugin';
import path = require('path');
+import { checkThirdPartyTxt, checkVersionJson } from '../../src/main/util';
+
+checkVersionJson();
+checkThirdPartyTxt();
const configuration: webpack.Configuration = {
// packages that is not included in the bundle
diff --git a/.erb/configs/webpack.config.renderer.dev.ts b/.erb/configs/webpack.config.renderer.dev.ts
index b1be99b2c..69ab0968c 100644
--- a/.erb/configs/webpack.config.renderer.dev.ts
+++ b/.erb/configs/webpack.config.renderer.dev.ts
@@ -10,6 +10,7 @@ import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
import baseConfig from './webpack.config.base';
import webpackPaths from './webpack.paths';
import checkNodeEnv from '../scripts/check-node-env';
+import { generateJWT } from '../../src/main/util';
// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
// at the dev webpack config is not accidentally run in a production environment
@@ -23,6 +24,7 @@ const skipDLLs =
module.parent?.filename.includes('webpack.config.renderer.dev.dll') ||
module.parent?.filename.includes('webpack.config.eslint');
+generateJWT();
/**
* Warn if the DLL is not built
*/
diff --git a/.erb/configs/webpack.config.renderer.prod.ts b/.erb/configs/webpack.config.renderer.prod.ts
index c20cb2afd..3dd6a831c 100644
--- a/.erb/configs/webpack.config.renderer.prod.ts
+++ b/.erb/configs/webpack.config.renderer.prod.ts
@@ -14,9 +14,11 @@ import baseConfig from './webpack.config.base';
import webpackPaths from './webpack.paths';
import checkNodeEnv from '../scripts/check-node-env';
import deleteSourceMaps from '../scripts/delete-source-maps';
+import { generateJWT } from '../../src/main/util';
checkNodeEnv('production');
deleteSourceMaps();
+generateJWT();
const configuration: webpack.Configuration = {
devtool: 'source-map',
diff --git a/.gitignore b/.gitignore
index f0ad7c265..5b0ef8509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,8 +65,7 @@ test/file-structure
public/modules
src/renderer/version.json
-src/renderer/THIRD-PARTY.html
-src/renderer/THIRD-PARTY.txt
+src/renderer/third-party.txt
scripts/setuppro.js
scripts/enablepro.js
diff --git a/package.json b/package.json
index 9862ef970..6a4d34728 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
},
"main": "./src/main/main.ts",
"scripts": {
- "build": "npm run prebuild && npm run third-party && concurrently \"npm run build:main\" \"npm run build:renderer\"",
+ "build": "npm run prebuild && concurrently \"npm run build:main\" \"npm run build:renderer\"",
"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",
@@ -43,14 +43,14 @@
"test": "jest",
"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",
+ "prebuild": "rimraf release/app/dist && npm run prepare-node && npm run generate-extensions",
"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\"",
+ "build-e2e-dev": "rimraf release/app/dist && npm run prepare-node && cross-env E2E_BUILD=true concurrently \"npm run build-main\" \"npm run build-renderer\" \"npm run build-web-dev\"",
"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",
- "bump-version": "npm run third-party && cd src/renderer && npm run version && cd .. && npm run version-meta",
+ "bump-version": "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",
"clean-pro": "npm run clean-maps",
@@ -60,7 +60,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": "npm run prepare-node && npm run generate-jwt && 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",
"dev-open-file": "git apply run-with-args.patch && npm run dev",
"generate-jwt": "node scripts/jwt_generate.js",
"generate-extensions": "node scripts/generateExtensionsConfig.js",
@@ -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 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",
+ "prepare-web": "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 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 ..",
diff --git a/src/main/util.ts b/src/main/util.ts
index 7775eda37..80eb13bc5 100644
--- a/src/main/util.ts
+++ b/src/main/util.ts
@@ -1,6 +1,10 @@
/* eslint import/prefer-default-export: off */
import { URL } from 'url';
import path from 'path';
+import webpackPaths from '../../.erb/configs/webpack.paths';
+import fs from 'fs';
+import chalk from 'chalk';
+import { execSync } from 'child_process';
export function resolveHtmlPath(htmlFileName: string) {
if (process.env.NODE_ENV === 'development') {
@@ -11,3 +15,56 @@ export function resolveHtmlPath(htmlFileName: string) {
}
return `file://${path.resolve(__dirname, '../renderer/', htmlFileName)}`;
}
+
+/**
+ * Warn version.json is missing
+ */
+export function checkVersionJson() {
+ const version = path.resolve(webpackPaths.srcRendererPath, 'version.json');
+ if (!fs.existsSync(version)) {
+ console.log(
+ chalk.black.bgYellow.bold(
+ 'The version.json files are missing. Sit back while we build them for you with "npm run version-meta"',
+ ),
+ );
+ execSync('npm run version-meta');
+ }
+}
+
+/**
+ * Warn third-party.txt is missing
+ */
+export function checkThirdPartyTxt() {
+ const thirdParty = path.resolve(
+ webpackPaths.srcRendererPath,
+ 'third-party.txt',
+ );
+ if (!fs.existsSync(thirdParty)) {
+ console.log(
+ chalk.black.bgYellow.bold(
+ 'The third-party.txt files are missing. Sit back while we build them for you with "npm run third-party"',
+ ),
+ );
+ execSync('npm run third-party');
+ }
+}
+
+/**
+ * generate JWT token
+ */
+export function generateJWT() {
+ const env = path.resolve(webpackPaths.appPath, '.env');
+ if (!fs.existsSync(env)) {
+ console.log(
+ chalk.black.bgYellow.bold(
+ 'The env files are missing. Sit back while we generate them for you with "KEY=testDevKey"',
+ ),
+ );
+ console.log(
+ chalk.red.bgWhiteBright.bold("Don't forget to change this KEY!"),
+ );
+ execSync('echo "KEY=testDevKey" > ' + env);
+ }
+
+ execSync('npm run generate-jwt');
+}