Skip to content

Commit

Permalink
update to latest version of nx (#82)
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz authored Jan 8, 2020
1 parent cbcbad9 commit 58df0de
Show file tree
Hide file tree
Showing 18 changed files with 768 additions and 311 deletions.
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"builder": "@nrwl/web:build",
"options": {
"outputPath": "dist/apps/cart",
"webpackConfig": "@nrwl/react/plugins/babel",
"webpackConfig": "@nrwl/react/plugins/webpack",
"index": "apps/cart/src/index.html",
"main": "apps/cart/src/main.tsx",
"polyfills": "apps/cart/src/polyfills.ts",
Expand Down
6 changes: 5 additions & 1 deletion apps/cart/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
"allowSyntheticDefaultImports": true,
"types": ["node", "jest"]
},
"include": ["**/*.ts", "**/*.tsx"]
"include": ["**/*.ts", "**/*.tsx"],
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
]
}
2 changes: 1 addition & 1 deletion apps/cart/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../tslint.json",
"rules": []
"rules": {}
}
2 changes: 1 addition & 1 deletion libs/cart/cart-page/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../..//tslint.json",
"rules": []
"rules": {}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ul>
<li *ngFor="let product of (products | async)">
<li *ngFor="let product of products | async">
<a [routerLink]="['/product', product.id]">
<figure>
<img [src]="product.image" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ng-container *ngIf="(product | async) as product">
<ng-container *ngIf="product | async as product">
<div>
<figure>
<img [src]="product.image" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import { SharedProductStateModule } from '@nx-example/shared/product/state';
import { ProductDetailPageComponent } from './product-detail-page.component';

class MockActivatedRoute {
paramMap = of(new Map<string, string>([['productId', '1']]));
paramMap = of(
new Map<string, string>([['productId', '1']])
);
}

describe('ProductDetailPageComponent', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ export class ProductDetailPageComponent implements OnInit {
product = this.route.paramMap.pipe(
map(paramMap => paramMap.get('productId')),
concatMap(productId =>
this.store.pipe(
select(getProductsState),
select(getProduct, productId)
)
this.store.pipe(select(getProductsState), select(getProduct, productId))
)
);
constructor(
Expand Down
2 changes: 1 addition & 1 deletion libs/shared/e2e-utils/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../../tslint.json",
"rules": []
"rules": {}
}
2 changes: 1 addition & 1 deletion libs/shared/header/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../../tslint.json",
"rules": []
"rules": {}
}
2 changes: 1 addition & 1 deletion libs/shared/jsxify/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../../tslint.json",
"rules": []
"rules": {}
}
2 changes: 1 addition & 1 deletion libs/shared/product/data/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../../../tslint.json",
"rules": []
"rules": {}
}
2 changes: 1 addition & 1 deletion libs/shared/product/types/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../../../tslint.json",
"rules": []
"rules": {}
}
2 changes: 1 addition & 1 deletion libs/shared/product/ui/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../../../tslint.json",
"rules": []
"rules": {}
}
2 changes: 1 addition & 1 deletion libs/shared/styles/tslint.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "../../../tslint.json",
"rules": []
"rules": {}
}
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@
"@angular/platform-browser": "8.2.14",
"@angular/platform-browser-dynamic": "8.2.14",
"@angular/router": "8.2.14",
"@emotion/core": "10.0.10",
"@emotion/styled": "10.0.14",
"@emotion/core": "10.0.27",
"@emotion/styled": "10.0.27",
"@ngrx/effects": "8.3.0",
"@ngrx/entity": "8.3.0",
"@ngrx/router-store": "8.3.0",
"@ngrx/store": "8.3.0",
"@nrwl/angular": "8.8.3",
"@nrwl/angular": "8.10.1",
"core-js": "^2.5.4",
"document-register-element": "1.13.1",
"firebase": ">= 5.5.7 <7",
"normalize.css": "^8.0.1",
"react": "16.10.2",
"react-dom": "16.10.2",
"react": "16.12.0",
"react-dom": "16.12.0",
"react-router-dom": "5.1.2",
"rxjs": "~6.5.3",
"zone.js": "^0.9.1"
Expand All @@ -61,19 +61,19 @@
"@angular/language-service": "8.2.14",
"@babel/preset-react": "7.0.0",
"@ngrx/store-devtools": "8.3.0",
"@nrwl/cypress": "8.8.3",
"@nrwl/jest": "8.8.3",
"@nrwl/react": "8.8.3",
"@nrwl/web": "8.8.3",
"@nrwl/workspace": "8.8.3",
"@testing-library/react": "9.3.0",
"@nrwl/cypress": "8.10.1",
"@nrwl/jest": "8.10.1",
"@nrwl/react": "8.10.1",
"@nrwl/web": "8.10.1",
"@nrwl/workspace": "8.10.1",
"@testing-library/react": "9.4.0",
"@types/jest": "24.0.9",
"@types/node": "~8.9.4",
"@types/react": "16.8.23",
"@types/react-dom": "16.8.5",
"@types/react-router-dom": "^4.3.4",
"@types/react": "16.9.17",
"@types/react-dom": "16.9.4",
"@types/react-router-dom": "5.1.3",
"codelyzer": "~5.0.1",
"cypress": "3.4.0",
"cypress": "3.6.1",
"dotenv": "6.2.0",
"firebase-tools": "^7.2.2",
"fuzzy": "^0.1.3",
Expand All @@ -83,7 +83,7 @@
"jest-environment-jsdom-fourteen": "^0.1.0",
"jest-preset-angular": "7.0.0",
"netlify": "^2.4.8",
"prettier": "1.16.4",
"prettier": "1.19.1",
"ts-jest": "24.0.0",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
Expand Down
4 changes: 1 addition & 3 deletions tools/scripts/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ if (!existsSync(outDir)) {
console.log(`Deploying ${argv.siteName} to Netlify...`);
const deployResult = await netlifyClient.deploy(site.id, outDir);
console.log(
`\n🚀 New version of ${argv.siteName} is running at ${
deployResult.deploy.ssl_url
}!\n`
`\n🚀 New version of ${argv.siteName} is running at ${deployResult.deploy.ssl_url}!\n`
);
} catch (e) {
console.error('Authentication Failure: Invalid Token');
Expand Down
Loading

0 comments on commit 58df0de

Please sign in to comment.