chore: merge v2.4.0
This commit is contained in:
Amadou Ada DIENE
11
CHANGELOG.md
11
CHANGELOG.md
@@ -2,6 +2,17 @@
|
||||
|
||||
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
## [2.4.0](https://github.com/sourcygen/electron-angular-quick-start/compare/v2.0.1...v2.4.0) (2021-08-06)
|
||||
|
||||
### Features
|
||||
|
||||
- ci build/test/make (github workflows) ([351eb1a](https://github.com/sourcygen/electron-angular-quick-start/commit/351eb1a7f0bd78043d8590effe7482965e0574b1))
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- shared-lib not found ([99742e3](https://github.com/sourcygen/electron-angular-quick-start/commit/99742e3dc1779141c5c8f2ec573faf33c72dea84))
|
||||
- using chokidar instead of npm-watch (issue [#4](https://github.com/sourcygen/electron-angular-quick-start/issues/4)) ([2feedce](https://github.com/sourcygen/electron-angular-quick-start/commit/2feedcefc5a2125e701b460bbd3d644775572d47))
|
||||
|
||||
## [2.3.0](https://github.com/sourcygen/electron-angular-quick-start/compare/v2.0.1...v2.3.0) (2021-08-01)
|
||||
|
||||
### Features
|
||||
|
||||
26
README.md
26
README.md
@@ -99,13 +99,37 @@ This project architecture is based on [npm workspaces](https://docs.npmjs.com/cl
|
||||
- shared-lib
|
||||
`npm install --save <dependency> -w shared-lib`
|
||||
|
||||
### Listing outdated dependencies
|
||||
|
||||
- electron-app
|
||||
`npm run outdated-deps:electron-app`
|
||||
- angular-app
|
||||
`npm run outdated-deps:angular-app`
|
||||
- shared-lib
|
||||
`npm run outdated-deps:shared-lib`
|
||||
- all of them
|
||||
`npm run outdated-deps`
|
||||
|
||||
### Updating dependencies
|
||||
|
||||
- electron-app
|
||||
`npm run update-deps:electron-app`
|
||||
- angular-app
|
||||
`npm run update-deps:angular-app`
|
||||
- shared-lib
|
||||
`npm run update-deps:shared-lib`
|
||||
- all of them
|
||||
`npm run update-deps`
|
||||
|
||||
**NB**: Be sure your `electron` and `spectron` dependencies are matching according to this [version mapping table](https://github.com/electron-userland/spectron#version-map).
|
||||
|
||||
### Customizing app icons
|
||||
|
||||
```bash
|
||||
# Install the icon generator globally
|
||||
npm i -g electron-icon-maker
|
||||
|
||||
# Run following command from anywhere you have your input file (1024px à least) to generate platforms icons
|
||||
# Run following command from anywhere you have your input file (1024px at least) to generate platforms icons
|
||||
electron-icon-maker --input=icon.png --output=./out
|
||||
```
|
||||
|
||||
|
||||
13007
package-lock.json
generated
13007
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
57
package.json
57
package.json
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "electron-angular-app",
|
||||
"productName": "Electron Angular App",
|
||||
"version": "2.3.0",
|
||||
"version": "2.4.0",
|
||||
"description": "An Electron and Angular Quick-starter",
|
||||
"repository": "https://github.com/sourcygen/electron-angular-quick-start.git",
|
||||
"author": "Sourcygen",
|
||||
@@ -36,13 +36,21 @@
|
||||
"make": "npm run package:angular-app && electron-forge make",
|
||||
"publish": "electron-forge publish",
|
||||
"lint": "npm run package:shared-lib && eslint --ext .ts .",
|
||||
"test:e2e": "npm run test:angular-e2e && npm run test:electron-e2",
|
||||
"test:e2e": "npm run test:angular-e2e && npm run test:electron-e2e",
|
||||
"test:angular-e2e": "npm-run-all -p -r start start:angular-e2e",
|
||||
"start:angular-e2e": "wait-on http://localhost:4200 && cd workspaces/angular-app && npm run cypress:run",
|
||||
"test:electron-e2e": "npm run package && cross-env X_NODE_ENV=e2e-test node workspaces/electron-e2e/jasmine.js",
|
||||
"clean": "shx rm -rf .webpack out node_modules workspaces/shared-lib/.dist workspaces/angular-app/node_modules workspaces/angular-app/.dist",
|
||||
"prepare": "husky install",
|
||||
"postinstall": "husky install && shx rm -rf .git/hooks && shx ln -s ../.husky .git/hooks",
|
||||
"outdated-deps": "npm run outdated-deps:electron-app && npm run outdated-deps:angular-app && npm run outdated-deps:shared-lib",
|
||||
"outdated-deps:electron-app": "npx ncu",
|
||||
"outdated-deps:angular-app": "cd workspaces/angular-app && npx ncu",
|
||||
"outdated-deps:shared-lib": "cd workspaces/shared-lib && npx ncu",
|
||||
"update-deps": "npm run update-deps:electron-app && npm run update-deps:angular-app && npm run update-deps:shared-lib",
|
||||
"update-deps:electron-app": "npx ncu -u",
|
||||
"update-deps:angular-app": "cd workspaces/angular-app && ng update @angular/cli @angular/core --force && npx ncu -u",
|
||||
"update-deps:shared-lib": "cd workspaces/shared-lib && npx ncu -u",
|
||||
"release:minor": "standard-version --release-as minor",
|
||||
"release:patch": "standard-version --release-as patch",
|
||||
"release:major": "standard-version --release-as major"
|
||||
@@ -92,46 +100,47 @@
|
||||
}
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^12.1.4",
|
||||
"@commitlint/config-conventional": "^12.1.4",
|
||||
"@electron-forge/cli": "^6.0.0-beta.57",
|
||||
"@electron-forge/maker-deb": "^6.0.0-beta.57",
|
||||
"@electron-forge/maker-dmg": "^6.0.0-beta.58",
|
||||
"@electron-forge/maker-rpm": "^6.0.0-beta.57",
|
||||
"@electron-forge/maker-squirrel": "^6.0.0-beta.57",
|
||||
"@electron-forge/maker-zip": "^6.0.0-beta.57",
|
||||
"@electron-forge/plugin-webpack": "6.0.0-beta.57",
|
||||
"@types/jasmine": "^3.8.1",
|
||||
"@commitlint/cli": "^13.1.0",
|
||||
"@commitlint/config-conventional": "^13.1.0",
|
||||
"@electron-forge/cli": "^6.0.0-beta.59",
|
||||
"@electron-forge/maker-deb": "^6.0.0-beta.59",
|
||||
"@electron-forge/maker-dmg": "^6.0.0-beta.59",
|
||||
"@electron-forge/maker-rpm": "^6.0.0-beta.59",
|
||||
"@electron-forge/maker-squirrel": "^6.0.0-beta.59",
|
||||
"@electron-forge/maker-zip": "^6.0.0-beta.59",
|
||||
"@electron-forge/plugin-webpack": "6.0.0-beta.59",
|
||||
"@types/jasmine": "^3.8.2",
|
||||
"@types/jasminewd2": "^2.0.10",
|
||||
"@types/lodash": "^4.14.171",
|
||||
"@types/node": "^14.17.5",
|
||||
"@typescript-eslint/eslint-plugin": "^4.0.1",
|
||||
"@typescript-eslint/parser": "^4.0.1",
|
||||
"@types/lodash": "^4.14.172",
|
||||
"@types/node": "^16.4.13",
|
||||
"@typescript-eslint/eslint-plugin": "^4.29.0",
|
||||
"@typescript-eslint/parser": "^4.29.0",
|
||||
"@vercel/webpack-asset-relocator-loader": "^1.6.0",
|
||||
"chokidar-cli": "^3.0.0",
|
||||
"copy-webpack-plugin": "^9.0.1",
|
||||
"cross-env": "^7.0.3",
|
||||
"css-loader": "^5.0.0",
|
||||
"electron": "^13.1.7",
|
||||
"eslint": "^7.6.0",
|
||||
"css-loader": "^6.2.0",
|
||||
"electron": "^13.1.8",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-import": "^2.20.0",
|
||||
"eslint-plugin-import": "^2.23.4",
|
||||
"eslint-plugin-prettier": "^3.4.0",
|
||||
"fork-ts-checker-webpack-plugin": "^6.0.1",
|
||||
"fork-ts-checker-webpack-plugin": "^6.3.1",
|
||||
"husky": "^7.0.1",
|
||||
"jasmine": "^3.8.0",
|
||||
"jasmine-core": "^3.8.0",
|
||||
"jasmine-spec-reporter": "^7.0.0",
|
||||
"lint-staged": "^11.0.1",
|
||||
"lint-staged": "^11.1.2",
|
||||
"node-loader": "^2.0.0",
|
||||
"npm-check-updates": "^11.8.3",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^2.3.2",
|
||||
"shx": "^0.3.3",
|
||||
"spectron": "^15.0.0",
|
||||
"standard-version": "^9.3.1",
|
||||
"style-loader": "^2.0.0",
|
||||
"style-loader": "^3.2.1",
|
||||
"tree-kill": "^1.2.2",
|
||||
"ts-loader": "^9.2.2",
|
||||
"ts-loader": "^9.2.5",
|
||||
"ts-node": "^10.1.0",
|
||||
"typescript": "^4.3.5",
|
||||
"wait-on": "^6.0.0"
|
||||
|
||||
2351
workspaces/angular-app/package-lock.json
generated
2351
workspaces/angular-app/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -10,33 +10,33 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "~12.1.2",
|
||||
"@angular/common": "~12.1.2",
|
||||
"@angular/compiler": "~12.1.2",
|
||||
"@angular/core": "~12.1.2",
|
||||
"@angular/forms": "~12.1.2",
|
||||
"@angular/platform-browser": "~12.1.2",
|
||||
"@angular/platform-browser-dynamic": "~12.1.2",
|
||||
"@angular/router": "~12.1.2",
|
||||
"@angular/animations": "~12.2.0",
|
||||
"@angular/common": "~12.2.0",
|
||||
"@angular/compiler": "~12.2.0",
|
||||
"@angular/core": "~12.2.0",
|
||||
"@angular/forms": "~12.2.0",
|
||||
"@angular/platform-browser": "~12.2.0",
|
||||
"@angular/platform-browser-dynamic": "~12.2.0",
|
||||
"@angular/router": "~12.2.0",
|
||||
"@ngx-translate/core": "^13.0.0",
|
||||
"@ngx-translate/http-loader": "^6.0.0",
|
||||
"electron": "^13.1.7",
|
||||
"rxjs": "~6.6.0",
|
||||
"tslib": "^2.2.0",
|
||||
"electron": "^13.1.8",
|
||||
"rxjs": "~7.3.0",
|
||||
"tslib": "^2.3.0",
|
||||
"zone.js": "~0.11.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "~12.1.2",
|
||||
"@angular/cli": "~12.1.2",
|
||||
"@angular/compiler-cli": "~12.1.2",
|
||||
"@cypress/schematic": "^1.4.2",
|
||||
"@types/node": "^12.11.1",
|
||||
"karma": "~6.3.0",
|
||||
"@angular-devkit/build-angular": "~12.2.0",
|
||||
"@angular/cli": "~12.2.0",
|
||||
"@angular/compiler-cli": "~12.2.0",
|
||||
"@cypress/schematic": "^1.5.0",
|
||||
"@types/node": "^16.4.13",
|
||||
"cypress": "8.2.0",
|
||||
"karma": "~6.3.4",
|
||||
"karma-chrome-launcher": "~3.1.0",
|
||||
"karma-coverage": "~2.0.3",
|
||||
"karma-jasmine": "~4.0.0",
|
||||
"karma-jasmine": "~4.0.1",
|
||||
"karma-jasmine-html-reporter": "~1.7.0",
|
||||
"typescript": "^4.3.5",
|
||||
"cypress": "8.0.0"
|
||||
"typescript": "^4.3.5"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user