Skip to content

Commit

Permalink
fix(repo): update the repo to nx 10
Browse files Browse the repository at this point in the history
  • Loading branch information
vsavkin committed Jul 16, 2020
1 parent 67dda10 commit 5d53661
Show file tree
Hide file tree
Showing 71 changed files with 568 additions and 316 deletions.
1 change: 1 addition & 0 deletions e2e/angular/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/angular/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/bazel/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/bazel/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/cli/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/cli/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/cypress/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/cypress/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/jest/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/jest/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/linter/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/linter/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/next/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/next/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/node/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/node/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/nx-plugin/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/nx-plugin/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/react/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/react/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/storybook/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/storybook/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/web/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/web/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
1 change: 1 addition & 0 deletions e2e/workspace/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
maxWorkers: 1,
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
10 changes: 8 additions & 2 deletions e2e/workspace/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": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.spec.json"
}
]
}
3 changes: 3 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,8 @@
"tags": [],
"implicitDependencies": ["workspace", "create-nx-workspace"]
}
},
"affected": {
"defaultBase": "master"
}
}
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@
"submit-plugin": "node ./scripts/submit-plugin.js"
},
"devDependencies": {
"@angular-devkit/architect": "~0.1000.0",
"@angular-devkit/build-angular": "~0.1000.0",
"@angular-devkit/build-ng-packagr": "~0.1000.0",
"@angular-devkit/build-optimizer": "~0.1000.0",
"@angular-devkit/build-webpack": "~0.1000.0",
"@angular-devkit/core": "~10.0.0",
"@angular-devkit/schematics": "~10.0.0",
"@angular/cli": "~10.0.0",
"@angular/common": "^10.0.0",
"@angular/compiler": "^10.0.0",
"@angular/compiler-cli": "^10.0.0",
"@angular/core": "^10.0.0",
"@angular/forms": "^10.0.0",
"@angular/platform-browser": "^10.0.0",
"@angular/platform-browser-dynamic": "^10.0.0",
"@angular/router": "^10.0.0",
"@angular/service-worker": "^10.0.0",
"@angular/upgrade": "^10.0.0",
"@angular-devkit/architect": "0.1000.3",
"@angular-devkit/build-angular": "0.1000.3",
"@angular-devkit/build-ng-packagr": "0.1000.3",
"@angular-devkit/build-optimizer": "0.1000.3",
"@angular-devkit/build-webpack": "0.1000.3",
"@angular-devkit/core": "10.0.3",
"@angular-devkit/schematics": "10.0.3",
"@angular/cli": "10.0.3",
"@angular/common": "10.0.4",
"@angular/compiler": "10.0.4",
"@angular/compiler-cli": "10.0.4",
"@angular/core": "10.0.4",
"@angular/forms": "10.0.4",
"@angular/platform-browser": "10.0.4",
"@angular/platform-browser-dynamic": "10.0.4",
"@angular/router": "10.0.4",
"@angular/service-worker": "10.0.4",
"@angular/upgrade": "10.0.4",
"@babel/core": "7.9.6",
"@babel/plugin-proposal-class-properties": "7.8.3",
"@babel/plugin-proposal-decorators": "7.8.3",
Expand All @@ -62,16 +62,16 @@
"@ngrx/store": "9.1.0",
"@ngrx/store-devtools": "9.1.0",
"@ngtools/webpack": "~10.0.0",
"@nrwl/eslint-plugin-nx": "9.4.4",
"@nrwl/jest": "9.4.4",
"@nrwl/node": "9.4.4",
"@nrwl/workspace": "9.4.4",
"@nrwl/eslint-plugin-nx": "10.0.0-beta.4",
"@nrwl/jest": "10.0.0-beta.4",
"@nrwl/node": "10.0.0-beta.4",
"@nrwl/workspace": "10.0.0-beta.4",
"@reduxjs/toolkit": "1.3.2",
"@rollup/plugin-babel": "5.0.2",
"@rollup/plugin-commonjs": "11.0.2",
"@rollup/plugin-image": "2.0.4",
"@rollup/plugin-node-resolve": "7.1.1",
"@schematics/angular": "~10.0.0",
"@schematics/angular": "10.0.3",
"@storybook/addon-knobs": "5.3.9",
"@storybook/angular": "5.3.9",
"@storybook/core": "5.3.9",
Expand Down Expand Up @@ -221,7 +221,7 @@
"tsickle": "^0.38.1",
"tslib": "^1.9.3",
"tslint": "6.0.0",
"typescript": "~3.9.3",
"typescript": "3.9.6",
"url-loader": "^3.0.0",
"verdaccio": "^4.4.2",
"webpack": "4.42.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/angular/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module.exports = {
name: 'tao',
name: 'angular',
preset: '../../jest.config.js',
transform: {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
};
13 changes: 11 additions & 2 deletions packages/angular/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"types": ["node", "jest"]
},
"include": ["**/*.ts"]
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.lib.json"
},
{
"path": "./tsconfig.spec.json"
}
]
}
Loading

0 comments on commit 5d53661

Please sign in to comment.