Browse Source

Upgrade core dependencies

* angular
* nestjs
* Nx
* rxjs
* storybook
pull/490/head
Thomas 4 years ago
parent
commit
60caaf71bf
  1. 1
      .gitignore
  2. 37
      angular.json
  3. 2
      apps/api/tsconfig.app.json
  4. 2
      apps/api/tsconfig.spec.json
  5. 5
      apps/client/jest.config.js
  6. 10
      apps/client/src/polyfills.ts
  7. 2
      apps/client/src/styles.scss
  8. 2
      apps/client/src/styles/ghostfolio-style.scss
  9. 2
      apps/client/tsconfig.spec.json
  10. 2
      libs/common/tsconfig.lib.json
  11. 4
      libs/common/tsconfig.spec.json
  12. 2
      libs/ui/.storybook/tsconfig.json
  13. 3
      libs/ui/jest.config.js
  14. 1
      libs/ui/tsconfig.lib.json
  15. 2
      libs/ui/tsconfig.spec.json
  16. 42
      nx.json
  17. 88
      package.json
  18. 5602
      yarn.lock

1
.gitignore

@ -23,6 +23,7 @@
!.vscode/settings.json !.vscode/settings.json
# misc # misc
/.angular/cache
/.sass-cache /.sass-cache
/connect.lock /connect.lock
/coverage /coverage

37
angular.json

@ -1,22 +1,5 @@
{ {
"version": 1, "version": 1,
"cli": {
"defaultCollection": "@nrwl/nest"
},
"defaultProject": "api",
"schematics": {
"@nrwl/angular:application": {
"linter": "eslint",
"unitTestRunner": "jest",
"e2eTestRunner": "cypress"
},
"@nrwl/angular:library": {
"linter": "eslint",
"unitTestRunner": "jest"
},
"@nrwl/nest": {},
"@nrwl/angular:component": {}
},
"projects": { "projects": {
"api": { "api": {
"root": "apps/api", "root": "apps/api",
@ -69,7 +52,8 @@
}, },
"outputs": ["coverage/apps/api"] "outputs": ["coverage/apps/api"]
} }
} },
"tags": []
}, },
"client": { "client": {
"projectType": "application", "projectType": "application",
@ -201,7 +185,8 @@
}, },
"outputs": ["coverage/apps/client"] "outputs": ["coverage/apps/client"]
} }
} },
"tags": []
}, },
"client-e2e": { "client-e2e": {
"root": "apps/client-e2e", "root": "apps/client-e2e",
@ -221,7 +206,9 @@
} }
} }
} }
} },
"tags": [],
"implicitDependencies": ["client"]
}, },
"common": { "common": {
"root": "libs/common", "root": "libs/common",
@ -242,7 +229,8 @@
"passWithNoTests": true "passWithNoTests": true
} }
} }
} },
"tags": []
}, },
"ui": { "ui": {
"projectType": "library", "projectType": "library",
@ -300,7 +288,8 @@
} }
} }
} }
} },
"tags": []
}, },
"ui-e2e": { "ui-e2e": {
"root": "apps/ui-e2e", "root": "apps/ui-e2e",
@ -326,7 +315,9 @@
"lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"] "lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"]
} }
} }
} },
"tags": [],
"implicitDependencies": ["ui"]
} }
} }
} }

2
apps/api/tsconfig.app.json

@ -6,6 +6,6 @@
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"target": "es2015" "target": "es2015"
}, },
"exclude": ["**/*.spec.ts"], "exclude": ["**/*.spec.ts", "**/*.test.ts"],
"include": ["**/*.ts"] "include": ["**/*.ts"]
} }

2
apps/api/tsconfig.spec.json

@ -5,5 +5,5 @@
"module": "commonjs", "module": "commonjs",
"types": ["jest", "node"] "types": ["jest", "node"]
}, },
"include": ["**/*.spec.ts", "**/*.d.ts"] "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
} }

5
apps/client/jest.config.js

@ -14,5 +14,8 @@ module.exports = {
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',
'jest-preset-angular/build/serializers/html-comment' 'jest-preset-angular/build/serializers/html-comment'
], ],
transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' } transform: {
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular'
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)']
}; };

