@abgov/nx-adsp 1.4.1 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "1.4.1",
+  "version": "2.0.1",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - DIO - Nx plugin for ADSP apps.",
@@ -10,18 +10,18 @@
     "directory": "packages/nx-adsp"
   },
   "peerDependencies": {
-    "@abgov/nx-dotnet": "^1.0.0",
-    "@abgov/nx-oc": "^1.4.0-beta.0",
-    "@nrwl/express": "^11.5.2",
-    "@nrwl/react": "^11.5.2",
-    "@nrwl/angular": "^11.5.2"
+    "@abgov/nx-dotnet": "^2.0.0",
+    "@abgov/nx-oc": "^2.0.0",
+    "@nrwl/express": "^12.10.1",
+    "@nrwl/react": "^12.10.1",
+    "@nrwl/angular": "^12.10.1"
   },
   "dependencies": {
-    "@angular-devkit/core": "^11.2.0",
-    "@angular-devkit/schematics": "^11.2.0",
+    "@angular-devkit/core": "^12.2.0",
+    "@angular-devkit/schematics": "^12.2.0",
     "camelcase": "^5.3.1",
-    "@nrwl/devkit": "~11.5.2"
+    "@nrwl/devkit": "12.10.1"
   },
   "generators": "./generators.json",
-  "typings": "src/index.d.ts"
+  "typings": "./src/index.d.ts"
 }

package/src/generators/angular-app/angular-app.spec.ts

@@ -16,17 +16,15 @@ describe('angular app generator', () => {
    jest.clearAllTimers()
   })
 
