Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix npm audit issues and make local development working again #67

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
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
5 changes: 4 additions & 1 deletion electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ function createWindow() {
}

mainWindow = new BrowserWindow({
icon: path.resolve('icons', 'icon.png'),
icon: path.resolve('icons', 'icon.ico'),
height: 768,
width: 768,
minHeight: 768,
minWidth: 768,
webPreferences: {
nodeIntegration: true
}
})
mainWindow.on('closed', function() {
mainWindow = null
Expand Down
6 changes: 3 additions & 3 deletions electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repository": "https://github.com/cerebral/cerebral",
"author": "Christian Alfoni",
"dependencies": {
"electron-default-menu": "^1.0.1",
"electron-json-storage": "^4.0.2",
"ws": "^5.1.0"
"electron-default-menu": "1.0.1",
"electron-json-storage": "4.0.2",
"ws": "5.1.0"
}
}
Binary file added icons/1024x1024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/icon.icns
Binary file not shown.
Binary file added icons/icon.ico
Binary file not shown.
30,670 changes: 14,841 additions & 15,829 deletions package-lock.json

Large diffs are not rendered by default.

99 changes: 53 additions & 46 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"package:linux": "cross-env NODE_ENV=production DEBUG=electron-builder:7z,electron-builder build -l",
"lint": "eslint \"**/*.js\"",
"test": "npm run lint",
"precommit": "lint-staged"
"precommit": "lint-staged",
"preinstall": "npx npm-force-resolutions"
},
"lint-staged": {
"*.js": [
Expand Down Expand Up @@ -60,54 +61,60 @@
}
},
"dependencies": {
"@cerebral/inferno": "^3.2.1",
"@cerebral/useragent": "^3.2.1",
"cerebral": "^4.2.1",
"classnames": "^2.2.5",
"color": "^3.0.0",
"color-hash": "^1.0.3",
"electron-default-menu": "^1.0.1",
"electron-json-storage": "^4.0.2",
"electron-log": "^2.2.14",
"electron-updater": "^2.21.4",
"@cerebral/inferno": "3.0.0",
"@cerebral/useragent": "2.6.0",
"cerebral": "4.2.2",
"classnames": "2.2.5",
"color": "3.0.0",
"color-hash": "1.0.3",
"electron-default-menu": "1.0.1",
"electron-json-storage": "4.0.2",
"electron-log": "2.2.14",
"electron-updater": "2.21.4",
"feature.js": "1.0.0",
"function-tree": "3.2.1",
"inferno": "^5.0.1",
"inferno-create-element": "^5.0.4",
"prismjs": "^1.13.0",
"traverse": "^0.6.6",
"ws": "^5.1.0"
"inferno": "7.4.2",
"inferno-component": "7.4.2",
"inferno-create-element": "3.9.0",
"prismjs": "1.13.0",
"traverse": "0.6.6",
"ws": "5.1.0"
},
"devDependencies": {
"babel-core": "^6.26.0",
"babel-loader": "^7.1.4",
"babel-plugin-inferno": "^5.0.1",
"babel-preset-env": "^1.6.1",
"concurrently": "^3.5.1",
"cross-env": "^5.1.4",
"css-loader": "^0.28.11",
"electron": "^1.8.4",
"electron-builder": "20.8.1",
"eslint": "^4.19.1",
"eslint-config-prettier": "^2.9.0",
"eslint-config-standard": "^11.0.0",
"eslint-config-standard-jsx": "^5.0.0",
"eslint-plugin-import": "^2.10.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-prettier": "^2.6.0",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-react": "^7.7.0",
"eslint-plugin-standard": "^3.0.1",
"express": "^4.16.3",
"file-loader": "^1.1.11",
"husky": "^0.14.3",
"lint-staged": "^9.4.1",
"babel-core": "6.26.0",
"babel-loader": "7.1.4",
"babel-plugin-inferno": "5.1.0",
"babel-preset-env": "1.6.1",
"concurrently": "3.5.1",
"cross-env": "5.1.4",
"css-loader": "4.0.0",
"electron": "9.1.1",
"electron-builder": "22.8.1",
"eslint": "4.19.1",
"eslint-config-prettier": "2.9.0",
"eslint-config-standard": "11.0.0",
"eslint-config-standard-jsx": "5.0.0",
"eslint-plugin-import": "2.10.0",
"eslint-plugin-node": "6.0.1",
"eslint-plugin-prettier": "2.6.0",
"eslint-plugin-promise": "3.7.0",
"eslint-plugin-react": "7.7.0",
"eslint-plugin-standard": "3.0.1",
"express": "4.16.3",
"file-loader": "1.1.11",
"husky": "0.14.3",
"lint-staged": "9.4.1",
"npm-force-resolutions": "0.0.3",
"prettier": "1.11.1",
"rimraf": "^2.6.2",
"style-loader": "^0.20.3",
"url-loader": "^1.0.1",
"webpack": "^4.4.1",
"webpack-cli": "^2.0.13",
"webpack-dev-server": "^3.1.1",
"webpack-hot-middleware": "^2.21.2"
"rimraf": "2.6.2",
"style-loader": "0.20.3",
"url-loader": "1.0.1",
"webpack": "4.44.0",
"webpack-cli": "3.3.12",
"webpack-dev-server": "3.11.0",
"webpack-hot-middleware": "2.21.2"
},
"resolutions": {
"feature.js": "1.0.0"
}
}
5 changes: 3 additions & 2 deletions src/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ export default config =>
Module({
modules: {
storage,
useragent: UserAgent({
useragent: Module(UserAgent({
media: {
small: '(max-width: 1270px)',
},
}),
})),

},
state: {
config,
Expand Down