10
apps/client/src/polyfills.ts

@ -18,16 +18,6 @@
* BROWSER POLYFILLS * BROWSER POLYFILLS
*/ */
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/** /**
* By default, zone.js will patch all possible macroTask and DomEvents * By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags * user can disable parts of macroTask/DomEvents patch by setting following flags

2
apps/client/src/styles.scss

@ -3,7 +3,7 @@
@import './styles/bootstrap'; @import './styles/bootstrap';
@import './styles/table'; @import './styles/table';
@import '~angular-material-css-vars/main'; @import '~angular-material-css-vars/src/lib/main';
@import '~svgmap/dist/svgMap'; @import '~svgmap/dist/svgMap';

2
apps/client/src/styles/ghostfolio-style.scss

@ -1,6 +1,6 @@
$mat-css-dark-theme-selector: '.is-dark-theme'; $mat-css-dark-theme-selector: '.is-dark-theme';
@import '~angular-material-css-vars/public-util'; @import '~angular-material-css-vars/src/lib/public-util';
$alpha-disabled-text: 0.38; $alpha-disabled-text: 0.38;
$alpha-hover: 0.04; $alpha-hover: 0.04;

2
apps/client/tsconfig.spec.json

@ -6,5 +6,5 @@
"types": ["jest", "node"] "types": ["jest", "node"]
}, },
"files": ["src/test-setup.ts"], "files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"] "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
} }

2
libs/common/tsconfig.lib.json

@ -5,5 +5,5 @@
"types": [] "types": []
}, },
"include": ["**/*.ts"], "include": ["**/*.ts"],
"exclude": ["**/*.spec.ts"] "exclude": ["**/*.spec.ts", "**/*.test.ts"]
} }

4
libs/common/tsconfig.spec.json

@ -7,9 +7,13 @@
}, },
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",
"**/*.test.ts",
"**/*.spec.tsx", "**/*.spec.tsx",
"**/*.test.tsx",
"**/*.spec.js", "**/*.spec.js",
"**/*.test.js",
"**/*.spec.jsx", "**/*.spec.jsx",
"**/*.test.jsx",
"**/*.d.ts" "**/*.d.ts"
] ]
} }

2
libs/ui/.storybook/tsconfig.json

@ -3,6 +3,6 @@
"compilerOptions": { "compilerOptions": {
"emitDecoratorMetadata": true "emitDecoratorMetadata": true
}, },
"exclude": ["../**/*.spec.ts"], "exclude": ["../**/*.spec.ts", "../**/*.test.ts"],
"include": ["../src/**/*", "*.js"] "include": ["../src/**/*", "*.js"]
} }

3
libs/ui/jest.config.js

@ -10,8 +10,9 @@ module.exports = {
}, },
coverageDirectory: '../../coverage/libs/ui', coverageDirectory: '../../coverage/libs/ui',
transform: { transform: {
'^.+\\.(ts|js|html)$': 'jest-preset-angular' '^.+.(ts|mjs|js|html)$': 'jest-preset-angular'
}, },
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
snapshotSerializers: [ snapshotSerializers: [
'jest-preset-angular/build/serializers/no-ng-attributes', 'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/ng-snapshot',

1
libs/ui/tsconfig.lib.json

@ -12,6 +12,7 @@
"exclude": [ "exclude": [
"src/test-setup.ts", "src/test-setup.ts",
"**/*.spec.ts", "**/*.spec.ts",
"**/*.test.ts",
"**/*.stories.ts", "**/*.stories.ts",
"**/*.stories.js" "**/*.stories.js"
], ],

2
libs/ui/tsconfig.spec.json

@ -6,5 +6,5 @@
"types": ["jest", "node"] "types": ["jest", "node"]
}, },
"files": ["src/test-setup.ts"], "files": ["src/test-setup.ts"],
"include": ["**/*.spec.ts", "**/*.d.ts"] "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
} }

42
nx.json