-  it('should run successfully', async (done) => {
+  it('should run successfully', async () => {
     await angularApp(appTree, options);
     const config = readProjectConfiguration(appTree, 'test');
     expect(config).toBeDefined();
     expect(config.root).toBe('apps/test');
     expect(appTree.exists('apps/test/nginx.conf')).toBeTruthy();
+  }, 10000);
 
-    done();
-  });
-
-  it ('can add nginx proxy', async (done) => {
+  it ('can add nginx proxy', async () => {
     const host = createTreeWithEmptyWorkspace();
     await angularApp(
       host,
@@ -46,11 +44,9 @@ describe('angular app generator', () => {
     expect(
       host.read('apps/test/nginx.conf').toString()
     ).toContain('http://test-service:3333/');
-
-    done();
   });
 
-  it ('can add multiple nginx proxy', async (done) => {
+  it ('can add multiple nginx proxy', async () => {
     const host = createTreeWithEmptyWorkspace();
     await angularApp(
       host,
@@ -76,11 +72,9 @@ describe('angular app generator', () => {
     const nginxConf = host.read('apps/test/nginx.conf').toString();
     expect(nginxConf).toContain('http://test-service:3333/');
     expect(nginxConf).toContain('http://test-service2:3333/');
-
-    done();
   });
 
-  it ('can add webpack dev server proxy', async (done) => {
+  it ('can add webpack dev server proxy', async () => {
     const host = createTreeWithEmptyWorkspace();
     await angularApp(
       host,
@@ -103,7 +97,5 @@ describe('angular app generator', () => {
     );
     expect(proxyConf['/test/'].target).toBe('http://localhost:3333');
     expect(proxyConf['/test/'].pathRewrite['^/test/']).toBe('/api/');
-
-    done();
   });
 });

package/src/generators/dotnet-service/dotnet-service.spec.ts

@@ -10,7 +10,7 @@ describe('Dotnet Service Generator', () => {
     tenant: 'test'
   }
   
-  it ('can run', async (done) => {
+  it ('can run', async () => {
     const host = createTreeWithEmptyWorkspace();
     await generator(host, options);
 
@@ -18,7 +18,5 @@ describe('Dotnet Service Generator', () => {
     expect(config.root).toBe('apps/test');
 
     expect(host.exists('apps/test/test.csproj')).toBeTruthy();
-    
-    done();
   });
 });

package/src/generators/express-service/express-service.spec.ts

@@ -10,7 +10,7 @@ describe('Express Service Generator', () => {
     tenant: 'test'
   }
   
-  it ('can run', async (done) => {
+  it ('can run', async () => {
     const host = createTreeWithEmptyWorkspace();
     await generator(host, options);
 
@@ -18,7 +18,5 @@ describe('Express Service Generator', () => {
     expect(config.root).toBe('apps/test');
 
     expect(host.exists('apps/test/src/access.ts')).toBeTruthy();
-    
-    done();
   });
 });

package/src/generators/mern/mern.js

@@ -32,7 +32,8 @@ function default_1(host, options) {
                 location: '/api/',
                 proxyPass: `http://${options.name}-service:3333/${options.name}-service/`
             } }));
-        addFiles(host, normalizedOptions);
+        // Currently no files specific to MERN generator.
+        // addFiles(host, normalizedOptions);
         yield devkit_1.formatFiles(host);
         return () => {
             devkit_1.installPackagesTask(host);

package/src/generators/mern/mern.js.map

@@ -1 +1 @@
-{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,6BAA6B;AAC7B,uDAA8D;AAC9D,wEAAoE;AACpE,sDAAkD;AAGlD,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAE9E,MAAM,kBAAkB,GACtB,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAgB,CAAC,IAAI,CAAC,CAAC,eAAe,gBAAgB,EAAE,CAAA;IAE1E,MAAM,IAAI,GAAG,iCAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,gBAAgB;QAChB,kBAAkB;QAClB,IAAI,IACJ;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KACtB,cAAc,EAAE,uBAAc,CAAC,OAAO,CAAC,WAAW,CAAC,EACnD,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IACF,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EACjC,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAC/B,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,yBAAkB,CACtB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAElC,CAAC;QAEF,MAAM,mBAAY,CAChB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IAEJ,CAAC;QAEF,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,4BAAmB,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AA9BD,4BA8BC"}
+{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,6BAA6B;AAC7B,uDAA8D;AAC9D,wEAAoE;AACpE,sDAAkD;AAGlD,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAE9E,MAAM,kBAAkB,GACtB,GAAG,IAAI,CAAC,OAAO,CAAC,yBAAgB,CAAC,IAAI,CAAC,CAAC,eAAe,gBAAgB,EAAE,CAAA;IAE1E,MAAM,IAAI,GAAG,iCAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,gBAAgB;QAChB,kBAAkB;QAClB,IAAI,IACJ;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KACtB,cAAc,EAAE,uBAAc,CAAC,OAAO,CAAC,WAAW,CAAC,EACnD,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IACF,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EACjC,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAC/B,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,yBAAkB,CACtB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAElC,CAAC;QAEF,MAAM,mBAAY,CAChB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IAEJ,CAAC;QAEF,iDAAiD;QACjD,qCAAqC;QACrC,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,4BAAmB,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AA/BD,4BA+BC"}

package/src/generators/mern/mern.spec.ts

@@ -10,7 +10,7 @@ describe('React App Generator', () => {
     tenant: 'test',
   }
   
-  it ('can run', async (done) => {
+  it ('can run', async () => {
     const host = createTreeWithEmptyWorkspace();
     await generator(host, options);
 
@@ -23,7 +23,5 @@ describe('React App Generator', () => {
     expect(host.exists('apps/test-app/nginx.conf')).toBeTruthy();
     const nginxConf = host.read('apps/test-app/nginx.conf').toString();
     expect(nginxConf).toContain('http://test-service:3333/');
-    
-    done();
   });
 });

package/src/generators/react-app/react-app.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
+const linter_1 = require("@nrwl/linter");
 const path = require("path");
 const adsp_utils_1 = require("../../utils/adsp-utils");
 function normalizeOptions(host, options) {
@@ -55,9 +55,10 @@ function removeFiles(host, options) {
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = normalizeOptions(host, options);
-        const initReact = ngcli_adapter_1.wrapAngularDevkitSchematic('@nrwl/react', 'application');
-        const initRedux = ngcli_adapter_1.wrapAngularDevkitSchematic('@nrwl/react', 'redux');
-        yield initReact(host, options);
+        const { applicationGenerator: initReact } = yield Promise.resolve().then(() => require('@nrwl/react'));
+        const { reduxGenerator: initRedux } = yield Promise.resolve().then(() => require('@nrwl/react'));
+        // Setting strict to false because of: https://github.com/nrwl/nx/issues/8180
+        yield initReact(host, Object.assign(Object.assign({}, options), { style: 'styled-components', skipFormat: true, unitTestRunner: 'jest', babelJest: false, e2eTestRunner: 'cypress', linter: linter_1.Linter.EsLint, strict: false }));
         yield initRedux(host, Object.assign(Object.assign({}, options), { name: 'intake', project: options.name }));
         devkit_1.addDependenciesToPackageJson(host, {}, {
             '@abgov/core-css': '^0.7.56',

package/src/generators/react-app/react-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":";;;AAAA,yCAWsB;AACtB,8DAAwE;AACxE,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,WAAW,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACjD,MAAM,WAAW,GAAG,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;IACzE,MAAM,kBAAkB,GAAG,cAAc,WAAW,EAAE,CAAA;IAEtD,MAAM,IAAI,GAAG,iCAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACpB,CACE,OAAO,CAAC,KAAK,CAAC,CAAC;YACb,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YACjB,EAAE,CACL,CAAC;IAEJ,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,kBAAkB;QAClB,IAAI;QACJ,YAAY,IACZ;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,sBAAa,CACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACrD,IAAI,YAAY,EAAE;QAChB,mDAAmD;QACnD,6CAA6C;QAC7C,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAC9C,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACxB,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAElD,MAAM,KAAK,GAAG;gBACZ,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,cAAc,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC7F,MAAM,EAAE,WAAW,CAAC,QAAQ,KAAK,QAAQ;gBACzC,YAAY,EAAE,KAAK;gBACnB,WAAW,EAAE,EAAE;aAChB,CAAA;YAED,8DAA8D;YAC9D,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnC,KAAK,CAAC,WAAW,GAAG;oBAClB,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,WAAW,CAAC,QAAQ;iBAClD,CAAA;aACF;YAED,uCACK,SAAS,KACZ,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAK,IAC7B;QACH,CAAC,EACD,EAAE,CACH,CAAC;QAEF,kBAAS,CACP,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,kBAAkB,EACxC,YAAY,CACb,CAAC;KACH;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAyB;IACxD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,mBAAmB,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,mBAAmB,CAAC,CAAC;AACzD,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,SAAS,GAAG,0CAA0B,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC3E,MAAM,SAAS,GAAG,0CAA0B,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAErE,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,SAAS,CAAC,IAAI,kCAAM,OAAO,KAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,IAAE,CAAC;QAE3E,qCAA4B,CAC1B,IAAI,EACJ,EACC,EACD;YACE,iBAAiB,EAAE,SAAS;YAC5B,yBAAyB,EAAE,SAAS;YACpC,yBAAyB,EAAE,QAAQ;YACnC,yBAAyB,EAAE,QAAQ;YACnC,qBAAqB,EAAE,QAAQ;YAC/B,aAAa,EAAE,SAAS;YACxB,YAAY,EAAE,cAAc;YAC5B,kBAAkB,EAAE,QAAQ;YAC5B,kBAAkB,EAAE,QAAQ;SAC7B,CACF,CAAA;QAED,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACrD,WAAW,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAErC,MAAM,MAAM,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;QAExC,MAAM,MAAM,GAAG,iCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAE5D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAC/B,MAAM,EAAE;gBACN,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM;gBACtC;oBACE,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;oBAC5C,QAAQ,EAAE,IAAI;iBACf;aACF,EACD,aAAa,EAAE,GAAG,iBAAiB,CAAC,WAAW,kBAAkB,GAClE,CAAA;QAED,IAAI,UAAU,EAAE;YACd,oEAAoE;YACpE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCACvB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KAC/B,WAAW,EAAE,GAAG,iBAAiB,CAAC,WAAW,kBAAkB,GAChE,CAAA;SACF;QAED,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEvD,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,IAAI,0BAAa,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE;YACvC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,GAAG,cAAc,EAAE,EAAC,CAAC;YAClE,MAAM,mBAAmB,CACvB,IAAI,kCAEC,OAAO,KACV,OAAO,EAAE,iBAAiB,CAAC,WAAW,IAEzC,CAAC;SACH;QAED,OAAO,GAAG,EAAE;YACV,4BAAmB,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AAzED,4BAyEC"}
+{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":"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"}

package/src/generators/react-app/react-app.spec.ts

@@ -17,7 +17,7 @@ describe('React App Generator', () => {
     tenant: 'test',
   }
 
-  it ('can run', async (done) => {
+  it ('can run', async () => {
     jest.setTimeout(28000)
     const host = createTreeWithEmptyWorkspace();
     await generator(host, options);
@@ -26,11 +26,9 @@ describe('React App Generator', () => {
     expect(config.root).toBe('apps/test');
 
     expect(host.exists('apps/test/nginx.conf')).toBeTruthy();
-
-    done();
   });
 
-  it ('can add nginx proxy', async (done) => {
+  it ('can add nginx proxy', async () => {
     const host = createTreeWithEmptyWorkspace();
     await generator(
       host,
@@ -50,11 +48,9 @@ describe('React App Generator', () => {
     expect(
       host.read('apps/test/nginx.conf').toString()
     ).toContain('http://test-service:3333/');
-
-    done();
   });
 
-  it ('can add multiple nginx proxy', async (done) => {
+  it ('can add multiple nginx proxy', async () => {
     const host = createTreeWithEmptyWorkspace();
     await generator(
       host,
@@ -80,11 +76,9 @@ describe('React App Generator', () => {
     const nginxConf = host.read('apps/test/nginx.conf').toString();
     expect(nginxConf).toContain('http://test-service:3333/');
     expect(nginxConf).toContain('http://test-service2:3333/');
-
-    done();
   });
 
-  it ('can add webpack dev server proxy', async (done) => {
+  it ('can add webpack dev server proxy', async () => {
     const host = createTreeWithEmptyWorkspace();
     await generator(
       host,
@@ -107,7 +101,5 @@ describe('React App Generator', () => {
     );
     expect(proxyConf['/test/'].target).toBe('http://localhost:3333');
     expect(proxyConf['/test/'].pathRewrite['^/test/']).toBe('/api/');
-
-    done();
   });
 });

package/src/generators/react-dotnet/react-dotnet.spec.ts

@@ -10,7 +10,7 @@ describe('React App Generator', () => {
     tenant: 'test',
   }
   
-  it ('can run', async (done) => {
+  it ('can run', async () => {
     const host = createTreeWithEmptyWorkspace();
     await generator(host, options);
 
@@ -23,7 +23,5 @@ describe('React App Generator', () => {
     expect(host.exists('apps/test-app/nginx.conf')).toBeTruthy();
     const nginxConf = host.read('apps/test-app/nginx.conf').toString();
     expect(nginxConf).toContain('http://test-service:5000/');
-    
-    done();
   });
 });