Skip to content

Commit

Permalink
Merge pull request #7 from Mobiletainment/chore/nx-11-update
Browse files Browse the repository at this point in the history
chore(workspace): update Nx workspace to v11 and serve frontend using withDeps
  • Loading branch information
Mobiletainment authored Jan 24, 2021
2 parents 03027c9 + f978ff1 commit f41b142
Show file tree
Hide file tree
Showing 22 changed files with 2,912 additions and 1,807 deletions.
41 changes: 0 additions & 41 deletions .eslintrc

This file was deleted.

25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"parserOptions": {},
"rules": {}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"parserOptions": {
"project": "./tsconfig.*?.json"
},
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
}
]
}
8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"recommendations": [
"nrwl.angular-console",
"ms-vscode.vscode-typescript-tslint-plugin",
"esbenp.prettier-vscode",
"firsttris.vscode-jest-runner"
]
}
File renamed without changes.
10 changes: 8 additions & 2 deletions apps/frontend1-e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"types": ["cypress", "node"]
},
"include": ["**/*.ts", "**/*.js"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.e2e.json"
}
]
}
248 changes: 0 additions & 248 deletions apps/frontend1/.eslintrc

This file was deleted.

14 changes: 14 additions & 0 deletions apps/frontend1/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"rules": {
"no-unused-expressions": [
"error",
{
"allowShortCircuit": true,
"allowTernary": true,
"allowTaggedTemplates": true
}
]
},
"extends": ["plugin:@nrwl/nx/react", "../../.eslintrc"],
"ignorePatterns": ["!**/*"]
}
4 changes: 2 additions & 2 deletions apps/frontend1/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module.exports = {
name: 'frontend1',
preset: '../../jest.config.js',
preset: '../../jest.preset.js',
transform: {
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
'^.+\\.[tj]sx?$': [
Expand All @@ -10,4 +9,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
coverageDirectory: '../../coverage/apps/frontend1',
displayName: 'frontend1',
};
6 changes: 5 additions & 1 deletion apps/frontend1/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,9 @@
"types": ["node"]
},
"exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"],
"files": [
"..\\..\\node_modules\\@nrwl\\react\\typings\\cssmodule.d.ts",
"..\\..\\node_modules\\@nrwl\\react\\typings\\image.d.ts"
]
}
Loading

0 comments on commit f41b142

Please sign in to comment.