feat: Nx 13.4.x compatibility

.gitignore

@@ -10,5 +10,6 @@ tmp
 *.log
 .ng_pkg_build
 jest.debug.config.js
+.npmrc
 
 package-lock.json

README.md

@@ -28,9 +28,9 @@ npx create-nx-workspace@latest
 
 At the prompts:
 
-> provide a name
+> What to create in the new workspace
 
-> choose `empty`
+> choose `apps`
 
 ```
 npm i @nstudio/xplat -D

docs/xplat/getting-started/getting-started.md

@@ -8,8 +8,8 @@ npx create-nx-workspace myworkspace
 
 **Note:** We recommend the following options when creating your Nx workspace:
 
-- Choose `Empty`
-- Choose `Nx` cli
+- Choose `Apps` preset
+- Use `Nx` cli
 
 We find this provides opportunities for broader use cases while also allowing you to setup your workspace the way you want which may include using `xplat` app generators (which we'll install in a moment) which leverage those from Nx however enhances a few to work best for xplat tooling.
 

package.json

@@ -34,40 +34,40 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@angular-devkit/architect": "^0.1200.0",
-    "@angular-devkit/build-angular": "^12.0.0",
-    "@angular-devkit/build-optimizer": "^0.1200.0",
-    "@angular-devkit/build-webpack": "^0.1200.0",
-    "@angular-devkit/core": "^12.0.0",
-    "@angular-devkit/schematics": "^12.0.0",
-    "@angular-eslint/eslint-plugin": "~12.3.0",
-    "@angular-eslint/eslint-plugin-template": "~12.3.0",
-    "@angular-eslint/template-parser": "~12.3.0",
-    "@angular/cli": "^12.0.0",
-    "@angular/common": "^12.0.0",
-    "@angular/compiler": "^12.0.0",
-    "@angular/compiler-cli": "^12.0.0",
-    "@angular/core": "^12.0.0",
-    "@angular/forms": "^12.0.0",
-    "@angular/platform-browser": "^12.0.0",
-    "@angular/platform-browser-dynamic": "^12.0.0",
-    "@angular/router": "^12.0.0",
-    "@angular/service-worker": "^12.0.0",
-    "@angular/upgrade": "^12.0.0",
-    "@cypress/webpack-preprocessor": "^5.4.2",
-    "@nrwl/angular": "~13.0.0",
-    "@nrwl/cli": "~13.0.0",
-    "@nrwl/devkit": "~13.0.0",
-    "@nrwl/express": "~13.0.0",
-    "@nrwl/jest": "~13.0.0",
-    "@nrwl/linter": "~13.0.0",
-    "@nrwl/nest": "~13.0.0",
-    "@nrwl/node": "~13.0.0",
-    "@nrwl/react": "~13.0.0",
-    "@nrwl/tao": "~13.0.0",
-    "@nrwl/web": "~13.0.0",
-    "@nrwl/workspace": "~13.0.0",
-    "@schematics/angular": "^12.0.0",
+    "@angular-devkit/architect": "~0.1301.0",
+    "@angular-devkit/build-angular": "~13.1.0",
+    "@angular-devkit/build-optimizer": "~0.1301.0",
+    "@angular-devkit/build-webpack": "~0.1301.0",
+    "@angular-devkit/core": "~13.1.0",
+    "@angular-devkit/schematics": "~13.1.0",
+    "@angular-eslint/eslint-plugin": "~13.0.1",
+    "@angular-eslint/eslint-plugin-template": "~13.0.1",
+    "@angular-eslint/template-parser": "~13.0.1",
+    "@angular/cli": "~13.1.0",
+    "@angular/common": "~13.1.0",
+    "@angular/compiler": "~13.1.0",
+    "@angular/compiler-cli": "~13.1.0",
+    "@angular/core": "~13.1.0",
+    "@angular/forms": "~13.1.0",
+    "@angular/platform-browser": "~13.1.0",
+    "@angular/platform-browser-dynamic": "~13.1.0",
+    "@angular/router": "~13.1.0",
+    "@angular/service-worker": "~13.1.0",
+    "@angular/upgrade": "~13.1.0",
+    "@cypress/webpack-preprocessor": "^5.9.1",
+    "@nrwl/angular": "~13.4.0",
+    "@nrwl/cli": "~13.4.0",
+    "@nrwl/devkit": "~13.4.0",
+    "@nrwl/express": "~13.4.0",
+    "@nrwl/jest": "~13.4.0",
+    "@nrwl/linter": "~13.4.0",
+    "@nrwl/nest": "~13.4.0",
+    "@nrwl/node": "~13.4.0",
+    "@nrwl/react": "~13.4.0",
+    "@nrwl/tao": "~13.4.0",
+    "@nrwl/web": "~13.4.0",
+    "@nrwl/workspace": "~13.4.0",
+    "@schematics/angular": "^13.1.0",
     "@types/express": "~4.17.0",
     "@types/jasmine": "~3.5.11",
     "@types/jasminewd2": "~2.0.3",
@@ -108,7 +108,7 @@
     "karma-webpack": "4.0.2",
     "lint-staged": "^11.2.0",
     "jsonc-parser": "3.0.0",
-    "ng-packagr": "^12.0.0",
+    "ng-packagr": "^13.1.0",
     "npm-run-all": "~4.1.5",
     "open": "~6.0.0",
     "precise-commits": "~1.0.2",
@@ -127,8 +127,8 @@
     "tsickle": "~0.38.1",
     "tslib": "~2.0.0",
     "tslint": "~6.1.2",
-    "typescript": "~4.3.5",
-    "verdaccio": "~5.1.1",
+    "typescript": "~4.4.3",
+    "verdaccio": "^5.4.0",
     "worker-plugin": "~4.0.3",
     "xml2js": "~0.4.23",
     "yargs": "15.4.1",

packages/angular/src/schematics/application/index.ts

@@ -64,6 +64,16 @@ export default function (options: Schema) {
         ...options,
         skipInstall: true,
       };
+      // remove non schema validated properties
+      delete nrwlWebOptions.groupByName;
+      delete nrwlWebOptions.useXplat;
+      delete nrwlWebOptions.skipInstall;
+      delete (<any>nrwlWebOptions).platforms;
+      delete (<any>nrwlWebOptions).framework;
+      delete (<any>nrwlWebOptions).isTesting;
+      delete (<any>nrwlWebOptions).target;
+      delete (<any>nrwlWebOptions).npmScope;
+      delete (<any>nrwlWebOptions).setupSandbox;
       let executionOptions: Partial<ExecutionOptions>;
       if (options.useXplat) {
         // when generating xplat architecture, ensure:

packages/angular/src/schematics/application/schema.d.ts

@@ -11,7 +11,6 @@ export interface Schema {
   inlineTemplate?: boolean;
   viewEncapsulation?: 'Emulated' | 'Native' | 'None';
   routing?: boolean;
-  enableIvy?: boolean;
   prefix?: string;
   style?: string;
   skipTests?: boolean;

packages/angular/src/schematics/application/schema.json

@@ -46,11 +46,6 @@
       "enum": ["Emulated", "Native", "None"],
       "type": "string"
     },
-    "enableIvy": {
-      "description": "Use the Ivy rendering engine.",
-      "type": "boolean",
-      "default": false
-    },
     "prefix": {
       "type": "string",
       "format": "html-selector",

packages/angular/src/utils/ast.ts

@@ -10,7 +10,7 @@ import {
 } from '@nrwl/workspace/src/utils/ast-utils';
 import { Tree } from '@angular-devkit/schematics';
 import * as path from 'path';
-import { toFileName } from '@nrwl/workspace';
+import { toFileName } from '@nstudio/xplat-utils';
 
 export function addToCollection(
   source: ts.SourceFile,

packages/angular/src/utils/versions.ts

@@ -1,11 +1,11 @@
 export const xplatVersion = '*';
 export const nxVersion = '^13.0.0';
-export const angularVersion = '^12.2.0';
-export const angularDevkitVersion = '~12.2.0';
-export const ngxTranslateVersion = '~13.0.0';
-export const ngxTranslateHttpVersion = '~6.0.0';
+export const angularVersion = '^13.0.0';
+export const angularDevkitVersion = '~13.0.0';
+export const ngxTranslateVersion = '~14.0.0';
+export const ngxTranslateHttpVersion = '~7.0.0';
 export const coreJsVersion = '^3.6.5';
-export const rxjsVersion = '^6.6.0';
-export const zonejsVersion = '~0.11.1';
-export const jestPresetAngular = '10.0.1';
+export const rxjsVersion = '^7.4.0';
+export const zonejsVersion = '~0.11.4';
+export const jestPresetAngular = '11.0.0';
 export const typesJest = '27.0.2';

packages/electron-angular/src/schematics/application/index.ts

@@ -86,6 +86,9 @@ export default function (options: XplatElectrontHelpers.SchemaApp) {
       }
 
       const electronAppName = options.name;
+      if (!targetConfig.root) {
+        targetConfig.root = `apps/${electronAppName}`;
+      }
       let targetProp = 'architect';
       if (!targetConfig[targetProp]) {
         targetProp = 'targets'; // nx 11 moved to 'targets'

packages/electron/src/schematics/application/index.ts

@@ -73,6 +73,9 @@ export default function (options: XplatElectrontHelpers.SchemaApp) {
 
       const electronAppName = options.name;
       const directory = options.directory ? `${options.directory}/` : '';
+      if (!targetConfig.root) {
+        targetConfig.root = `apps/${directory}${electronAppName}`;
+      }
       let targetProp = 'architect';
       if (!targetConfig[targetProp]) {
         targetProp = 'targets'; // nx 11 moved to 'targets'

packages/focus/src/utils/index.ts

@@ -24,7 +24,7 @@ import {
 } from '@nstudio/xplat-utils';
 import { join } from 'path';
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
-import { serializeJson } from '@nrwl/workspace';
+import { serializeJson } from '@nrwl/devkit';
 import * as xml2js from 'xml2js';
 
 export namespace FocusHelpers {

packages/ionic-angular/src/utils/versions.ts

@@ -1,28 +1,28 @@
 export const xplatVersion = '*';
-export const ionicAngularVersion = '~5.6.0';
-export const capacitorVersion = '~3.0.0';
+export const ionicAngularVersion = '~6.0.0';
+export const capacitorVersion = '^3.0.0';
 export const capacitorPluginsVersion = '~1.0.2';
-export const ngDevKitArchitect = '^0.1200.0';
-export const ngDevKitBuild = '^12.0.0';
-export const ngDevKitCore = '^12.0.0';
-export const ngDevKitSchematics = '^12.0.0';
+export const ngDevKitArchitect = '^0.1301.2';
+export const ngDevKitBuild = '^13.0.0';
+export const ngDevKitCore = '^13.0.0';
+export const ngDevKitSchematics = '^13.0.0';
 export const tsLibVersion = '^2.0.0';
 
-export const ionicAngularToolkitVersion = '^4.0.0';
-export const jasmineCoreVersion = '~3.6.0';
+export const ionicAngularToolkitVersion = '^5.0.0';
+export const jasmineCoreVersion = '~3.8.0';
 export const jasmineSpecVersion = '~6.0.0';
 export const karmaVersion = '~6.3.2';
 export const karmaChromeVersion = '~3.1.0';
 export const karmaCoverageVersion = '~2.0.3';
 export const karmaCoverageInstanbulVersion = '~3.0.2';
 export const karmaJasmineVersion = '~4.0.0';
 export const karmaJasmineHtmlVersion = '^1.5.0';
-export const typescriptVersion = '~4.3.5';
+export const typescriptVersion = '~4.5.4';
 
-export const angularVersion = '^12.2.0';
-export const angularDevkitVersion = '~12.2.0';
-export const ngxTranslateVersion = '~13.0.0';
-export const ngxTranslateHttpVersion = '~6.0.0';
+export const angularVersion = '^13.0.0';
+export const angularDevkitVersion = '^13.0.0';
+export const ngxTranslateVersion = '~14.0.0';
+export const ngxTranslateHttpVersion = '~7.0.0';
 export const coreJsVersion = '^3.6.5';
 export const rxjsVersion = '^7.4.0';
 export const zonejsVersion = '~0.11.4';

packages/nativescript-angular/src/schematics/application/_files/tools/xplat-postinstall.js

@@ -13,26 +13,3 @@ try {
 } catch (err) {
   // ignore
 }
-
-// Helpful to trigger ngcc after an install to ensure all has processed properly
-const ngccPath = require.resolve('@angular/compiler-cli/ngcc/main-ngcc.js');
-const child = childProcess.spawn(
-  ngccPath,
-  [
-    '--tsconfig',
-    'tsconfig.app.json',
-    '--properties',
-    'es2015',
-    'module',
-    'main',
-    '--first-only',
-  ],
-  {
-    cwd: process.cwd(),
-    shell: process.platform == 'win32',
-  }
-);
-child.stdout.setEncoding('utf8');
-child.stdout.on('data', function (data) {
-  console.log(data);
-});

packages/nativescript-angular/src/schematics/application/_skipxplat_files/tools/xplat-postinstall.js

@@ -13,26 +13,3 @@ try {
 } catch (err) {
   // ignore
 }
-
-// Helpful to trigger ngcc after an install to ensure all has processed properly
-const ngccPath = require.resolve('@angular/compiler-cli/ngcc/main-ngcc.js');
-const child = childProcess.spawn(
-  ngccPath,
-  [
-    '--tsconfig',
-    'tsconfig.app.json',
-    '--properties',
-    'es2015',
-    'module',
-    'main',
-    '--first-only',
-  ],
-  {
-    cwd: process.cwd(),
-    shell: process.platform == 'win32',
-  }
-);
-child.stdout.setEncoding('utf8');
-child.stdout.on('data', function (data) {
-  console.log(data);
-});

packages/nativescript-angular/src/utils/versions.ts

@@ -1,20 +1,20 @@
 export const xplatVersion = '*';
 export const nsCoreVersion = '~8.1.0';
-export const nsNgScopedVersion = '^12.2.0';
+export const nsNgScopedVersion = '^13.0.0';
 export const nsNgFonticonVersion = '~7.0.0';
 export const nsWebpackVersion = '~5.0.0';
 export const sassVersion = '^1.30.0';
 export const nsThemeCoreVersion = '^1.0.4';
-export const typescriptVersion = '~4.3.5';
+export const typescriptVersion = '~4.5.4';
 
 // in case workspace had not added angular yet
 // TODO: move deps to nstudio/xplat to ref from everywhere for all supported framework versions
-export const angularVersion = '^12.2.0';
-export const ngToolsWebpack = '^12.2.0';
-export const ngxTranslateVersion = '~13.0.0';
+export const angularVersion = '^13.0.0';
+export const ngToolsWebpack = '^13.0.0';
+export const ngxTranslateVersion = '~14.0.0';
 export const rxjsVersion = '^7.4.0';
-export const zonejsVersion = '~0.11.1';
-export const angularEsLintVersion = '~12.3.0';
+export const zonejsVersion = '~0.11.4';
+export const angularEsLintVersion = '~13.0.0';
 export const nsEsLintVersion = '~0.0.4';
 export const tsEsLintParserVersion = '~4.33.0';
-export const esLintVersion = '7.32.0';
+export const esLintVersion = '8.2.0';

packages/nativescript/src/schematics/application/index.spec.ts

@@ -50,7 +50,7 @@ describe('app', () => {
       files.indexOf('/apps/nativescript-foo/src/app-root.xml')
     ).toBeGreaterThanOrEqual(0);
     expect(
-      files.indexOf('/apps/nativescript-foo/src/app.css')
+      files.indexOf('/apps/nativescript-foo/src/app.scss')
     ).toBeGreaterThanOrEqual(0);
     expect(
       files.indexOf('/apps/nativescript-foo/src/app.ts')

packages/nativescript/src/utils/versions.ts

@@ -1,4 +1,4 @@
 export const xplatVersion = '*';
-export const nsCoreVersion = '~8.0.0';
+export const nsCoreVersion = '~8.1.0';
 export const nsThemeCoreVersion = '^1.0.4';
 export const sassVersion = '^1.30.0';

packages/xplat-utils/src/utils/utils.ts

@@ -12,8 +12,7 @@ import {
   SchematicContext,
   SchematicsException,
 } from '@angular-devkit/schematics';
-import { parseJson } from '@nrwl/devkit';
-import { createOrUpdate, serializeJson } from '@nrwl/workspace';
+import { parseJson, serializeJson } from '@nrwl/devkit';
 
 export const supportedPlatforms: Array<PlatformTypes> = [
   'web',
@@ -316,3 +315,10 @@ export function parseProjectNameFromPath(input: string): string {
   }
   return input;
 }
+
+export function toFileName(s: string): string {
+  return s
+    .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+    .toLowerCase()
+    .replace(/[ _]/g, '-');
+}

packages/xplat/src/utils/general.ts

@@ -5,7 +5,6 @@ import {
 } from '@angular-devkit/schematics';
 import {
   stringUtils as nxStringUtils,
-  serializeJson,
   updateWorkspaceInTree,
   readJsonInTree,
   getWorkspacePath,