Skip to content

Commit 457ac9f

Browse files
committed
feat: update yarn & make dmg file build with background by default
1 parent df82fa8 commit 457ac9f

16 files changed

+1159
-973
lines changed

.prettierrc.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module.exports = {
22
tabWidth: 4,
33
trailingComma: "all",
4-
jsxBracketSameLine: true
54
};

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

+259-81
Large diffs are not rendered by default.

.yarn/releases/yarn-3.2.0.cjs

-785
This file was deleted.

.yarn/releases/yarn-3.3.0.cjs

+807
Large diffs are not rendered by default.

.yarnrc.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
nodeLinker: node-modules
2-
31
plugins:
4-
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
5-
spec: "@yarnpkg/plugin-interactive-tools"
2+
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
3+
spec: "@yarnpkg/plugin-interactive-tools"
64

7-
yarnPath: .yarn/releases/yarn-3.2.0.cjs
5+
yarnPath: .yarn/releases/yarn-3.3.0.cjs
6+
nodeLinker: node-modules

README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ yarn start
4545
| `yarn clean` | Cleans the application bundle. |
4646

4747
There are also numerous OS-specific commands related to building and testing, all prefixed with `yarn`:
48-
- `build:linux:tar`, `build:linux:unpacked`, `build:linux:appimage`, `build:mac`, `build:windows:nsis`, `build:windows:appx`
49-
- Builds the application for the specified platform and packaging format.
50-
- `test:linux:appimage`
51-
- Runs the newest build of the Linux AppImage.
48+
49+
- `build:linux` `build:mac`, `build:windows`
50+
- Builds the application for the specified platform.
5251

5352
## License
5453

55-
Revolt Desktop is licensed under the [GNU Affero General Public License v3.0](https://github.com/revoltchat/desktop/blob/master/LICENSE).
54+
Revolt Desktop is licensed under the [GNU Affero General Public License v3.0](https://github.com/revoltchat/desktop/blob/master/LICENSE).
File renamed without changes.
File renamed without changes.

build/icon.png

20.5 KB
Loading

dmg-files/RevoltIcon.icns

-24.3 KB
Binary file not shown.

dmg-files/makedmg.sh

-14
This file was deleted.

package.json

+18-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"homepage": "https://revolt.chat",
1212
"main": "bundle/main.js",
1313
"scripts": {
14-
"build:bundle": "tsc",
15-
"watch:bundle": "tsc-watch",
1614
"start": "electron .",
1715
"eb": "electron-builder",
1816
"ci": "electron-builder --publish onTagOrDraft",
1917
"release": "dotenv -e .env electron-builder --publish always",
18+
"watch:bundle": "tsc-watch",
19+
"build:bundle": "tsc",
2020
"build:linux": "electron-builder -l",
2121
"build:mac": "electron-builder -m",
2222
"build:windows": "electron-builder -w",
@@ -79,7 +79,17 @@
7979
]
8080
}
8181
],
82-
"category": "Network"
82+
"category": "InstantMessaging",
83+
"desktop": {
84+
"Name": "Revolt",
85+
"Comment": "User-first, privacy focused chat platform.",
86+
"Exec": "revolt-desktop",
87+
"Terminal": false,
88+
"Type": "Application",
89+
"Icon": "revolt-desktop",
90+
"Categories": "InstantMessaging",
91+
"StartupWMClass": "RevoltDesktop"
92+
}
8393
},
8494
"win": {
8595
"target": [
@@ -100,7 +110,11 @@
100110
}
101111
]
102112
},
113+
"dmg": {
114+
"backgroundColor": "#101823"
115+
},
103116
"appx": {
117+
"backgroundColor": "#101823",
104118
"displayName": "Revolt Chat",
105119
"applicationId": "revolt.chat",
106120
"identityName": "40345RevoltCommunications.revolt.chat",
@@ -118,5 +132,5 @@
118132
"electron-updater": "^5.3.0",
119133
"electron-window-state": "^5.0.3"
120134
},
121-
"packageManager": "yarn@3.2.0"
135+
"packageManager": "yarn@3.3.0"
122136
}

revolt-desktop.desktop

-9
This file was deleted.

revolt-desktop.sh

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
exec electron22 /usr/lib/revolt-desktop/app.asar "$@"
3+
exec electron22 /usr/lib/revolt-desktop/app.asar "$@"

tsconfig.json

