@nstudio/xplat 15.0.3 → 15.0.4-rc.1

package/README.md

@@ -42,10 +42,12 @@ You are now ready to create apps:
 nx g app
 ```
 
-**NOTE:** If you encounter any issue, you can try creating an Nx workspace with version specified, for example:
+**NOTE:** If you encounter any issue, you can try creating an Nx workspace with a version specified.
+
+We have tested with the following, for example:
 
 ```
-npx create-nx-workspace@14.1.7
+npx create-nx-workspace@15.9.2
 ```
 
 ## App generation examples

package/migrations/update-12-4-3/update-12-4-3.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
 const path_1 = require("path");
 const fs = require("fs");
-const workspace_1 = require("@nrwl/workspace");
 const xplat_1 = require("@nstudio/xplat");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const angularVersion = '^12.0.0';
@@ -54,7 +53,7 @@ function updateNativeScriptApps(tree, context) {
         const webpackConfig = fs.readFileSync(webpackConfigPath, {
             encoding: 'utf-8',
         });
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/webpack.config.js`, webpackConfig
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/webpack.config.js`, webpackConfig
             .replace(/<%= pathOffset %>/gi, relativePath + '/')
             .replace(/<%= npmScope %>/gi, npmScope));
         // update {N} app deps
@@ -101,7 +100,7 @@ function updateNativeScriptApps(tree, context) {
         if (tree.exists(`${dirPath}/tsconfig.tns.json`)) {
             tree.delete(`${dirPath}/tsconfig.tns.json`);
         }
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
 
 const fs = require('fs-extra');
 const path = require('path');
@@ -125,7 +124,7 @@ child.on('close', (code) => {
 
 });
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.app.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.app.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -141,7 +140,7 @@ child.on('close', (code) => {
     "./src/polyfills.ts"
   ]
 }`);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.editor.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.editor.json`, `{
   "extends": "./tsconfig.json",
   "include": ["**/*.ts"],
   "compilerOptions": {
@@ -149,7 +148,7 @@ child.on('close', (code) => {
   }
 }
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.json`, `{
   "extends": "${relativePath}/tsconfig.base.json",
   "files": [],
   "include": [],
@@ -166,7 +165,7 @@ child.on('close', (code) => {
   ]
 }      
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.spec.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.spec.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -177,8 +176,8 @@ child.on('close', (code) => {
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }      
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/src/test-setup.ts`, `import 'jest-preset-angular';`);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/src/polyfills.ts`, `/**
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/src/test-setup.ts`, `import 'jest-preset-angular';`);
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/src/polyfills.ts`, `/**
 * NativeScript Polyfills
 */
 
@@ -199,7 +198,7 @@ import 'zone.js';
 // Add NativeScript specific Zone JS patches
 import '@nativescript/zone-js';
        `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/.eslintrc.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/.eslintrc.json`, `{
   "extends": "${relativePath}/.eslintrc.json",
   "ignorePatterns": [
     "!**/*"
@@ -264,29 +263,28 @@ import '@nativescript/zone-js';
     return tree;
 }
 function updateRootPackage(tree, context) {
-    return (0, workspace_1.updateJsonInTree)('package.json', (json) => {
-        json.scripts = json.scripts || {};
-        const nativeScriptDeps = {
-            '@nativescript/angular': nsNgScopedVersion,
-            '@nativescript/core': nsCoreVersion,
-        };
-        const nativeScriptDevDeps = {
-            '@nativescript/types': nsCoreVersion,
-            '@nativescript/webpack': nsWebpackVersion,
-        };
-        json.scripts.clean =
-            'npx rimraf hooks node_modules package-lock.json && yarn config set ignore-engines true && yarn';
-        json.dependencies = json.dependencies || {};
-        json.dependencies = Object.assign(Object.assign(Object.assign(Object.assign({}, json.dependencies), ngDeps), (hasNativeScriptApps ? nativeScriptDeps : {})), { '@ngx-translate/core': ngxTranslateVersion, rxjs: rxjsVersion, 'zone.js': zoneJsVersion });
-        delete json.dependencies['nativescript-angular'];
-        delete json.dependencies['tns-core-modules'];
-        delete json.devDependencies['tns-core-modules'];
-        delete json.dependencies['tns-platform-declarations'];
-        delete json.devDependencies['tns-platform-declarations'];
-        json.devDependencies = json.devDependencies || {};
-        json.devDependencies = Object.assign(Object.assign(Object.assign(Object.assign({}, json.devDependencies), { '@angular-devkit/architect': '^0.1200.0', '@angular-devkit/build-angular': angularVersion, '@angular-devkit/core': angularVersion, '@angular-devkit/schematics': angularVersion, '@angular/compiler-cli': angularVersion, '@angular/language-service': angularVersion }), (hasNativeScriptApps ? nativeScriptDevDeps : {})), { typescript: typescriptVersion });
-        return json;
-    })(tree, context);
+    const json = (0, xplat_utils_1.getJsonFromFile)(tree, 'package.json');
+    json.scripts = json.scripts || {};
+    const nativeScriptDeps = {
+        '@nativescript/angular': nsNgScopedVersion,
+        '@nativescript/core': nsCoreVersion,
+    };
+    const nativeScriptDevDeps = {
+        '@nativescript/types': nsCoreVersion,
+        '@nativescript/webpack': nsWebpackVersion,
+    };
+    json.scripts.clean =
+        'npx rimraf hooks node_modules package-lock.json && yarn config set ignore-engines true && yarn';
+    json.dependencies = json.dependencies || {};
+    json.dependencies = Object.assign(Object.assign(Object.assign(Object.assign({}, json.dependencies), ngDeps), (hasNativeScriptApps ? nativeScriptDeps : {})), { '@ngx-translate/core': ngxTranslateVersion, rxjs: rxjsVersion, 'zone.js': zoneJsVersion });
+    delete json.dependencies['nativescript-angular'];
+    delete json.dependencies['tns-core-modules'];
+    delete json.devDependencies['tns-core-modules'];
+    delete json.dependencies['tns-platform-declarations'];
+    delete json.devDependencies['tns-platform-declarations'];
+    json.devDependencies = json.devDependencies || {};
+    json.devDependencies = Object.assign(Object.assign(Object.assign(Object.assign({}, json.devDependencies), { '@angular-devkit/architect': '^0.1200.0', '@angular-devkit/build-angular': angularVersion, '@angular-devkit/core': angularVersion, '@angular-devkit/schematics': angularVersion, '@angular/compiler-cli': angularVersion, '@angular/language-service': angularVersion }), (hasNativeScriptApps ? nativeScriptDevDeps : {})), { typescript: typescriptVersion });
+    return (0, xplat_utils_1.updateJsonFile)(tree, 'package.json', json);
 }
 function default_1() {
     return (0, schematics_1.chain)([

package/migrations/update-13-0-0/update-13-0-0.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
-const workspace_1 = require("@nrwl/workspace");
 const xplat_1 = require("@nstudio/xplat");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const angularVersion = '^12.2.0';
@@ -71,7 +70,7 @@ function updateNativeScriptApps(tree, context) {
         if (tree.exists(`${dirPath}/tsconfig.tns.json`)) {
             tree.delete(`${dirPath}/tsconfig.tns.json`);
         }
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
 
 const fs = require('fs-extra');
 const path = require('path');
@@ -111,7 +110,7 @@ child.stdout.on('data', function (data) {
 });
       
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.app.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.app.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -127,7 +126,7 @@ child.stdout.on('data', function (data) {
     "./src/polyfills.ts"
   ]
 }`);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.editor.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.editor.json`, `{
   "extends": "./tsconfig.json",
   "include": ["**/*.ts"],
   "compilerOptions": {
@@ -135,7 +134,7 @@ child.stdout.on('data', function (data) {
   }
 }
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.json`, `{
   "extends": "${relativePath}/tsconfig.base.json",
   "files": [],
   "include": [],
@@ -152,7 +151,7 @@ child.stdout.on('data', function (data) {
   ]
 }      
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.spec.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/tsconfig.spec.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -163,8 +162,8 @@ child.stdout.on('data', function (data) {
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }      
       `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/src/test-setup.ts`, `import 'jest-preset-angular/setup-jest';`);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/src/polyfills.ts`, `/**
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/src/test-setup.ts`, `import 'jest-preset-angular/setup-jest';`);
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/src/polyfills.ts`, `/**
 * NativeScript Polyfills
 */
 
@@ -185,7 +184,7 @@ import 'zone.js';
 // Add NativeScript specific Zone JS patches
 import '@nativescript/zone-js';
        `);
-        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/.eslintrc.json`, `{
+        (0, xplat_utils_1.updateFile)(tree, `${dirPath}/.eslintrc.json`, `{
   "extends": "${relativePath}/.eslintrc.json",
   "ignorePatterns": [
     "!**/*"
@@ -250,37 +249,36 @@ import '@nativescript/zone-js';
     return tree;
 }
 function updateRootPackage(tree, context) {
-    return (0, workspace_1.updateJsonInTree)('package.json', (json) => {
-        json.scripts = json.scripts || {};
-        const nativeScriptDeps = {
-            '@nativescript/angular': nsNgScopedVersion,
-            '@nativescript/core': nsCoreVersion,
-        };
-        const nativeScriptDevDeps = {
-            '@nativescript/types': nsCoreVersion,
-            '@nativescript/webpack': nsWebpackVersion,
-        };
-        json.dependencies = json.dependencies || {};
-        json.dependencies = Object.assign(Object.assign(Object.assign({}, json.dependencies), (hasNativeScriptApps ? nativeScriptDeps : {})), { '@ngx-translate/core': ngxTranslateVersion });
-        let ngToolsDeps = {
-            '@ngtools/webpack': angularVersion
-        };
-        if (json.dependencies['@angular/core']) {
-            // make sure in sync with current angular versions
-            ngToolsDeps['@ngtools/webpack'] = json.dependencies['@angular/core'];
-        }
-        else {
-            ngToolsDeps = null;
-        }
-        delete json.dependencies['nativescript-angular'];
-        delete json.dependencies['tns-core-modules'];
-        delete json.devDependencies['tns-core-modules'];
-        delete json.dependencies['tns-platform-declarations'];
-        delete json.devDependencies['tns-platform-declarations'];
-        json.devDependencies = json.devDependencies || {};
-        json.devDependencies = Object.assign(Object.assign(Object.assign({}, json.devDependencies), (hasNativeScriptApps ? nativeScriptDevDeps : {})), (ngToolsDeps ? ngToolsDeps : {}));
-        return json;
-    })(tree, context);
+    const json = (0, xplat_utils_1.getJsonFromFile)(tree, 'package.json');
+    json.scripts = json.scripts || {};
+    const nativeScriptDeps = {
+        '@nativescript/angular': nsNgScopedVersion,
+        '@nativescript/core': nsCoreVersion,
+    };
+    const nativeScriptDevDeps = {
+        '@nativescript/types': nsCoreVersion,
+        '@nativescript/webpack': nsWebpackVersion,
+    };
+    json.dependencies = json.dependencies || {};
+    json.dependencies = Object.assign(Object.assign(Object.assign({}, json.dependencies), (hasNativeScriptApps ? nativeScriptDeps : {})), { '@ngx-translate/core': ngxTranslateVersion });
+    let ngToolsDeps = {
+        '@ngtools/webpack': angularVersion,
+    };
+    if (json.dependencies['@angular/core']) {
+        // make sure in sync with current angular versions
+        ngToolsDeps['@ngtools/webpack'] = json.dependencies['@angular/core'];
+    }
+    else {
+        ngToolsDeps = null;
+    }
+    delete json.dependencies['nativescript-angular'];
+    delete json.dependencies['tns-core-modules'];
+    delete json.devDependencies['tns-core-modules'];
+    delete json.dependencies['tns-platform-declarations'];
+    delete json.devDependencies['tns-platform-declarations'];
+    json.devDependencies = json.devDependencies || {};
+    json.devDependencies = Object.assign(Object.assign(Object.assign({}, json.devDependencies), (hasNativeScriptApps ? nativeScriptDevDeps : {})), (ngToolsDeps ? ngToolsDeps : {}));
+    return (0, xplat_utils_1.updateJsonFile)(tree, 'package.json', json);
 }
 function default_1() {
     return (0, schematics_1.chain)([
@@ -291,7 +289,7 @@ function default_1() {
         updateRootPackage,
         (tree) => {
             return (0, schematics_1.externalSchematic)('@nrwl/workspace', 'convert-to-nx-project', {
-                all: true
+                all: true,
             });
         },
     ]);

package/migrations.json

@@ -1,30 +1,5 @@
 {
   "schematics": {
-    "update-to-10.2.0": {
-      "version": "10.2.0",
-      "description": "Migrate workspace to 10.2.0",
-      "factory": "./migrations/update-10-2-0/update-10-2-0"
-    },
-    "update-to-11.0.0": {
-      "version": "11.0.21",
-      "description": "Migrate workspace to 11.0.0",
-      "factory": "./migrations/update-11-0-0/update-11-0-0"
-    },
-    "update-to-11-imports": {
-      "version": "11.0.21",
-      "description": "Migrate workspace to use v11 import barrels",
-      "factory": "./migrations/update-11-0-0/update-to-11-imports"
-    },
-    "update-to-11-env-base": {
-      "version": "11.0.21",
-      "description": "Migrate workspace to use v11 env base option",
-      "factory": "./migrations/update-11-0-0/update-to-11-env-base"
-    },
-    "update-to-11-clean-old-dirs": {
-      "version": "11.0.21",
-      "description": "Remove old dirs",
-      "factory": "./migrations/update-11-0-0/clean-old-dirs"
-    },
     "update-to-12.4.3": {
       "version": "12.4.3",
       "description": "Migrate workspace to 12.4.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/xplat",
-  "version": "15.0.3",
+  "version": "15.0.4-rc.1",
   "description": "Cross-platform (xplat) tools for Nx workspaces.",
   "homepage": "https://nstudio.io/xplat",
   "repository": {
@@ -41,8 +41,8 @@
     "postinstall": "node src/utils/postinstall.js"
   },
   "dependencies": {
-    "@nstudio/focus": "15.0.3",
-    "@nstudio/xplat-utils": "15.0.3"
+    "@nstudio/focus": "15.0.4-rc.1",
+    "@nstudio/xplat-utils": "15.0.4-rc.1"
   },
   "author": "Nathan Walker",
   "license": "MIT",

package/src/schematics/feature/index.spec.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sandboxHomeSetup = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const workspace_1 = require("@nrwl/workspace");
 const testing_utils_1 = require("../../utils/testing-utils");
 const testing_1 = require("../../utils/testing");
+const xplat_utils_1 = require("@nstudio/xplat-utils");
 xdescribe('feature schematic', () => {
     let appTree;
     const defaultOptions = {
@@ -327,7 +327,7 @@ xdescribe('feature schematic', () => {
         appTree = (0, testing_utils_1.createXplatWithNativeScriptWeb)(appTree, true);
         // manually update home.component to prep for sandobx
         const homeCmpPath = `/apps/nativescript-viewer/src/features/home/components/home.component.html`;
-        (0, workspace_1.createOrUpdate)(appTree, homeCmpPath, sandboxHomeSetup());
+        (0, xplat_utils_1.updateFile)(appTree, homeCmpPath, sandboxHomeSetup());
         // console.log('homecmp:', getFileContent(tree, homeCmpPath));
         options.onlyProject = true;
         options.adjustSandbox = true;

package/src/utils/general.d.ts

@@ -1,5 +1,9 @@
-import { Tree } from '@angular-devkit/schematics';
+/// <reference types="node" />
+/// <reference types="node" />
+import { Tree as NgTree } from '@angular-devkit/schematics';
 import { PlatformTypes, FrameworkTypes, ITargetPlatforms } from '@nstudio/xplat-utils';
+import type { Mode } from 'fs';
+import type { FileChange, Tree as DevKitTree, TreeWriteOptions } from 'nx/src/generators/tree';
 export interface NodeDependency {
     name: string;
     version: string;
@@ -29,11 +33,10 @@ export declare function hasFrontendPlatform(targetPlatforms: ITargetPlatforms):
  * @param targetPlatforms
  */
 export declare function hasWebPlatform(targetPlatforms: ITargetPlatforms): boolean;
-export declare function updatePackageForNgrx(tree: Tree, packagePath?: string): import("@angular-devkit/schematics/src/tree/interface").Tree;
-export declare function updateTsConfig(tree: Tree, callback: (data: any) => void, targetSuffix?: string, prefixPath?: string): import("@angular-devkit/schematics/src/tree/interface").Tree;
-export declare function updatePackageScripts(tree: Tree, scripts: any): import("@angular-devkit/schematics/src/tree/interface").Tree;
-export declare function readWorkspaceJson(tree: Tree): any;
-export declare function updateWorkspace(updates: any): any;
+export declare function updatePackageForNgrx(tree: NgTree, packagePath?: string): import("@angular-devkit/schematics/src/tree/interface").Tree;
+export declare function updateTsConfig(tree: NgTree, callback: (data: any) => void, targetSuffix?: string, prefixPath?: string): import("@angular-devkit/schematics/src/tree/interface").Tree;
+export declare function updatePackageScripts(tree: NgTree, scripts: any): import("@angular-devkit/schematics/src/tree/interface").Tree;
+export declare function readWorkspaceJson(tree: NgTree): any;
 export declare function getPrefixWarning(prefix: string): string;
 export declare function getDefaultTemplateOptions(): {
     tmpl: string;
@@ -81,3 +84,29 @@ export declare const stringUtils: {
 };
 export declare const toComponentClassName: (name: string) => string;
 export declare const toNgModuleClassName: (name: string) => string;
+export declare const actionToFileChangeMap: {
+    c: string;
+    o: string;
+    d: string;
+};
+export declare function convertNgTreeToDevKit(tree: NgTree, context: any): DevkitTreeFromAngularDevkitTree;
+export declare class DevkitTreeFromAngularDevkitTree implements DevKitTree {
+    tree: NgTree;
+    private _root;
+    private skipWritingConfigInOldFormat?;
+    private configFileName;
+    constructor(tree: NgTree, _root: any, skipWritingConfigInOldFormat?: boolean);
+    get root(): any;
+    children(dirPath: string): string[];
+    delete(filePath: string): void;
+    exists(filePath: string): boolean;
+    isFile(filePath: string): boolean;
+    listChanges(): FileChange[];
+    private normalize;
+    read(filePath: string): Buffer;
+    read(filePath: string, encoding: BufferEncoding): string;
+    rename(from: string, to: string): void;
+    write(filePath: string, content: Buffer | string, options?: TreeWriteOptions): void;
+    changePermissions(filePath: string, mode: Mode): void;
+    private warnUnsupportedFilePermissionsChange;
+}

package/src/utils/general.js

@@ -1,8 +1,18 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toNgModuleClassName = exports.toComponentClassName = exports.stringUtils = exports.sanitize = exports.getDefaultTemplateOptions = exports.getPrefixWarning = exports.updateWorkspace = exports.readWorkspaceJson = exports.updatePackageScripts = exports.updateTsConfig = exports.updatePackageForNgrx = exports.hasWebPlatform = exports.hasFrontendPlatform = exports.supportedSandboxPlatforms = exports.supportedHelpers = void 0;
+exports.DevkitTreeFromAngularDevkitTree = exports.convertNgTreeToDevKit = exports.actionToFileChangeMap = exports.toNgModuleClassName = exports.toComponentClassName = exports.stringUtils = exports.sanitize = exports.getDefaultTemplateOptions = exports.getPrefixWarning = exports.readWorkspaceJson = exports.updatePackageScripts = exports.updateTsConfig = exports.updatePackageForNgrx = exports.hasWebPlatform = exports.hasFrontendPlatform = exports.supportedSandboxPlatforms = exports.supportedHelpers = void 0;
 const workspace_1 = require("@nrwl/workspace");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
+const path_1 = require("path");
 // list of all supported helpers
 // TODO: add more convenient helpers (like firebase or Travis ci support files)
 exports.supportedHelpers = ['imports', 'applitools'];
@@ -83,18 +93,9 @@ function updatePackageScripts(tree, scripts) {
 }
 exports.updatePackageScripts = updatePackageScripts;
 function readWorkspaceJson(tree) {
-    return (0, workspace_1.readJsonInTree)(tree, (0, workspace_1.getWorkspacePath)(tree));
+    return (0, xplat_utils_1.getJsonFromFile)(tree, 'workspace.json');
 }
 exports.readWorkspaceJson = readWorkspaceJson;
-function updateWorkspace(updates) {
-    return (0, workspace_1.updateWorkspaceInTree)((json) => {
-        for (const key in updates) {
-            json[key] = Object.assign(Object.assign({}, (json[key] || {})), updates[key]);
-        }
-        return json;
-    });
-}
-exports.updateWorkspace = updateWorkspace;
 // export function persistPrefix(prefix: string) {
 //   return (tree: Tree) => {
 //     const nxConfig = getNxWorkspaceConfig(tree);
@@ -142,3 +143,146 @@ const toComponentClassName = (name) => `${exports.stringUtils.classify(name)}Com
 exports.toComponentClassName = toComponentClassName;
 const toNgModuleClassName = (name) => `${exports.stringUtils.classify(name)}Module`;
 exports.toNgModuleClassName = toNgModuleClassName;
+exports.actionToFileChangeMap = {
+    c: 'CREATE',
+    o: 'UPDATE',
+    d: 'DELETE',
+};
+class RunCallbackTask {
+    constructor(callback) {
+        this.callback = callback;
+    }
+    toConfiguration() {
+        return {
+            name: 'RunCallback',
+            options: {
+                callback: this.callback,
+            },
+        };
+    }
+}
+function createRunCallbackTask() {
+    return {
+        name: 'RunCallback',
+        create: () => {
+            return Promise.resolve(({ callback }) => __awaiter(this, void 0, void 0, function* () {
+                yield callback();
+            }));
+        },
+    };
+}
+function convertNgTreeToDevKit(tree, context) {
+    if (context.engine.workflow) {
+        const engineHost = context.engine.workflow.engineHost;
+        engineHost.registerTaskExecutor(createRunCallbackTask());
+    }
+    const root = context.engine.workflow && context.engine.workflow.engineHost.paths
+        ? context.engine.workflow.engineHost.paths[1]
+        : tree.root.path;
+    return new DevkitTreeFromAngularDevkitTree(tree, root, true);
+}
+exports.convertNgTreeToDevKit = convertNgTreeToDevKit;
+class DevkitTreeFromAngularDevkitTree {
+    constructor(tree, _root, skipWritingConfigInOldFormat) {
+        this.tree = tree;
+        this._root = _root;
+        this.skipWritingConfigInOldFormat = skipWritingConfigInOldFormat;
+        /**
+         * When using the UnitTestTree from @angular-devkit/schematics/testing, the root is just `/`.
+         * This causes a massive issue if `getProjects()` is used in the underlying generator because it
+         * causes fast-glob to be set to work on the user's entire file system.
+         *
+         * Therefore, in this case, patch the root to match what Nx Devkit does and use /virtual instead.
+         */
+        try {
+            const { UnitTestTree } = require('@angular-devkit/schematics/testing');
+            if (tree instanceof UnitTestTree && _root === '/') {
+                this._root = '/virtual';
+            }
+        }
+        catch (_a) { }
+    }
+    get root() {
+        return this._root;
+    }
+    children(dirPath) {
+        const { subdirs, subfiles } = this.tree.getDir(dirPath);
+        return [...subdirs, ...subfiles];
+    }
+    delete(filePath) {
+        this.tree.delete(filePath);
+    }
+    exists(filePath) {
+        if (this.isFile(filePath)) {
+            return this.tree.exists(filePath);
+        }
+        else {
+            return this.children(filePath).length > 0;
+        }
+    }
+    isFile(filePath) {
+        return this.tree.exists(filePath) && !!this.tree.read(filePath);
+    }
+    listChanges() {
+        const fileChanges = [];
+        for (const action of this.tree.actions) {
+            if (action.kind === 'r') {
+                fileChanges.push({
+                    path: this.normalize(action.to),
+                    type: 'CREATE',
+                    content: this.read(action.to),
+                });
+                fileChanges.push({
+                    path: this.normalize(action.path),
+                    type: 'DELETE',
+                    content: null,
+                });
+            }
+            else if (action.kind === 'c' || action.kind === 'o') {
+                fileChanges.push({
+                    path: this.normalize(action.path),
+                    type: exports.actionToFileChangeMap[action.kind],
+                    content: action.content,
+                });
+            }
+            else {
+                fileChanges.push({
+                    path: this.normalize(action.path),
+                    type: 'DELETE',
+                    content: null,
+                });
+            }
+        }
+        return fileChanges;
+    }
+    normalize(path) {
+        return (0, path_1.relative)(this.root, (0, path_1.join)(this.root, path));
+    }
+    read(filePath, encoding) {
+        return encoding
+            ? this.tree.read(filePath).toString(encoding)
+            : this.tree.read(filePath);
+    }
+    rename(from, to) {
+        this.tree.rename(from, to);
+    }
+    write(filePath, content, options) {
+        if (options === null || options === void 0 ? void 0 : options.mode) {
+            this.warnUnsupportedFilePermissionsChange(filePath, options.mode);
+        }
+        if (this.tree.exists(filePath)) {
+            this.tree.overwrite(filePath, content);
+        }
+        else {
+            this.tree.create(filePath, content);
+        }
+    }
+    changePermissions(filePath, mode) {
+        this.warnUnsupportedFilePermissionsChange(filePath, mode);
+    }
+    warnUnsupportedFilePermissionsChange(filePath, mode) {
+        console.log(`The Angular DevKit tree does not support changing a file permissions.
+                      Ignoring changing ${filePath} permissions to ${mode}.`);
+    }
+}
+exports.DevkitTreeFromAngularDevkitTree = DevkitTreeFromAngularDevkitTree;

package/src/utils/versions.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxVersion = exports.xplatVersion = void 0;
-exports.xplatVersion = '15.0.3';
+exports.xplatVersion = '15.0.4-rc.1';
 exports.nxVersion = '^15.0.0';

package/src/utils/xplat.js

@@ -5,7 +5,6 @@ const schematics_1 = require("@angular-devkit/schematics");
 const typescript_1 = require("typescript");
 const general_1 = require("./general");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
-const workspace_1 = require("@nrwl/workspace");
 const ast_1 = require("./ast");
 const errors_1 = require("./errors");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
@@ -43,7 +42,8 @@ var XplatHelpers;
      */
     function addPackageWithNgAdd(packageName, options, callSchematicIfAdded) {
         return (host) => {
-            const { dependencies, devDependencies } = (0, workspace_1.readJsonInTree)(host, 'package.json');
+            const json = (0, xplat_utils_1.getJsonFromFile)(host, 'package.json');
+            const { dependencies, devDependencies } = json;
             return dependencies[packageName] || devDependencies[packageName]
                 ? callSchematicIfAdded
                     ? (0, schematics_1.externalSchematic)(packageName, callSchematicIfAdded, options, {

package/migrations/update-10-2-0/update-10-2-0.d.ts

@@ -1,2 +0,0 @@
-import { Rule } from '@angular-devkit/schematics';
-export default function (): Rule;

package/migrations/update-10-2-0/update-10-2-0.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const schematics_1 = require("@angular-devkit/schematics");
-function default_1() {
-    return (0, schematics_1.chain)([
-        (tree, context) => {
-            return (0, schematics_1.noop)();
-        },
-    ]);
-}
-exports.default = default_1;