mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-01-23 02:36:05 +00:00
build: upgrade to angular 10
This commit is contained in:
parent
76739ea277
commit
404c6b6e4b
13 changed files with 2004 additions and 1922 deletions
18
browserlist
18
browserlist
|
|
@ -1,18 +0,0 @@
|
|||
> 0.5%
|
||||
last 2 versions
|
||||
Firefox ESR
|
||||
not dead
|
||||
not IE 9-11
|
||||
not samsung 4
|
||||
not android 4.4.3-4.4.4
|
||||
not last 2 ie_mob versions
|
||||
not last 2 op_mini versions
|
||||
not last 2 op_mob versions
|
||||
not last 2 baidu versions
|
||||
not last 2 kaios versions
|
||||
not last 2 and_uc versions
|
||||
not last 2 and_qq versions
|
||||
not last 2 edge versions
|
||||
not chrome 49
|
||||
not chrome 50
|
||||
Chrome >= 51
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"extends": "../tsconfig.base.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/e2e",
|
||||
"module": "commonjs",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"extends": "../tsconfig.base.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/n2e",
|
||||
"module": "commonjs",
|
||||
|
|
|
|||
84
package.json
84
package.json
|
|
@ -62,7 +62,7 @@
|
|||
"int:watch": "node ./tools/extract-i18n-watch.js",
|
||||
"int:find": "ngx-translate-extract --input ./src --output ./src/assets/i18n/*.json --sort --format namespaced-json --marker _",
|
||||
"int:clean": "ngx-translate-extract --input ./src --output ./src/assets/i18n/*.json --clean --sort --format namespaced-json --marker _",
|
||||
"postinstall": " ngcc"
|
||||
"postinstall": "ngcc --tsconfig src/tsconfig.app.json"
|
||||
},
|
||||
"browserslist": [
|
||||
"last 1 version",
|
||||
|
|
@ -87,36 +87,36 @@
|
|||
"stacktrace-js": "^2.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-builders/custom-webpack": "^9.1.0",
|
||||
"@angular-devkit/build-angular": "~0.901.4",
|
||||
"@angular/animations": "^9.1.4",
|
||||
"@angular/cdk": "^9.2.2",
|
||||
"@angular/cli": "^9.1.4",
|
||||
"@angular/common": "^9.1.4",
|
||||
"@angular/compiler": "^9.1.4",
|
||||
"@angular/compiler-cli": "^9.1.4",
|
||||
"@angular/core": "^9.1.4",
|
||||
"@angular/forms": "^9.1.4",
|
||||
"@angular/language-service": "^9.1.4",
|
||||
"@angular/material": "^9.2.2",
|
||||
"@angular/material-moment-adapter": "^9.2.2",
|
||||
"@angular/platform-browser": "^9.1.4",
|
||||
"@angular/platform-browser-dynamic": "^9.1.4",
|
||||
"@angular/platform-server": "^9.1.4",
|
||||
"@angular/router": "^9.1.4",
|
||||
"@angular/service-worker": "^9.1.4",
|
||||
"@angular-builders/custom-webpack": "^10.0.0",
|
||||
"@angular-devkit/build-angular": "~0.1000.6",
|
||||
"@angular/animations": "^10.0.9",
|
||||
"@angular/cdk": "^10.1.3",
|
||||
"@angular/cli": "^10.0.6",
|
||||
"@angular/common": "^10.0.9",
|
||||
"@angular/compiler-cli": "^10.0.9",
|
||||
"@angular/compiler": "^10.0.9",
|
||||
"@angular/core": "^10.0.9",
|
||||
"@angular/forms": "^10.0.9",
|
||||
"@angular/language-service": "^10.0.9",
|
||||
"@angular/material-moment-adapter": "^10.1.3",
|
||||
"@angular/material": "^10.1.3",
|
||||
"@angular/platform-browser-dynamic": "^10.0.9",
|
||||
"@angular/platform-browser": "^10.0.9",
|
||||
"@angular/platform-server": "^10.0.9",
|
||||
"@angular/router": "^10.0.9",
|
||||
"@angular/service-worker": "^10.0.9",
|
||||
"@biesbjerg/ngx-translate-extract": "^2.3.4",
|
||||
"@ngrx/data": "^9.1.0",
|
||||
"@ngrx/effects": "^9.1.0",
|
||||
"@ngrx/entity": "^9.1.0",
|
||||
"@ngrx/schematics": "^9.1.0",
|
||||
"@ngrx/store": "9.2.0",
|
||||
"@ngrx/store-devtools": "^9.1.0",
|
||||
"@ngrx/data": "^10.0.0",
|
||||
"@ngrx/effects": "^10.0.0",
|
||||
"@ngrx/entity": "^10.0.0",
|
||||
"@ngrx/schematics": "^10.0.0",
|
||||
"@ngrx/store-devtools": "^10.0.0",
|
||||
"@ngrx/store": "10.0.0",
|
||||
"@ngx-formly/core": "^5.8.0",
|
||||
"@ngx-formly/material": "^5.8.0",
|
||||
"@ngx-translate/core": "^13.0.0",
|
||||
"@ngx-translate/http-loader": "^6.0.0",
|
||||
"@schematics/angular": "^10.0.1",
|
||||
"@schematics/angular": "^10.0.6",
|
||||
"@types/file-saver": "^2.0.1",
|
||||
"@types/hammerjs": "^2.0.36",
|
||||
"@types/jasmine": "^3.5.11",
|
||||
|
|
@ -128,60 +128,56 @@
|
|||
"@types/semver": "^7.3.1",
|
||||
"@types/shortid": "^0.0.29",
|
||||
"angular-material-css-vars": "^1.0.0",
|
||||
"angular2-promise-buttons": "4.0.9",
|
||||
"angular2-promise-buttons": "^4.0.9",
|
||||
"axios": "^0.19.2",
|
||||
"chart.js": "^2.8.0",
|
||||
"chromedriver": "^84.0.1",
|
||||
"clipboard": "^2.0.1",
|
||||
"codelyzer": "^6.0.0",
|
||||
"conventional-changelog-cli": "^2.0.21",
|
||||
"core-js": "^3.1.3",
|
||||
"cross-env": "^7.0.2",
|
||||
"electron": "^9.1.1",
|
||||
"electron-builder": "^22.7.0",
|
||||
"electron-notarize": "^1.0.0",
|
||||
"electron-reload": "^1.2.5",
|
||||
"electron": "^9.1.1",
|
||||
"file-saver": "^2.0.2",
|
||||
"hammerjs": "^2.0.8",
|
||||
"helpful-decorators": "^2.1.0",
|
||||
"husky": "^4.2.5",
|
||||
"idb": "^5.0.3",
|
||||
"jasmine-core": "^3.4.0",
|
||||
"jasmine-core": "~3.5.0",
|
||||
"jasmine-marbles": "^0.6.0",
|
||||
"jasmine-spec-reporter": "^5.0.2",
|
||||
"jasmine-spec-reporter": "~5.0.0",
|
||||
"jira2md": "git+https://github.com/johannesjo/J2M.git",
|
||||
"jo": "file:./tools/schematics",
|
||||
"karma": "^5.1.0",
|
||||
"karma-chrome-launcher": "^3.1.0",
|
||||
"karma-chrome-launcher": "~3.1.0",
|
||||
"karma-cli": "^2.0.0",
|
||||
"karma-coverage-istanbul-reporter": "~3.0.3",
|
||||
"karma-jasmine": "^3.3.1",
|
||||
"karma-jasmine-html-reporter": "^1.4.2",
|
||||
"karma-coverage-istanbul-reporter": "~3.0.2",
|
||||
"karma-jasmine-html-reporter": "^1.5.0",
|
||||
"karma-jasmine": "~3.3.0",
|
||||
"karma": "~5.0.0",
|
||||
"lz-string": "^1.4.4",
|
||||
"moment": "2.27.0",
|
||||
"moment-duration-format": "^2.2.2",
|
||||
"moment": "2.27.0",
|
||||
"new-github-issue-url": "^0.2.1",
|
||||
"ng2-charts": "^2.3.0",
|
||||
"ng2-charts-schematics": "^0.1.7",
|
||||
"ng2-charts": "^2.3.0",
|
||||
"ng2-dragula": "^2.1.1",
|
||||
"ngx-date-time-picker-schedule": "^9.4.6",
|
||||
"ngx-markdown": "^10.0.0",
|
||||
"nightwatch": "^1.3.6",
|
||||
"node-sass": "^4.12.0",
|
||||
"p-throttle": "^3.1.0",
|
||||
"pkce-challenge": "2.1.0",
|
||||
"protractor": "^7.0.0",
|
||||
"protractor": "~7.0.0",
|
||||
"query-string": "^6.11.0",
|
||||
"rxjs": "^6.6.0",
|
||||
"sass-loader": "^9.0.1",
|
||||
"semver": "^7.3.2",
|
||||
"shortid": "^2.2.15",
|
||||
"start-server-and-test": "^1.11.0",
|
||||
"style-loader": "^1.2.1",
|
||||
"ts-node": "~8.10.2",
|
||||
"tslib": "^2.0.0",
|
||||
"tslint": "^6.1.2",
|
||||
"typescript": "~3.8",
|
||||
"tslint": "~6.1.0",
|
||||
"typescript": "~3.9.7",
|
||||
"zone.js": "~0.10.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,4 +8,17 @@
|
|||
last 2 versions
|
||||
Firefox ESR
|
||||
not dead
|
||||
not IE 9-11
|
||||
not IE 9-11
|
||||
not samsung 4
|
||||
not android 4.4.3-4.4.4
|
||||
not last 2 ie_mob versions
|
||||
not last 2 op_mini versions
|
||||
not last 2 op_mob versions
|
||||
not last 2 baidu versions
|
||||
not last 2 kaios versions
|
||||
not last 2 and_uc versions
|
||||
not last 2 and_qq versions
|
||||
not last 2 edge versions
|
||||
not chrome 49
|
||||
not chrome 50
|
||||
Chrome >= 51
|
||||
|
|
@ -4,15 +4,9 @@
|
|||
font-weight: 400;
|
||||
src: local('Material Icons'),
|
||||
local('MaterialIcons-Regular'),
|
||||
url(assets/fonts/MaterialIcons-Regular.woff2) format('woff2'),
|
||||
url(assets/fonts/MaterialIcons-Regular.woff) format('woff'),
|
||||
url(assets/fonts/MaterialIcons-Regular.ttf) format('truetype');
|
||||
//src: url('../../assets/fonts/MaterialIcons-Regular.eot'); /* For IE6-8 */
|
||||
//src: local('Material Icons'),
|
||||
//local('MaterialIcons-Regular'),
|
||||
//url('../../assets/fonts/MaterialIcons-Regular.woff2') format('woff2'),
|
||||
//url('../../assets/fonts/MaterialIcons-Regular.woff') format('woff'),
|
||||
//url('../../assets/fonts/MaterialIcons-Regular.ttf') format('truetype');
|
||||
url('../../assets/fonts/MaterialIcons-Regular.woff2') format('woff2'),
|
||||
url('../../assets/fonts/MaterialIcons-Regular.woff') format('woff'),
|
||||
url('../../assets/fonts/MaterialIcons-Regular.ttf') format('truetype');
|
||||
}
|
||||
|
||||
.material-icons {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"extends": "../tsconfig.base.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/app",
|
||||
"types": [],
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"extends": "../tsconfig.base.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/spec",
|
||||
"types": [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"extends": "../tsconfig.base.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/worker",
|
||||
"lib": [
|
||||
|
|
|
|||
30
tsconfig.base.json
Normal file
30
tsconfig.base.json
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"baseUrl": "./",
|
||||
"outDir": "./dist/out-tsc",
|
||||
"sourceMap": true,
|
||||
"declaration": false,
|
||||
"module": "es2020",
|
||||
"moduleResolution": "node",
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"strictNullChecks": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"noImplicitReturns": true,
|
||||
"noUnusedLocals": true,
|
||||
"strictPropertyInitialization": true,
|
||||
"target": "es5",
|
||||
"resolveJsonModule": true,
|
||||
"typeRoots": [
|
||||
"node_modules/@types"
|
||||
],
|
||||
"types": [
|
||||
"@types/moment-duration-format"
|
||||
],
|
||||
"lib": [
|
||||
"es2017",
|
||||
"dom"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +1,23 @@
|
|||
/*
|
||||
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
|
||||
It is not intended to be used to perform a compilation.
|
||||
|
||||
To learn more about this file see: https://angular.io/config/solution-tsconfig.
|
||||
*/
|
||||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"baseUrl": "./",
|
||||
"outDir": "./dist/out-tsc",
|
||||
"sourceMap": true,
|
||||
"declaration": false,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "node",
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"strictNullChecks": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"noImplicitReturns": true,
|
||||
"noUnusedLocals": true,
|
||||
"strictPropertyInitialization": true,
|
||||
"target": "es5",
|
||||
"resolveJsonModule": true,
|
||||
"typeRoots": [
|
||||
"node_modules/@types"
|
||||
],
|
||||
"types": [
|
||||
"@types/moment-duration-format"
|
||||
],
|
||||
"lib": [
|
||||
"es2017",
|
||||
"dom"
|
||||
]
|
||||
}
|
||||
}
|
||||
"files": [],
|
||||
"references": [
|
||||
{
|
||||
"path": "./src/tsconfig.app.json"
|
||||
},
|
||||
{
|
||||
"path": "./src/tsconfig.worker.json"
|
||||
},
|
||||
{
|
||||
"path": "./src/tsconfig.spec.json"
|
||||
},
|
||||
{
|
||||
"path": "./e2e/tsconfig.e2e.json"
|
||||
}
|
||||
]
|
||||
}
|
||||
60
tslint.json
60
tslint.json
|
|
@ -1,8 +1,16 @@
|
|||
{
|
||||
"extends": "tslint:recommended",
|
||||
"rules": {
|
||||
"align": {
|
||||
"options": [
|
||||
"parameters",
|
||||
"statements"
|
||||
]
|
||||
},
|
||||
"array-type": false,
|
||||
"arrow-parens": false,
|
||||
"arrow-return-shorthand": true,
|
||||
"curly": true,
|
||||
"deprecation": {
|
||||
"severity": "warning"
|
||||
},
|
||||
|
|
@ -21,10 +29,17 @@
|
|||
"app",
|
||||
"kebab-case"
|
||||
],
|
||||
"eofline": true,
|
||||
"import-blacklist": [
|
||||
true,
|
||||
"rxjs/Rx"
|
||||
],
|
||||
"import-spacing": true,
|
||||
"indent": {
|
||||
"options": [
|
||||
"spaces"
|
||||
]
|
||||
},
|
||||
"interface-name": false,
|
||||
"max-classes-per-file": false,
|
||||
"max-line-length": [
|
||||
|
|
@ -60,7 +75,6 @@
|
|||
"no-non-null-assertion": true,
|
||||
"no-redundant-jsdoc": true,
|
||||
"no-switch-case-fall-through": true,
|
||||
"no-use-before-declare": false,
|
||||
"no-var-requires": false,
|
||||
"object-literal-key-quotes": [
|
||||
true,
|
||||
|
|
@ -72,6 +86,20 @@
|
|||
true,
|
||||
"single"
|
||||
],
|
||||
"semicolon": {
|
||||
"options": [
|
||||
"always"
|
||||
]
|
||||
},
|
||||
"space-before-function-paren": {
|
||||
"options": {
|
||||
"anonymous": "never",
|
||||
"asyncArrow": "always",
|
||||
"constructor": "never",
|
||||
"method": "never",
|
||||
"named": "never"
|
||||
}
|
||||
},
|
||||
"trailing-comma": false,
|
||||
"no-conflicting-lifecycle": true,
|
||||
"no-host-metadata-property": true,
|
||||
|
|
@ -83,6 +111,24 @@
|
|||
"no-outputs-metadata-property": true,
|
||||
"template-banana-in-box": true,
|
||||
"template-no-negated-async": false,
|
||||
"typedef-whitespace": {
|
||||
"options": [
|
||||
{
|
||||
"call-signature": "nospace",
|
||||
"index-signature": "nospace",
|
||||
"parameter": "nospace",
|
||||
"property-declaration": "nospace",
|
||||
"variable-declaration": "nospace"
|
||||
},
|
||||
{
|
||||
"call-signature": "onespace",
|
||||
"index-signature": "onespace",
|
||||
"parameter": "onespace",
|
||||
"property-declaration": "onespace",
|
||||
"variable-declaration": "onespace"
|
||||
}
|
||||
]
|
||||
},
|
||||
"use-lifecycle-interface": true,
|
||||
"use-pipe-transform-interface": true,
|
||||
"variable-name": [
|
||||
|
|
@ -93,7 +139,17 @@
|
|||
"check-format",
|
||||
"allow-leading-underscore"
|
||||
]
|
||||
},
|
||||
, "whitespace": {
|
||||
"options": [
|
||||
"check-branch",
|
||||
"check-decl",
|
||||
"check-operator",
|
||||
"check-separator",
|
||||
"check-type",
|
||||
"check-typecast"
|
||||
]
|
||||
}
|
||||
},
|
||||
"rulesDirectory": [
|
||||
"codelyzer"
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue