Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-01-23 02:36:05 +00:00
Code Issues Projects Releases Wiki Activity

build: update configuration files

Browse source 
Update various configuration files as part of the build system reorganization.
This commit is contained in:
Johannes Millan 2025-06-27 10:25:00 +02:00
parent 54542d51cf
commit 75f1b64105
10 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -1,11 +1,10 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
/.tmp
/dist
/app-builds
/tmp
/out-tsc
/logs
# dependencies
/node_modules
@ -45,9 +44,6 @@ yarn-error.log
testem.log
/typings
chromedriver.log
e2e-test-results
e2e/screenshots
perf-metrics-*.json
.eslintcache
# System Files

2
angular.json
View file

@ -24,7 +24,7 @@
"options": {
"aot": true,
"outputPath": {
"base": "dist"
"base": ".tmp/angular-dist"
},
"index": "src/index.html",
"polyfills": ["src/polyfills.ts"],

8
e2e/nightwatch.conf.js
View file

@ -1,7 +1,7 @@
module.exports = {
src_folders: ['../out-tsc/e2e/src'],
output_folder: './e2e-test-results',
custom_commands_path: 'out-tsc/e2e/commands',
src_folders: ['../.tmp/out-tsc/e2e/src'],
output_folder: './.tmp/e2e-test-results',
custom_commands_path: '.tmp/out-tsc/e2e/commands',
test_workers: {
enabled: false,
workers: 5,
@ -41,7 +41,7 @@ module.exports = {
enabled: true,
on_failure: true,
on_error: true,
path: './e2e-test-results/screenshots',
path: './.tmp/e2e-test-results/screenshots',
},
globals: {
waitForConditionPollInterval: 500,

2
e2e/tsconfig.e2e.json
View file

@ -1,7 +1,7 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"outDir": "../.tmp/out-tsc/e2e",
"target": "esnext",
"module": "commonjs",
"esModuleInterop": true,

4
electron-builder.yaml
View file

@ -6,12 +6,12 @@ files:
- electron/**/*
- '!electron/**/*.ts'
- '!electron/**/*.js.map'
- dist/**/*
- .tmp/angular-dist/**/*
- 'embedded.provisionprofile'
#afterSign: ./tools/notarizeMacApp.js
directories:
output: './app-builds'
output: './.tmp/deploy'
win:
target:

14
package.json
View file

@ -53,7 +53,7 @@
"dist:win:store": "git pull && npm run && copy electron-builder.win-store.yaml electron-builder.yaml && npm run dist:win && git checkout electron-builder.yaml || git checkout electron-builder.yaml",
"droid": "npm run buildFrontend:stageWeb:unminified && npx cap sync",
"e2e": "cross-env TZ='Europe/Berlin' DETECT_CHROMEDRIVER_VERSION=true SKIP_POST_INSTALL=true npm i -D chromedriver --legacy-peer-deps && tsc --project e2e/tsconfig.e2e.json && start-server-and-test 'ng serve --no-live-reload' http://localhost:4200 'nightwatch -c ./e2e/nightwatch.conf.js --suiteRetries 1 --retries 1'",
"e2e:tag": "killall chromedriver; rm -R ./out-tsc; tsc --project e2e/tsconfig.e2e.json && nightwatch -c ./e2e/nightwatch.conf.js --suiteRetries 0 --retries 0 --tag ",
"e2e:tag": "killall chromedriver; rm -R ./.tmp/out-tsc; tsc --project e2e/tsconfig.e2e.json --outDir ./.tmp/out-tsc && nightwatch -c ./e2e/nightwatch.conf.js --suiteRetries 0 --retries 0 --tag ",
"electron": "NODE_ENV=PROD electron .",
"electron:build": "tsc -p electron/tsconfig.electron.json",
"electron:watch": "tsc -p electron/tsconfig.electron.json --watch",
@ -71,11 +71,11 @@
"lint:ts": "ng lint",
"lint:scss": "stylelint \"**/*.scss\"",
"lint:scss:ci": "npm run lint:scss -- --custom-formatter @csstools/stylelint-formatter-github",
"localInstall": "sudo echo 'Starting local install' && rm -Rf ./dist/ && rm -Rf ./app-builds/ && npm run buildAllElectron:stage && electron-builder --linux deb && sudo dpkg -i app-builds/superProductivity*.deb",
"localInstall:mac": "sudo echo 'Starting local install MAC. Don`t forget APPLEID & APPLEIDPASS !!' && npm run buildAllElectron:noTests:prod && sudo echo '' && electron-builder && sudo cp -rf app-builds/mac/superProductivity.app/ /Applications/superProductivity.app",
"localInstall:prod": "sudo echo 'Starting local install PROD' && rm -Rf ./dist/ && rm -Rf ./app-builds/ && npm run buildAllElectron:prod && electron-builder --linux deb && sudo dpkg -i app-builds/superProductivity*.deb",
"localInstall:quick": "sudo echo 'Starting local install QUICK' && rm -Rf ./dist/ && rm -Rf ./app-builds/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux deb && sudo dpkg -i app-builds/superProductivity*.deb",
"localInstall:test:snap": "sudo echo 'Starting local install SNAP QUICK' && rm -Rf ./dist/ && rm -Rf ./app-builds/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux snap && sudo snap install --dangerous app-builds/superProductivity*.snap",
"localInstall": "sudo echo 'Starting local install' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildAllElectron:stage && electron-builder --linux deb && sudo dpkg -i .tmp/deploy/superProductivity*.deb",
"localInstall:mac": "sudo echo 'Starting local install MAC. Don`t forget APPLEID & APPLEIDPASS !!' && npm run buildAllElectron:noTests:prod && sudo echo '' && electron-builder && sudo cp -rf .tmp/deploy/mac/superProductivity.app/ /Applications/superProductivity.app",
"localInstall:prod": "sudo echo 'Starting local install PROD' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildAllElectron:prod && electron-builder --linux deb && sudo dpkg -i .tmp/deploy/superProductivity*.deb",
"localInstall:quick": "sudo echo 'Starting local install QUICK' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux deb && sudo dpkg -i .tmp/deploy/superProductivity*.deb",
"localInstall:test:snap": "sudo echo 'Starting local install SNAP QUICK' && rm -Rf ./.tmp/angular-dist/ && rm -Rf ./.tmp/deploy/ && npm run buildFrontend:stage:es6 && npm run electron:build && electron-builder --linux snap && sudo snap install --dangerous .tmp/deploy/superProductivity*.snap",
"ng": "ng",
"pack": "electron-builder --dir",
"preCheck": "npm run lint && npm run test & npm run int:test && npm run e2e",
@ -86,7 +86,7 @@
"start": "npm run electron:build && cross-env NODE_ENV=DEV electron .",
"startFrontend": "ng serve",
"sync:android": "npx cap sync android",
"stats": "ng build --configuration production --source-map --stats-json && npx esbuild-visualizer --metadata dist/stats.json && xdg-open stats.html",
"stats": "ng build --configuration production --source-map --stats-json && npx esbuild-visualizer --metadata .tmp/angular-dist/stats.json && xdg-open stats.html",
"test": "cross-env TZ='Europe/Berlin' ng test --watch=false",
"test:watch": "cross-env TZ='Europe/Berlin' ng test --browsers ChromeHeadless",
"version": "npm run prebuild && npm run release.changelog && node ./tools/bump-android-version.js && git add -A",

2
src/tsconfig.app.json
View file

@ -1,7 +1,7 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"outDir": "../.tmp/out-tsc/app",
"types": [],
"strict": true,
"allowSyntheticDefaultImports": true

2
src/tsconfig.spec.json
View file

@ -2,7 +2,7 @@
"extends": "../tsconfig.base.json",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"outDir": "../out-tsc/spec",
"outDir": "../.tmp/out-tsc/spec",
"types": ["jasmine", "node"]
},
"files": ["test.ts", "polyfills.ts"],

2
src/tsconfig.worker.json
View file

@ -1,7 +1,7 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/worker",
"outDir": "../.tmp/out-tsc/worker",
"lib": ["es2018", "webworker"],
"types": []
},

4
tools/gen-perf-metrics.js
View file

@ -1,7 +1,7 @@
const fs = require('fs');
const mi = JSON.parse(fs.readFileSync('perf-metrics-initial-load.json', 'utf8'));
const mct = JSON.parse(fs.readFileSync('perf-metrics-create-tasks.json', 'utf8'));
const mi = JSON.parse(fs.readFileSync('.tmp/perf-metrics-initial-load.json', 'utf8'));
const mct = JSON.parse(fs.readFileSync('.tmp/perf-metrics-create-tasks.json', 'utf8'));
const block = (m) => {
return `