@ -23,30 +23,9 @@
"test", "test",
"e2e", "e2e",
"build-storybook" "build-storybook"
] ],
} "parallel": 1
} }
},
"projects": {
"api": {
"tags": []
},
"client": {
"tags": []
},
"client-e2e": {
"tags": [],
"implicitDependencies": ["client"]
},
"common": {
"tags": []
},
"ui": {
"tags": []
},
"ui-e2e": {
"tags": [],
"implicitDependencies": ["ui"]
} }
}, },
"targetDependencies": { "targetDependencies": {
@ -56,5 +35,22 @@
"projects": "dependencies" "projects": "dependencies"
} }
] ]
},
"cli": {
"defaultCollection": "@nrwl/nest"
},
"defaultProject": "api",
"generators": {
"@nrwl/angular:application": {
"linter": "eslint",
"unitTestRunner": "jest",
"e2eTestRunner": "cypress"
},
"@nrwl/angular:library": {
"linter": "eslint",
"unitTestRunner": "jest"
},
"@nrwl/nest": {},
"@nrwl/angular:component": {}
} }
} }

88
package.json

@ -48,27 +48,27 @@
"workspace-generator": "nx workspace-generator" "workspace-generator": "nx workspace-generator"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "12.2.4", "@angular/animations": "13.0.2",
"@angular/cdk": "12.2.4", "@angular/cdk": "13.0.2",
"@angular/common": "12.2.4", "@angular/common": "13.0.2",
"@angular/compiler": "12.2.4", "@angular/compiler": "13.0.2",
"@angular/core": "12.2.4", "@angular/core": "13.0.2",
"@angular/forms": "12.2.4", "@angular/forms": "13.0.2",
"@angular/material": "12.2.4", "@angular/material": "13.0.2",
"@angular/platform-browser": "12.2.4", "@angular/platform-browser": "13.0.2",
"@angular/platform-browser-dynamic": "12.2.4", "@angular/platform-browser-dynamic": "13.0.2",
"@angular/router": "12.2.4", "@angular/router": "13.0.2",
"@codewithdan/observable-store": "2.2.11", "@codewithdan/observable-store": "2.2.11",
"@dinero.js/currencies": "2.0.0-alpha.8", "@dinero.js/currencies": "2.0.0-alpha.8",
"@nestjs/common": "7.6.18", "@nestjs/common": "8.2.3",
"@nestjs/config": "0.6.3", "@nestjs/config": "0.6.3",
"@nestjs/core": "7.6.18", "@nestjs/core": "8.2.3",
"@nestjs/jwt": "7.2.0", "@nestjs/jwt": "7.2.0",
"@nestjs/passport": "7.1.6", "@nestjs/passport": "7.1.6",
"@nestjs/platform-express": "7.6.18", "@nestjs/platform-express": "8.2.3",
"@nestjs/schedule": "0.4.3", "@nestjs/schedule": "0.4.3",
"@nestjs/serve-static": "2.1.4", "@nestjs/serve-static": "2.1.4",
"@nrwl/angular": "12.8.0", "@nrwl/angular": "13.2.2",
"@prisma/client": "2.30.2", "@prisma/client": "2.30.2",
"@simplewebauthn/browser": "4.1.0", "@simplewebauthn/browser": "4.1.0",
"@simplewebauthn/server": "4.1.0", "@simplewebauthn/server": "4.1.0",
@ -76,7 +76,7 @@
"@stripe/stripe-js": "1.15.0", "@stripe/stripe-js": "1.15.0",
"@types/papaparse": "5.2.6", "@types/papaparse": "5.2.6",
"alphavantage": "2.2.0", "alphavantage": "2.2.0",
"angular-material-css-vars": "2.1.2", "angular-material-css-vars": "3.0.0",
"bent": "7.3.12", "bent": "7.3.12",
"big.js": "6.1.1", "big.js": "6.1.1",
"bootstrap": "4.6.0", "bootstrap": "4.6.0",
@ -108,7 +108,7 @@
"prisma": "2.30.2", "prisma": "2.30.2",
"reflect-metadata": "0.1.13", "reflect-metadata": "0.1.13",
"round-to": "5.0.0", "round-to": "5.0.0",
"rxjs": "6.6.7", "rxjs": "7.4.0",
"stripe": "8.156.0", "stripe": "8.156.0",
"svgmap": "2.6.0", "svgmap": "2.6.0",
"tslib": "2.0.0", "tslib": "2.0.0",
@ -117,33 +117,33 @@
"zone.js": "0.11.4" "zone.js": "0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "12.2.4", "@angular-devkit/build-angular": "13.0.3",
"@angular-eslint/eslint-plugin": "12.3.1", "@angular-eslint/eslint-plugin": "12.6.1",
"@angular-eslint/eslint-plugin-template": "12.3.0", "@angular-eslint/eslint-plugin-template": "12.6.1",
"@angular-eslint/template-parser": "12.3.0", "@angular-eslint/template-parser": "12.6.1",
"@angular/cli": "12.2.4", "@angular/cli": "13.0.3",
"@angular/compiler-cli": "12.2.4", "@angular/compiler-cli": "13.0.2",
"@angular/language-service": "12.2.4", "@angular/language-service": "13.0.2",
"@angular/localize": "12.2.4", "@angular/localize": "13.0.2",
"@nestjs/schematics": "7.3.1", "@nestjs/schematics": "8.0.5",
"@nestjs/testing": "7.6.18", "@nestjs/testing": "8.2.3",
"@nrwl/cli": "12.8.0", "@nrwl/cli": "13.2.2",
"@nrwl/cypress": "12.8.0", "@nrwl/cypress": "13.2.2",
"@nrwl/eslint-plugin-nx": "12.8.0", "@nrwl/eslint-plugin-nx": "13.2.2",
"@nrwl/jest": "12.8.0", "@nrwl/jest": "13.2.2",
"@nrwl/nest": "12.8.0", "@nrwl/nest": "13.2.2",
"@nrwl/node": "12.8.0", "@nrwl/node": "13.2.2",
"@nrwl/storybook": "12.9.0", "@nrwl/storybook": "13.2.2",
"@nrwl/tao": "12.8.0", "@nrwl/tao": "13.2.2",
"@nrwl/workspace": "12.8.0", "@nrwl/workspace": "13.2.2",
"@storybook/addon-essentials": "6.3.8", "@storybook/addon-essentials": "6.4.0-rc.3",
"@storybook/angular": "6.3.8", "@storybook/angular": "6.4.0-rc.3",
"@storybook/builder-webpack5": "6.3.8", "@storybook/builder-webpack5": "6.4.0-rc.3",
"@storybook/manager-webpack5": "6.3.8", "@storybook/manager-webpack5": "6.4.0-rc.3",
"@types/big.js": "6.1.2", "@types/big.js": "6.1.2",
"@types/cache-manager": "3.4.2", "@types/cache-manager": "3.4.2",
"@types/color": "3.0.2", "@types/color": "3.0.2",
"@types/jest": "26.0.20", "@types/jest": "27.0.2",
"@types/lodash": "4.14.174", "@types/lodash": "4.14.174",
"@types/node": "14.14.33", "@types/node": "14.14.33",
"@types/passport-google-oauth20": "2.0.6", "@types/passport-google-oauth20": "2.0.6",
@ -159,14 +159,14 @@
"import-sort-cli": "6.0.0", "import-sort-cli": "6.0.0",
"import-sort-parser-typescript": "6.0.0", "import-sort-parser-typescript": "6.0.0",
"import-sort-style-module": "6.0.0", "import-sort-style-module": "6.0.0",
"jest": "27.0.3", "jest": "27.2.3",
"jest-preset-angular": "9.0.3", "jest-preset-angular": "11.0.0",
"prettier": "2.3.2", "prettier": "2.3.2",
"replace-in-file": "6.2.0", "replace-in-file": "6.2.0",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"ts-jest": "27.0.3", "ts-jest": "27.0.5",
"ts-node": "9.1.1", "ts-node": "9.1.1",
"typescript": "4.3.5" "typescript": "4.4.4"
}, },
"engines": { "engines": {
"node": ">=14" "node": ">=14"

5602
yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save