feat(core): Nx 12.6

nstudio · Aug 11, 2021 · b433835 · b433835
1 parent 813e8b9
commit b433835
Show file tree

Hide file tree

Showing 11 changed files with 2,372 additions and 1,851 deletions.
diff --git a/package.json b/package.json
@@ -55,25 +55,25 @@
     "@angular/service-worker": "^12.0.0",
     "@angular/upgrade": "^12.0.0",
     "@cypress/webpack-preprocessor": "^5.4.2",
-    "@nrwl/angular": "~12.5.0",
-    "@nrwl/cli": "~12.5.0",
-    "@nrwl/devkit": "~12.5.0",
-    "@nrwl/express": "~12.5.0",
-    "@nrwl/jest": "~12.5.0",
-    "@nrwl/linter": "~12.5.0",
-    "@nrwl/nest": "~12.5.0",
-    "@nrwl/node": "~12.5.0",
-    "@nrwl/react": "~12.5.0",
-    "@nrwl/tao": "~12.5.0",
-    "@nrwl/web": "~12.5.0",
-    "@nrwl/workspace": "~12.5.0",
+    "@nrwl/angular": "~12.6.0",
+    "@nrwl/cli": "~12.6.0",
+    "@nrwl/devkit": "~12.6.0",
+    "@nrwl/express": "~12.6.0",
+    "@nrwl/jest": "~12.6.0",
+    "@nrwl/linter": "~12.6.0",
+    "@nrwl/nest": "~12.6.0",
+    "@nrwl/node": "~12.6.0",
+    "@nrwl/react": "~12.6.0",
+    "@nrwl/tao": "~12.6.0",
+    "@nrwl/web": "~12.6.0",
+    "@nrwl/workspace": "~12.6.0",
     "@schematics/angular": "^12.0.0",
     "@types/express": "~4.17.0",
     "@types/jasmine": "~3.5.11",
     "@types/jasminewd2": "~2.0.3",
     "@types/jest": "~26.0.7",
     "@types/node": "14.14.37",
-    "@types/prettier": "~2.0.2",
+    "@types/prettier": "2.3.0",
     "@types/webpack": "^5.28.0",
     "@types/xml2js": "^0.4.5",
     "@types/yargs": "~15.0.5",
@@ -113,7 +113,7 @@
     "npm-run-all": "~4.1.5",
     "open": "~6.0.0",
     "precise-commits": "~1.0.2",
-    "prettier": "~2.3.0",
+    "prettier": "2.3.2",
     "pretty-quick": "^2.0.1",
     "release-it": "~13.6.6",
     "rxjs": "~6.6.0",
@@ -128,7 +128,7 @@
     "tsickle": "~0.38.1",
     "tslib": "~2.0.0",
     "tslint": "~6.1.2",
-    "typescript": "4.2.4",
+    "typescript": "~4.3.5",
     "verdaccio": "~5.1.1",
     "worker-plugin": "~4.0.3",
     "xml2js": "~0.4.23",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -29,7 +29,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "^12.5.0"
+    "@nrwl/angular": "^12.0.0"
   },
   "peerDependencies": {
     "@nstudio/xplat": "*"

diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts
@@ -1,5 +1,5 @@
 export const xplatVersion = '*';
-export const nxVersion = '^12.5.0';
+export const nxVersion = '12.6.6';
 export const angularVersion = '^12.0.0';
 export const angularDevkitVersion = '^12.0.0';
 export const ngxTranslateVersion = '~13.0.0';

diff --git a/packages/electron-angular/src/utils/versions.ts b/packages/electron-angular/src/utils/versions.ts
@@ -1,2 +1,2 @@
 export const xplatVersion = '*';
-export const nxVersion = '^12.5.0';
+export const nxVersion = '12.6.6';
diff --git a/packages/focus/package.json b/packages/focus/package.json
@@ -30,8 +30,8 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@angular-devkit/core": "~11.2.0",
-    "@angular-devkit/schematics": "~11.2.0",
+    "@angular-devkit/core": "^12.0.0",
+    "@angular-devkit/schematics": "^12.0.0",
     "@nstudio/xplat-utils": "*",
     "xml2js": "~0.4.23"
   }

diff --git a/packages/schematics/package.json b/packages/schematics/package.json
@@ -70,7 +70,7 @@
     "migrations": "./migrations/migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "^12.5.0",
+    "@nrwl/angular": "^12.0.0",
     "@nstudio/xplat-utils": "*"
   }
 }
diff --git a/packages/xplat-utils/package.json b/packages/xplat-utils/package.json
@@ -21,11 +21,6 @@
   ],
   "main": "index.js",
   "types": "index.d.ts",
-  "dependencies": {
-    "chalk": "4.1.0",
-    "jsonc-parser": "3.0.0",
-    "@nrwl/devkit": "^12.5.0"
-  },
   "author": "Nathan Walker",
   "license": "MIT",
   "bugs": {

diff --git a/packages/xplat/package.json b/packages/xplat/package.json
@@ -41,20 +41,8 @@
     "postinstall": "node src/utils/postinstall.js"
   },
   "dependencies": {
-    "@nrwl/workspace": "~12.0.0",
     "@nstudio/focus": "*",
-    "@nstudio/xplat-utils": "*",
-    "cosmiconfig": "^4.0.0",
-    "fs-extra": "7.0.1",
-    "ignore": "^5.0.4",
-    "jsonc-parser": "3.0.0",
-    "npm-run-all": "^4.1.5",
-    "opn": "^5.3.0",
-    "rxjs": "^6.6.0",
-    "semver": "6.3.0",
-    "tmp": "0.0.33",
-    "yargs": "15.4.1",
-    "yargs-parser": "20.0.0"
+    "@nstudio/xplat-utils": "*"
   },
   "author": "Nathan Walker",
   "license": "MIT",

diff --git a/packages/xplat/src/schematics/application/index.spec.ts b/packages/xplat/src/schematics/application/index.spec.ts
@@ -104,6 +104,8 @@ describe('xplat schematic', () => {
       appTree = createEmptyWorkspace(appTree);
       const options: XplatHelpers.Schema = { ...defaultOptions };
       options.platforms = 'nest';
+      delete options.prefix;
+      delete options.isTesting;
 
       const tree = await runSchematic('app', options, appTree);
       const files = tree.files;
@@ -120,6 +122,8 @@ describe('xplat schematic', () => {
       appTree = createEmptyWorkspace(appTree);
       const options: XplatHelpers.Schema = { ...defaultOptions };
       options.platforms = 'node';
+      delete options.prefix;
+      delete options.isTesting;
 
       const tree = await runSchematic('app', options, appTree);
       const files = tree.files;

diff --git a/packages/xplat/src/utils/versions.ts b/packages/xplat/src/utils/versions.ts
@@ -1,2 +1,2 @@
 export const xplatVersion = '*';
-export const nxVersion = '^12.5.0';
+export const nxVersion = '12.6.6';