Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 0 additions & 70 deletions forge.config.json

This file was deleted.

62 changes: 62 additions & 0 deletions forge.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import MakerDeb from '@electron-forge/maker-deb';
import MakerDMG from '@electron-forge/maker-dmg';
import MakerRpm from '@electron-forge/maker-rpm';
import MakerSquirrel from '@electron-forge/maker-squirrel';
import { ForgeConfig } from '@electron-forge/shared-types';

const config: ForgeConfig = {
packagerConfig: {
asar: true,
executableName: 'synectic',
icon: 'src/assets/icon/icon'
},
makers: [
new MakerSquirrel({
name: 'Synectic',
setupIcon: 'src/assets/icon/icon.ico'
}),
new MakerDMG({
icon: 'src/assets/icon/icon.icns',
format: 'ULFO'
}),
new MakerDeb({
options: {
maintainer: 'Nicholas Nelson',
homepage: 'https://github.com/EPICLab/synectic',
categories: [
'Development'
],
description: 'Research prototype IDE designed for human cognition and spatial interactions'
}
}),
new MakerRpm({
options: {
homepage: 'https://github.com/EPICLab/synectic',
categories: [
'Development'
],
description: 'Research prototype IDE designed for human cognition and spatial interactions'
}
})
],
plugins: [
{
name: '@electron-forge/plugin-webpack',
config: {
mainConfig: './webpack.main.config.js',
devContentSecurityPolicy: "default-src 'self' 'unsafe-inline' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline' data:; worker-src * data: 'unsafe-eval' 'unsafe-inline' blob:",
renderer: {
config: './webpack.renderer.config.js',
nodeIntegration: true,
entryPoints: [{
html: './src/index.html',
js: './src/app.tsx',
name: 'main_window'
}]
}
}
}
]
};

export default config;
2 changes: 0 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ module.exports = {
"electron": "<rootDir>/src/test-utils/mock-electron.ts",
"^dnd-core$": "dnd-core/dist/cjs",
"^react-dnd$": "react-dnd/dist/cjs",
"^react-dnd-html5-backend$": "react-dnd-html5-backend/dist/cjs",
"^react-dnd-touch-backend$": "react-dnd-touch-backend/dist/cjs",
"^react-dnd-test-backend$": "react-dnd-test-backend/dist/cjs",
"^react-dnd-test-utils$": "react-dnd-test-utils/dist/cjs",
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"license": "MIT",
"config": {
"forge": "./forge.config.json"
"forge": "./forge.config.ts"
},
"engines": {
"node": "^12.20.0 || ^14.13.1 || >=16.0.0",
Expand Down Expand Up @@ -95,6 +95,7 @@
"style-loader": "^3.3.1",
"ts-jest": "^27.1.4",
"ts-loader": "^9.4.2",
"ts-node": "^10.9.1",
"typescript": "^4.9.4",
"valid-url": "^1.0.9",
"validator": "^13.7.0",
Expand Down Expand Up @@ -123,7 +124,7 @@
"react": "^17.0.2",
"react-ace": "^10.1.0",
"react-dnd": "^15.1.1",
"react-dnd-html5-backend": "^15.1.2",
"react-dnd-html5-backend": "^16.0.1",
"react-dnd-preview": "^7.1.3",
"react-dom": "^17.0.2",
"react-flow-renderer": "^10.3.17",
Expand All @@ -135,4 +136,4 @@
"sha1": "^1.1.1",
"uuid": "^9.0.0"
}
}
}
Loading