+64-66
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,73 @@
11
{
2-
"compilerOptions": {
3-
/* Visit https://aka.ms/tsconfig.json to read more about this file */
2+
"compilerOptions": {
3+
/* Visit https://aka.ms/tsconfig.json to read more about this file */
44

5-
/* Basic Options */
6-
// "incremental": true, /* Enable incremental compilation */
7-
"target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
8-
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
9-
// "lib": [], /* Specify library files to be included in the compilation. */
10-
// "allowJs": true, /* Allow javascript files to be compiled. */
11-
// "checkJs": true, /* Report errors in .js files. */
12-
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
13-
// "declaration": true, /* Generates corresponding '.d.ts' file. */
14-
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
15-
// "sourceMap": true, /* Generates corresponding '.map' file. */
16-
// "outFile": "./", /* Concatenate and emit output to single file. */
17-
"outDir": "./bundle", /* Redirect output structure to the directory. */
18-
"rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
19-
// "composite": true, /* Enable project compilation */
20-
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
21-
// "removeComments": true, /* Do not emit comments to output. */
22-
// "noEmit": true, /* Do not emit outputs. */
23-
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
24-
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
25-
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
5+
/* Basic Options */
6+
// "incremental": true, /* Enable incremental compilation */
7+
"target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */,
8+
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
9+
// "lib": [], /* Specify library files to be included in the compilation. */
10+
// "allowJs": true, /* Allow javascript files to be compiled. */
11+
// "checkJs": true, /* Report errors in .js files. */
12+
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
13+
// "declaration": true, /* Generates corresponding '.d.ts' file. */
14+
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
15+
// "sourceMap": true, /* Generates corresponding '.map' file. */
16+
// "outFile": "./", /* Concatenate and emit output to single file. */
17+
"outDir": "./bundle" /* Redirect output structure to the directory. */,
18+
"rootDir": "./src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
19+
// "composite": true, /* Enable project compilation */
20+
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
21+
// "removeComments": true, /* Do not emit comments to output. */
22+
// "noEmit": true, /* Do not emit outputs. */
23+
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
24+
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
25+
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
2626

27-
/* Strict Type-Checking Options */
28-
"strict": true, /* Enable all strict type-checking options. */
29-
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
30-
// "strictNullChecks": true, /* Enable strict null checks. */
31-
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
32-
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
33-
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
34-
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
35-
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
27+
/* Strict Type-Checking Options */
28+
"strict": true /* Enable all strict type-checking options. */,
29+
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
30+
// "strictNullChecks": true, /* Enable strict null checks. */
31+
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
32+
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
33+
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
34+
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
35+
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
3636

37-
/* Additional Checks */
38-
// "noUnusedLocals": true, /* Report errors on unused locals. */
39-
// "noUnusedParameters": true, /* Report errors on unused parameters. */
40-
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
41-
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
42-
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
43-
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
44-
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
37+
/* Additional Checks */
38+
// "noUnusedLocals": true, /* Report errors on unused locals. */
39+
// "noUnusedParameters": true, /* Report errors on unused parameters. */
40+
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
41+
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
42+
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
43+
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
44+
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
4545

46-
/* Module Resolution Options */
47-
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
48-
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
49-
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
50-
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
51-
// "typeRoots": [], /* List of folders to include type definitions from. */
52-
// "types": [], /* Type declaration files to be included in compilation. */
53-
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
54-
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
55-
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
56-
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
46+
/* Module Resolution Options */
47+
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
48+
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
49+
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
50+
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
51+
// "typeRoots": [], /* List of folders to include type definitions from. */
52+
// "types": [], /* Type declaration files to be included in compilation. */
53+
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
54+
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
55+
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
56+
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
5757

58-
/* Source Map Options */
59-
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
60-
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
61-
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
62-
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
58+
/* Source Map Options */
59+
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
60+
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
61+
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
62+
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
6363

64-
/* Experimental Options */
65-
"experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
66-
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
64+
/* Experimental Options */
65+
"experimentalDecorators": true /* Enables experimental support for ES7 decorators. */,
66+
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
6767

68-
/* Advanced Options */
69-
"skipLibCheck": true, /* Skip type checking of declaration files. */
70-
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
71-
},
72-
"include": [
73-
"src/**/*"
74-
]
68+
/* Advanced Options */
69+
"skipLibCheck": true /* Skip type checking of declaration files. */,
70+
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
71+
},
72+
"include": ["src/**/*"]
7573
}

yarn.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3019,11 +3019,11 @@ __metadata:
30193019

30203020
"typescript@patch:typescript@^4.9.3#~builtin<compat/typescript>":
30213021
version: 4.9.3
3022-
resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=bda367"
3022+
resolution: "typescript@patch:typescript@npm%3A4.9.3#~builtin<compat/typescript>::version=4.9.3&hash=d73830"
30233023
bin:
30243024
tsc: bin/tsc
30253025
tsserver: bin/tsserver
3026-
checksum: ef65c22622d864497d0a0c5db693523329b3284c15fe632e93ad9aa059e8dc38ef3bd767d6f26b1e5ecf9446f49bd0f6c4e5714a2eeaf352805dc002479843d1
3026+
checksum: 67ca21a387c0572f1c04936e638dde7782c5aa520c3754aadc7cc9b7c915da9ebc3e27c601bfff4ccb7d7264e82dce6d277ada82ec09dc75024349e0ef64926d
30273027
languageName: node
30283028
linkType: hard
30293029

0 commit comments

Comments
 (0)