Skip to content

Commit 8db11d4

Browse files
bcallaghan-etBen Callaghan
andauthored
feat(core): Add generator option for standalone projects (#71)
Add a generator option for app, lib, and test to make standalone projects Co-authored-by: Ben Callaghan <bcallaghan@selectbankcard.com>
1 parent 705777d commit 8db11d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1481
-1111
lines changed

apps/docs-site/project.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"projectType": "application",
3+
"root": "apps/docs-site",
4+
"sourceRoot": "apps/docs-site/src",
5+
"targets": {
6+
"build": {
7+
"executor": "@nx-plus/docusaurus:browser",
8+
"options": {
9+
"outputPath": "dist/apps/docs-site"
10+
}
11+
},
12+
"serve": {
13+
"executor": "@nx-plus/docusaurus:dev-server",
14+
"options": {
15+
"port": 3000
16+
}
17+
},
18+
"deploy": {
19+
"executor": "@nrwl/workspace:run-commands",
20+
"options": {
21+
"commands": [
22+
"nx workspace-schematic generate-docs",
23+
"nx build docs-site",
24+
"npx ts-node tools/scripts/publish-docs-site"
25+
],
26+
"parallel": false
27+
}
28+
}
29+
},
30+
"tags": []
31+
}

apps/nx-ghpages-e2e/project.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"projectType": "application",
3+
"root": "apps/nx-ghpages-e2e",
4+
"sourceRoot": "apps/nx-ghpages-e2e/src",
5+
"targets": {
6+
"e2e": {
7+
"executor": "@nrwl/nx-plugin:e2e",
8+
"options": {
9+
"target": "nx-ghpages:build",
10+
"npmPackageName": "@nx-dotnet/nx-ghpages",
11+
"pluginOutputPath": "dist/packages/nx-ghpages",
12+
"jestConfig": "apps/nx-ghpages-e2e/jest.config.js"
13+
}
14+
}
15+
},
16+
"tags": [],
17+
"implicitDependencies": ["nx-ghpages"]
18+
}

e2e/core-e2e/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ module.exports = {
1111
},
1212
moduleFileExtensions: ['ts', 'js', 'html'],
1313
coverageDirectory: '../../coverage/e2ecore-e2e',
14-
testTimeout: 60000,
14+
testTimeout: 90000,
1515
};

e2e/core-e2e/project.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"projectType": "application",
3+
"root": "e2e/core-e2e",
4+
"sourceRoot": "e2e/core-e2e/src",
5+
"targets": {
6+
"e2e": {
7+
"executor": "@nrwl/nx-plugin:e2e",
8+
"options": {
9+
"target": "core:build",
10+
"npmPackageName": "@nx-dotnet/core",
11+
"pluginOutputPath": "dist/packages/core",
12+
"jestConfig": "e2e/core-e2e/jest.config.js"
13+
}
14+
}
15+
},
16+
"tags": [],
17+
"implicitDependencies": ["core"]
18+
}

e2e/core-e2e/tests/nx-dotnet.spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from '@nrwl/nx-plugin/testing';
77

88
describe('nx-dotnet e2e', () => {
9-
it('should create apps, libs, and project references', async (done) => {
9+
it('should create apps, libs, and project references', async () => {
1010
const testApp = uniq('app');
1111
const testLib = uniq('lib');
1212
ensureNxProject('@nx-dotnet/core', 'dist/packages/core');
@@ -24,8 +24,6 @@ describe('nx-dotnet e2e', () => {
2424
);
2525

2626
expect(output.stdout).toMatch(/Reference .* added to the project/);
27-
28-
done();
2927
});
3028

3129
describe('nx g app', () => {

e2e/nxdoc-e2e/project.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"projectType": "application",
3+
"root": "e2e/nxdoc-e2e",
4+
"sourceRoot": "e2e/nxdoc-e2e/src",
5+
"targets": {
6+
"e2e": {
7+
"executor": "@nrwl/nx-plugin:e2e",
8+
"options": {
9+
"target": "nxdoc:build",
10+
"npmPackageName": "@nx-dotnet/nxdoc",
11+
"pluginOutputPath": "dist/packages/nxdoc",
12+
"jestConfig": "e2e/nxdoc-e2e/jest.config.js"
13+
}
14+
}
15+
},
16+
"tags": [],
17+
"implicitDependencies": ["nxdoc"]
18+
}

e2e/nxdoc-e2e/tests/nxdoc.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
describe('nxdoc e2e', () => {
2-
it('should have a test', async (done) => {
2+
it('should have a test', async () => {
33
expect(true).toBeTruthy();
4-
done();
54
});
65
});

e2e/typescript-e2e/project.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"projectType": "application",
3+
"root": "e2e/typescript-e2e",
4+
"sourceRoot": "e2e/typescript-e2e/src",
5+
"targets": {
6+
"e2e": {
7+
"executor": "@nrwl/nx-plugin:e2e",
8+
"options": {
9+
"target": "typescript:build",
10+
"npmPackageName": "@nx-dotnet/typescript",
11+
"pluginOutputPath": "dist/packages/typescript",
12+
"jestConfig": "e2e/typescript-e2e/jest.config.js"
13+
}
14+
}
15+
},
16+
"tags": [],
17+
"implicitDependencies": ["typescript"]
18+
}

jest.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module.exports = {
22
projects: [
33
'<rootDir>/packages/core',
4-
'<rootDir>/e2e\\core-e2e',
4+
'<rootDir>/e2e/core-e2e',
55
'<rootDir>/packages/typescript',
6-
'<rootDir>/e2e\\typescript-e2e',
6+
'<rootDir>/e2e/typescript-e2e',
77
'<rootDir>/packages/dotnet',
88
'<rootDir>/packages/utils',
99
'<rootDir>/packages/utils',
1010
'<rootDir>/packages/dotnet',
1111
'<rootDir>/packages/nxdoc',
12-
'<rootDir>/e2e\\nxdoc-e2e',
12+
'<rootDir>/e2e/nxdoc-e2e',
1313
'<rootDir>/packages/nx-ghpages',
14-
'<rootDir>/apps\\nx-ghpages-e2e',
14+
'<rootDir>/apps/nx-ghpages-e2e',
1515
],
1616
};

migrations.json

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
11
{
22
"migrations": [
33
{
4-
"version": "12.1.0-beta.1",
4+
"version": "12.5.0-beta.1",
5+
"description": "Rename the workspace-schematic script into workspace-generator script",
6+
"factory": "./src/migrations/update-12-5-0/add-target-dependencies",
57
"cli": "nx",
6-
"description": "Update jest-preset-angular to version 8.4.0",
7-
"factory": "./src/migrations/update-12-1-2/update-jest-preset-angular",
8+
"package": "@nrwl/workspace",
9+
"name": "add-target-dependencies"
10+
},
11+
{
12+
"version": "12.4.0-beta.1",
13+
"cli": "nx",
14+
"description": "Add testEnvironment: 'jsdom' in web apps + libraries",
15+
"factory": "./src/migrations/update-12-4-0/add-test-environment-for-node",
816
"package": "@nrwl/jest",
9-
"name": "update-jest-preset-angular-8-4-0"
17+
"name": "support-jest-27"
1018
},
1119
{
12-
"version": "12.1.2-beta.1",
20+
"version": "12.4.0-beta.1",
1321
"cli": "nx",
14-
"description": "Replace tsConfig with tsconfig for ts-jest in jest.config.js",
15-
"factory": "./src/migrations/update-12-1-2/update-ts-jest",
22+
"description": "Support for Jest 27 via updating ts-jest + jest-preset-angular",
23+
"factory": "./src/migrations/update-12-4-0/update-jest-preset-angular",
1624
"package": "@nrwl/jest",
17-
"name": "update-ts-jest-6-5-5"
25+
"name": "update-ts-jest-and-jest-preset-angular"
26+
},
27+
{
28+
"cli": "nx",
29+
"version": "12.4.0-beta.0",
30+
"description": "Remove ESLint parserOptions.project config if no rules requiring type-checking are in use",
31+
"factory": "./src/migrations/update-12-4-0/remove-eslint-project-config-if-no-type-checking-rules",
32+
"package": "@nrwl/linter",
33+
"name": "remove-eslint-project-config-if-no-type-checking-rules"
1834
}
1935
]
2036
}

0 commit comments

Comments
 (0)