@nstudio/xplat 15.0.4-rc.1 → 16.5.0

package/README.md

@@ -24,13 +24,19 @@
 
 ```
 npx create-nx-workspace@latest
-```
 
-At the prompts:
+// Choose "Integrated monorepo" at the prompt:
 
-> What to create in the new workspace
+? Choose what to create                 … 
+> Integrated monorepo:    Nx configures your favorite frameworks and lets you focus on shipping features.
 
-> choose `apps`
+// Choose "apps" at the prompt: 
+
+? What to create in the new workspace   … 
+> apps              [an empty monorepo with no plugins with a layout that works best for building apps]
+```
+
+Install the tools:
 
 ```
 npm i @nstudio/xplat -D
@@ -39,15 +45,13 @@ npm i @nstudio/xplat -D
 You are now ready to create apps:
 
 ```
-nx g app
+npx nx g @nstudio/xplat:app
 ```
 
-**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:
+**NOTE:** If you encounter any issue, you can try creating an Nx workspace with version specified, for example:
 
 ```
-npx create-nx-workspace@15.9.2
+npx create-nx-workspace@14.1.7
 ```
 
 ## App generation examples
@@ -61,7 +65,7 @@ Electron app generator can use any web app in the workspace as it's target.
 If you don't have a web app yet, create one first:
 
 ```
-nx g app sample
+npx nx g @nstudio/xplat:app sample
 ```
 
 > choose `web`
@@ -69,7 +73,7 @@ nx g app sample
 You can now use the web app as the Electron target:
 
 ```
-nx g app desktop --target=web-sample
+npx nx g @nstudio/xplat:app desktop --target=web-sample
 ```
 
 > choose `electron`
@@ -83,7 +87,7 @@ npm run start.electron.desktop
 ### Ionic
 
 ```
-nx g app sample
+npx nx g @nstudio/xplat:app sample
 ```
 
 > choose `ionic`
@@ -91,13 +95,13 @@ nx g app sample
 Develop in browser with:
 
 ```
-nx serve ionic-sample
+npx nx serve ionic-sample
 ```
 
 Build Ionic app:
 
 ```
-nx build ionic-sample
+npx nx build ionic-sample
 ```
 
 A. **Capacitor iOS** - Prepare for development
@@ -127,7 +131,7 @@ npm run open.ionic.sample.android
 ### NativeScript
 
 ```
-nx g app mobile
+nx g @nstudio/xplat:app mobile
 ```
 
 > choose `nativescript`
@@ -135,13 +139,13 @@ nx g app mobile
 A. **iOS**
 
 ```
-nx run nativescript-mobile:ios
+npx nx run nativescript-mobile:ios
 ```
 
 B. **Android**
 
 ```
-nx run nativescript-mobile:android
+npx nx run nativescript-mobile:android
 ```
 
 ## Documentation

package/collection.json

@@ -1,7 +1,7 @@
 {
   "name": "nstudio/xplat",
   "version": "0.1",
-  "extends": ["@nrwl/workspace"],
+  "extends": ["@nx/workspace"],
   "schematics": {
     "ng-add": {
       "factory": "./src/schematics/ng-add",

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

@@ -262,7 +262,7 @@ function updateRootPackage(tree, context) {
     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,
+        '@ngtools/webpack': angularVersion
     };
     if (json.dependencies['@angular/core']) {
         // make sure in sync with current angular versions
@@ -289,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

@@ -12,47 +12,6 @@
     }
   },
   "packageJsonUpdates": {
-    "11.0.21": {
-      "version": "11.0.21",
-      "packages": {
-        "@nstudio/angular": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/electron": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/electron-angular": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/ionic": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/ionic-angular": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/nativescript": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/nativescript-angular": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/web": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        },
-        "@nstudio/web-angular": {
-          "version": "11.0.21",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "12.4.3": {
       "version": "12.4.3",
       "packages": {

package/package.json

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

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

@@ -13,7 +13,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const testing_1 = require("@nstudio/xplat/testing");
 const testing_2 = require("../../utils/testing");
-const testing_3 = require("@nrwl/workspace/testing");
+const testing_3 = require("@nx/workspace/testing");
 (0, xplat_utils_1.setTest)();
 describe('xplat schematic', () => {
     let appTree;

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

@@ -14,7 +14,7 @@ const xplat_utils_1 = require("@nstudio/xplat-utils");
 const testing_1 = require("@nstudio/xplat/testing");
 const testing_2 = require("../../utils/testing");
 const utils_1 = require("../../utils");
-const testing_3 = require("@nrwl/workspace/testing");
+const testing_3 = require("@nx/workspace/testing");
 (0, xplat_utils_1.setTest)();
 describe('xplat init', () => {
     let appTree;
@@ -36,7 +36,7 @@ describe('xplat init', () => {
         let packageJson = JSON.parse((0, testing_3.getFileContent)(tree, 'package.json'));
         // console.log(packageJson);
         const devDeps = [
-            '@nrwl/angular',
+            '@nx/angular',
             '@nstudio/angular',
             '@nstudio/web-angular',
             '@nstudio/web',

package/src/utils/ast.d.ts

@@ -1,77 +1,5 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT- style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Tree } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
-export declare function findNodes(node: ts.Node, kind: ts.SyntaxKind | ts.SyntaxKind[], max?: number): ts.Node[];
-export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];
-export interface Change {
-    apply(host: any): Promise<void>;
-    readonly type: string;
-    readonly path: string | null;
-    readonly order: number;
-    readonly description: string;
-}
-export declare class NoopChange implements Change {
-    type: string;
-    description: string;
-    order: number;
-    path: any;
-    apply(): Promise<void>;
-}
-export declare class InsertChange implements Change {
-    path: string;
-    pos: number;
-    toAdd: string;
-    type: string;
-    order: number;
-    description: string;
-    constructor(path: string, pos: number, toAdd: string);
-    apply(host: any): any;
-}
-export declare class RemoveChange implements Change {
-    path: string;
-    private pos;
-    private toRemove;
-    type: string;
-    order: number;
-    description: string;
-    constructor(path: string, pos: number, toRemove: string);
-    apply(host: any): Promise<void>;
-}
-export declare class ReplaceChange implements Change {
-    path: string;
-    pos: number;
-    oldText: string;
-    newText: string;
-    type: string;
-    order: number;
-    description: string;
-    constructor(path: string, pos: number, oldText: string, newText: string);
-    apply(host: any): Promise<void>;
-}
-export declare function addParameterToConstructor(source: ts.SourceFile, modulePath: string, opts: {
-    className: string;
-    param: string;
-}): Change[];
-export declare function addMethod(source: ts.SourceFile, modulePath: string, opts: {
-    className: string;
-    methodHeader: string;
-    body: string;
-}): Change[];
-export declare function findClass(source: ts.SourceFile, className: string, silent?: boolean): ts.ClassDeclaration;
-export declare function offset(text: string, numberOfTabs: number, wrap: boolean): string;
-export declare function addIncludeToTsConfig(tsConfigPath: string, source: ts.SourceFile, include: string): Change[];
-export declare function getImport(source: ts.SourceFile, predicate: (a: any) => boolean): {
-    moduleSpec: string;
-    bindings: string[];
-}[];
-export declare function addGlobal(source: ts.SourceFile, modulePath: string, statement: string, isExport?: boolean): Change[];
-export declare function insert(host: Tree, modulePath: string, changes: Change[]): void;
-export declare function getProjectConfig(tree: Tree, name: string): any;
-export declare function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string, fileName: string, isDefault?: boolean): Change;
-export declare function replaceNodeValue(host: Tree, modulePath: string, node: ts.Node, content: string): void;
+import { Tree } from '@nx/devkit';
+import { Tree as NgTree } from '@angular-devkit/schematics';
+export declare function addGlobal(tree: Tree, source: ts.SourceFile, modulePath: string, statement: string, isExport?: boolean): ts.SourceFile;
+export declare function insert(host: NgTree, modulePath: string, changes: any[]): void;

package/src/utils/ast.js

@@ -1,255 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceNodeValue = exports.insertImport = exports.getProjectConfig = exports.insert = exports.addGlobal = exports.getImport = exports.addIncludeToTsConfig = exports.offset = exports.findClass = exports.addMethod = exports.addParameterToConstructor = exports.ReplaceChange = exports.RemoveChange = exports.InsertChange = exports.NoopChange = exports.getSourceNodes = exports.findNodes = void 0;
+exports.insert = exports.addGlobal = void 0;
+const js_1 = require("@nx/js");
+const typescript_1 = require("nx/src/utils/typescript");
 const ts = require("typescript");
 const general_1 = require("./general");
-function nodesByPosition(first, second) {
-    return first.getStart() - second.getStart();
-}
-function insertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKind) {
-    // sort() has a side effect, so make a copy so that we won't overwrite the parent's object.
-    let lastItem = [...nodes].sort(nodesByPosition).pop();
-    if (!lastItem) {
-        throw new Error();
-    }
-    if (syntaxKind) {
-        lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();
-    }
-    if (!lastItem && fallbackPos == undefined) {
-        throw new Error(`tried to insert ${toInsert} as first occurence with no fallback position`);
-    }
-    const lastItemPosition = lastItem ? lastItem.getEnd() : fallbackPos;
-    return new InsertChange(file, lastItemPosition, toInsert);
-}
-function findNodes(node, kind, max = Infinity) {
-    if (!node || max == 0) {
-        return [];
-    }
-    const arr = [];
-    const hasMatch = Array.isArray(kind)
-        ? kind.includes(node.kind)
-        : node.kind === kind;
-    if (hasMatch) {
-        arr.push(node);
-        max--;
-    }
-    if (max > 0) {
-        for (const child of node.getChildren()) {
-            findNodes(child, kind, max).forEach((node) => {
-                if (max > 0) {
-                    arr.push(node);
-                }
-                max--;
-            });
-            if (max <= 0) {
-                break;
-            }
-        }
-    }
-    return arr;
-}
-exports.findNodes = findNodes;
-function getSourceNodes(sourceFile) {
-    const nodes = [sourceFile];
-    const result = [];
-    while (nodes.length > 0) {
-        const node = nodes.shift();
-        if (node) {
-            result.push(node);
-            if (node.getChildCount(sourceFile) >= 0) {
-                nodes.unshift(...node.getChildren());
-            }
-        }
-    }
-    return result;
-}
-exports.getSourceNodes = getSourceNodes;
-class NoopChange {
-    constructor() {
-        this.type = 'noop';
-        this.description = 'No operation.';
-        this.order = Infinity;
-        this.path = null;
-    }
-    apply() {
-        return Promise.resolve();
-    }
-}
-exports.NoopChange = NoopChange;
-class InsertChange {
-    constructor(path, pos, toAdd) {
-        this.path = path;
-        this.pos = pos;
-        this.toAdd = toAdd;
-        this.type = 'insert';
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Inserted ${toAdd} into position ${pos} of ${path}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos);
-            return host.write(this.path, `${prefix}${this.toAdd}${suffix}`);
-        });
-    }
-}
-exports.InsertChange = InsertChange;
-class RemoveChange {
-    constructor(path, pos, toRemove) {
-        this.path = path;
-        this.pos = pos;
-        this.toRemove = toRemove;
-        this.type = 'remove';
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Removed ${toRemove} into position ${pos} of ${path}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos + this.toRemove.length);
-            return host.write(this.path, `${prefix}${suffix}`);
-        });
-    }
-}
-exports.RemoveChange = RemoveChange;
-class ReplaceChange {
-    constructor(path, pos, oldText, newText) {
-        this.path = path;
-        this.pos = pos;
-        this.oldText = oldText;
-        this.newText = newText;
-        this.type = 'replace';
-        if (pos < 0) {
-            throw new Error('Negative positions are invalid');
-        }
-        this.description = `Replaced ${oldText} into position ${pos} of ${path} with ${newText}`;
-        this.order = pos;
-    }
-    apply(host) {
-        return host.read(this.path).then((content) => {
-            const prefix = content.substring(0, this.pos);
-            const suffix = content.substring(this.pos + this.oldText.length);
-            const text = content.substring(this.pos, this.pos + this.oldText.length);
-            if (text !== this.oldText) {
-                return Promise.reject(new Error(`Invalid replace: "${text}" != "${this.oldText}".`));
-            }
-            return host.write(this.path, `${prefix}${this.newText}${suffix}`);
-        });
-    }
-}
-exports.ReplaceChange = ReplaceChange;
-function addParameterToConstructor(source, modulePath, opts) {
-    const clazz = findClass(source, opts.className);
-    const constructor = clazz.members.filter((m) => m.kind === ts.SyntaxKind.Constructor)[0];
-    if (constructor) {
-        throw new Error('Should be tested');
-    }
-    else {
-        const methodHeader = `constructor(${opts.param})`;
-        return addMethod(source, modulePath, {
-            className: opts.className,
-            methodHeader,
-            body: null,
-        });
-    }
-}
-exports.addParameterToConstructor = addParameterToConstructor;
-function addMethod(source, modulePath, opts) {
-    const clazz = findClass(source, opts.className);
-    const body = opts.body
-        ? `
-${opts.methodHeader} {
-${offset(opts.body, 1, false)}
-}
-`
-        : `
-${opts.methodHeader} {}
-`;
-    return [new InsertChange(modulePath, clazz.end - 1, offset(body, 1, true))];
-}
-exports.addMethod = addMethod;
-function findClass(source, className, silent = false) {
-    const nodes = getSourceNodes(source);
-    const clazz = (nodes.filter((n) => n.kind === ts.SyntaxKind.ClassDeclaration &&
-        n.name.text === className)[0]);
-    if (!clazz && !silent) {
-        throw new Error(`Cannot find class '${className}'`);
-    }
-    return clazz;
-}
-exports.findClass = findClass;
-function offset(text, numberOfTabs, wrap) {
-    const lines = text
-        .trim()
-        .split('\n')
-        .map((line) => {
-        let tabs = '';
-        for (let c = 0; c < numberOfTabs; ++c) {
-            tabs += '  ';
-        }
-        return `${tabs}${line}`;
-    })
-        .join('\n');
-    return wrap ? `\n${lines}\n` : lines;
-}
-exports.offset = offset;
-function addIncludeToTsConfig(tsConfigPath, source, include) {
-    const includeKeywordPos = source.text.indexOf('"include":');
-    if (includeKeywordPos > -1) {
-        const includeArrayEndPos = source.text.indexOf(']', includeKeywordPos);
-        return [new InsertChange(tsConfigPath, includeArrayEndPos, include)];
-    }
-    else {
-        return [];
-    }
-}
-exports.addIncludeToTsConfig = addIncludeToTsConfig;
-function getImport(source, predicate) {
-    const allImports = findNodes(source, ts.SyntaxKind.ImportDeclaration);
-    const matching = allImports.filter((i) => predicate(i.moduleSpecifier.getText()));
-    return matching.map((i) => {
-        const moduleSpec = i.moduleSpecifier
-            .getText()
-            .substring(1, i.moduleSpecifier.getText().length - 1);
-        const t = i.importClause.namedBindings.getText();
-        const bindings = t
-            .replace('{', '')
-            .replace('}', '')
-            .split(',')
-            .map((q) => q.trim());
-        return { moduleSpec, bindings };
-    });
-}
-exports.getImport = getImport;
-function addGlobal(source, modulePath, statement, isExport) {
+function addGlobal(tree, source, modulePath, statement, isExport) {
     if (isExport) {
-        const allExports = findNodes(source, ts.SyntaxKind.ExportDeclaration);
+        const allExports = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ExportDeclaration);
         // console.log('allExports:', allExports.length);
         if (allExports.length > 0) {
             const lastExport = allExports[allExports.length - 1];
             // console.log('lastExport.end:', lastExport.end);
-            return [new InsertChange(modulePath, lastExport.end, `\n${statement}\n`)];
+            return (0, js_1.insertChange)(tree, source, modulePath, lastExport.end, `\n${statement}\n`);
         }
         else {
-            return [new InsertChange(modulePath, 0, `${statement}\n`)];
+            return (0, js_1.insertChange)(tree, source, modulePath, 0, `${statement}\n`);
         }
     }
     else {
-        const allImports = findNodes(source, ts.SyntaxKind.ImportDeclaration);
+        const allImports = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
         if (allImports.length > 0) {
             const lastImport = allImports[allImports.length - 1];
-            return [
-                new InsertChange(modulePath, lastImport.end + 1, `\n${statement}\n`),
-            ];
+            return (0, js_1.insertChange)(tree, source, modulePath, lastImport.end + 1, `\n${statement}\n`);
         }
         else {
-            return [new InsertChange(modulePath, 0, `${statement}\n`)];
+            return (0, js_1.insertChange)(tree, source, modulePath, 0, `${statement}\n`);
         }
     }
 }
@@ -262,17 +38,22 @@ function insert(host, modulePath, changes) {
     const orderedChanges = changes.sort((a, b) => b.order - a.order);
     const recorder = host.beginUpdate(modulePath);
     for (const change of orderedChanges) {
-        if (change.type == 'insert') {
+        // console.log('change.type:', change, ' -change.kind:', change.kind)
+        let type = change.type;
+        if (change.kind === 'c' || change.kind === 'o') {
+            type = general_1.actionToFileChangeMap[change.kind];
+        }
+        if (type == 'insert') {
             recorder.insertLeft(change.pos, change.toAdd);
         }
-        else if (change.type == 'remove') {
+        else if (type == 'remove') {
             recorder.remove(change.pos - 1, change.toRemove.length + 1);
         }
-        else if (change.type == 'replace') {
+        else if (type == 'replace') {
             recorder.remove(change.pos, change.oldText.length);
             recorder.insertLeft(change.pos, change.newText);
         }
-        else if (change.type === 'noop') {
+        else if (type === 'noop') {
             // do nothing
         }
         else {
@@ -282,71 +63,3 @@ function insert(host, modulePath, changes) {
     host.commitUpdate(recorder);
 }
 exports.insert = insert;
-function getProjectConfig(tree, name) {
-    const workspaceJson = (0, general_1.readWorkspaceJson)(tree);
-    const projectConfig = workspaceJson.projects[name];
-    if (!projectConfig) {
-        throw new Error(`Cannot find project '${name}'`);
-    }
-    else {
-        return projectConfig;
-    }
-}
-exports.getProjectConfig = getProjectConfig;
-function insertImport(source, fileToEdit, symbolName, fileName, isDefault = false) {
-    const rootNode = source;
-    const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
-    // get nodes that map to import statements from the file fileName
-    const relevantImports = allImports.filter((node) => {
-        // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
-        const importFiles = node
-            .getChildren()
-            .filter((child) => child.kind === ts.SyntaxKind.StringLiteral)
-            .map((n) => n.text);
-        return importFiles.filter((file) => file === fileName).length === 1;
-    });
-    if (relevantImports.length > 0) {
-        let importsAsterisk = false;
-        // imports from import file
-        const imports = [];
-        relevantImports.forEach((n) => {
-            Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));
-            if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
-                importsAsterisk = true;
-            }
-        });
-        // if imports * from fileName, don't add symbolName
-        if (importsAsterisk) {
-            return new NoopChange();
-        }
-        const importTextNodes = imports.filter((n) => n.text === symbolName);
-        // insert import if it's not there
-        if (importTextNodes.length === 0) {
-            const fallbackPos = findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
-                findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
-            return insertAfterLastOccurrence(imports, `, ${symbolName}`, fileToEdit, fallbackPos);
-        }
-        return new NoopChange();
-    }
-    // no such import declaration exists
-    const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
-    let fallbackPos = 0;
-    if (useStrict.length > 0) {
-        fallbackPos = useStrict[0].end;
-    }
-    const open = isDefault ? '' : '{ ';
-    const close = isDefault ? '' : ' }';
-    // if there are no imports or 'use strict' statement, insert import at beginning of file
-    const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;
-    const separator = insertAtBeginning ? '' : ';\n';
-    const toInsert = `${separator}import ${open}${symbolName}${close}` +
-        ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
-    return insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
-}
-exports.insertImport = insertImport;
-function replaceNodeValue(host, modulePath, node, content) {
-    insert(host, modulePath, [
-        new ReplaceChange(modulePath, node.getStart(node.getSourceFile()), node.getFullText(), content),
-    ]);
-}
-exports.replaceNodeValue = replaceNodeValue;

package/src/utils/general.d.ts

@@ -3,7 +3,7 @@
 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';
+import { FileChange, Tree as DevKitTree } from '@nx/devkit';
 export interface NodeDependency {
     name: string;
     version: string;
@@ -106,7 +106,7 @@ export declare class DevkitTreeFromAngularDevkitTree implements DevKitTree {
     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;
+    write(filePath: string, content: Buffer | string, options?: Parameters<DevKitTree['write']>[2]): void;
     changePermissions(filePath: string, mode: Mode): void;
     private warnUnsupportedFilePermissionsChange;
 }

package/src/utils/general.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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 workspace_1 = require("@nx/workspace");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const path_1 = require("path");
 // list of all supported helpers
@@ -282,7 +282,7 @@ class DevkitTreeFromAngularDevkitTree {
     }
     warnUnsupportedFilePermissionsChange(filePath, mode) {
         console.log(`The Angular DevKit tree does not support changing a file permissions.
-                      Ignoring changing ${filePath} permissions to ${mode}.`);
+                    Ignoring changing ${filePath} permissions to ${mode}.`);
     }
 }
 exports.DevkitTreeFromAngularDevkitTree = DevkitTreeFromAngularDevkitTree;

package/src/utils/testing-utils.d.ts

@@ -1,6 +1,6 @@
 import { Tree } from '@angular-devkit/schematics';
 import { FrameworkTypes } from '@nstudio/xplat-utils';
-export { getFileContent } from '@nrwl/workspace/testing';
+export { getFileContent } from '@nx/workspace/testing';
 export declare function createEmptyWorkspace(tree: Tree, framework?: FrameworkTypes): Tree;
 export declare function createXplatWithAppsForElectron(tree: Tree): Tree;
 export declare function createXplatWithApps(tree: Tree, framework?: FrameworkTypes): Tree;

package/src/utils/testing-utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isInDecoratorMetadata = exports.isInComponentMetadata = exports.isInModuleMetadata = exports.createNativeScriptAngularApp = exports.createWebAngularApp = exports.createXplatWebAngular = exports.createXplatNativeScriptAngular = exports.createXplatLibs = exports.createNxLib = exports.createXplatWithNativeScriptWeb = exports.createXplatWithApps = exports.createXplatWithAppsForElectron = exports.createEmptyWorkspace = exports.getFileContent = void 0;
-var testing_1 = require("@nrwl/workspace/testing");
+var testing_1 = require("@nx/workspace/testing");
 Object.defineProperty(exports, "getFileContent", { enumerable: true, get: function () { return testing_1.getFileContent; } });
 function createEmptyWorkspace(tree, framework) {
     tree.create('/.gitignore', '');

package/src/utils/versions.d.ts

@@ -1,2 +1,2 @@
 export declare const xplatVersion = "*";
-export declare const nxVersion = "^15.0.0";
+export declare const nxVersion = "^16.0.0";

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.4-rc.1';
-exports.nxVersion = '^15.0.0';
+exports.xplatVersion = '16.5.0';
+exports.nxVersion = '^16.0.0';

package/src/utils/xplat.js

@@ -11,24 +11,24 @@ const tasks_1 = require("@angular-devkit/schematics/tasks");
 const versions_1 = require("./versions");
 const output_1 = require("./output");
 exports.packageInnerDependencies = {
-    '@nstudio/angular': ['@nrwl/angular'],
+    '@nstudio/angular': ['@nx/angular'],
     '@nstudio/electron-angular': [
-        '@nrwl/angular',
+        '@nx/angular',
         '@nstudio/electron',
         '@nstudio/angular',
     ],
     '@nstudio/ionic-angular': [
-        '@nrwl/angular',
+        '@nx/angular',
         '@nstudio/ionic',
         '@nstudio/angular',
         '@nstudio/web-angular',
     ],
     '@nstudio/nativescript-angular': [
-        '@nrwl/angular',
+        '@nx/angular',
         '@nstudio/nativescript',
         '@nstudio/angular',
     ],
-    '@nstudio/web-angular': ['@nrwl/angular', '@nstudio/web', '@nstudio/angular'],
+    '@nstudio/web-angular': ['@nx/angular', '@nstudio/web', '@nstudio/angular'],
 };
 var XplatHelpers;
 (function (XplatHelpers) {
@@ -42,8 +42,7 @@ var XplatHelpers;
      */
     function addPackageWithNgAdd(packageName, options, callSchematicIfAdded) {
         return (host) => {
-            const json = (0, xplat_utils_1.getJsonFromFile)(host, 'package.json');
-            const { dependencies, devDependencies } = json;
+            const { dependencies, devDependencies } = (0, xplat_utils_1.getJsonFromFile)(host, 'package.json');
             return dependencies[packageName] || devDependencies[packageName]
                 ? callSchematicIfAdded
                     ? (0, schematics_1.externalSchematic)(packageName, callSchematicIfAdded, options, {
@@ -198,7 +197,7 @@ var XplatHelpers;
                                 xplat_utils_1.supportedNxExtraPlatforms.includes(platform)) {
                                 // platforms that are supported directly via Nx only right now
                                 // 'app'/'application' is only schematic supported via xplat proxy at moment
-                                const packageName = `@nrwl/${platform}`;
+                                const packageName = `@nx/${platform}`;
                                 devDependencies[packageName] = versions_1.nxVersion;
                                 packagesToRunXplat.push(packageName);
                             }
@@ -228,7 +227,7 @@ var XplatHelpers;
                     xplat_utils_1.supportedNxExtraPlatforms.includes(platform)) {
                     // platforms supported directly via Nx only right now
                     // 'app'/'application' is only schematic supported via xplat proxy at moment
-                    const packageName = `@nrwl/${platform}`;
+                    const packageName = `@nx/${platform}`;
                     devDependencies[packageName] = versions_1.nxVersion;
                     packagesToRunXplat.push(packageName);
                 }
@@ -317,7 +316,7 @@ var XplatHelpers;
                 else if (xplat_utils_1.supportedNxExtraPlatforms.includes(platform)) {
                     // platforms supported directly via Nx only right now
                     // 'app'/'application' is only schematic supported via xplat proxy at moment
-                    const packageName = `@nrwl/${platform}`;
+                    const packageName = `@nx/${platform}`;
                     devDependencies[packageName] = versions_1.nxVersion;
                     packagesToRun.push(packageName);
                 }
@@ -374,7 +373,7 @@ var XplatHelpers;
             }
             if (packagesToRun.length) {
                 for (const packageName of packagesToRun) {
-                    const nxPlatform = (packageName.replace('@nrwl/', ''));
+                    const nxPlatform = (packageName.replace('@nx/', ''));
                     const { name, directory } = getAppNamingConvention(options, nxPlatform);
                     output_1.output.log({
                         title: 'Note:',
@@ -399,7 +398,7 @@ var XplatHelpers;
                     // console.log('devDependencies:', devDependencies);
                     // console.log('packagesToRunXplat:', packagesToRunXplat);
                     for (const packageName of packagesToRun) {
-                        const nxPlatform = (packageName.replace('@nrwl/', ''));
+                        const nxPlatform = (packageName.replace('@nx/', ''));
                         const { name, directory } = getAppNamingConvention(options, nxPlatform);
                         output_1.output.log({
                             title: 'Note:',
@@ -453,7 +452,7 @@ var XplatHelpers;
                 directory = `${directory}-${framework}`;
             }
             if (tree.exists(`libs/${directory ? directory + '/' : ''}${libName}/tsconfig.json`)) {
-                // console.log(`externalSchematic('@nrwl/workspace', 'lib') ALREADY EXISTS for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
+                // console.log(`externalSchematic('@nx/workspace', 'lib') ALREADY EXISTS for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
                 return (0, schematics_1.noop)()(tree, context);
             }
             const libOptions = {
@@ -465,8 +464,8 @@ var XplatHelpers;
             if (libName === 'scss') {
                 libOptions.skipTsConfig = true;
             }
-            // console.log(`CALLING externalSchematic('@nrwl/workspace', 'lib') for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
-            return (0, schematics_1.chain)([(0, schematics_1.externalSchematic)('@nrwl/workspace', 'lib', libOptions)]);
+            // console.log(`CALLING externalSchematic('@nx/workspace', 'lib') for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
+            return (0, schematics_1.chain)([(0, schematics_1.externalSchematic)('@nx/js', 'library', libOptions)]);
         };
     }
     XplatHelpers.generateLib = generateLib;
@@ -769,15 +768,25 @@ var XplatFeatureHelpers;
     }
     XplatFeatureHelpers.addFiles = addFiles;
     function adjustBarrelIndex(options, indexFilePath) {
-        return (tree) => {
+        return (tree, context) => {
+            const devKitTree = (0, general_1.convertNgTreeToDevKit)(tree, context);
             // console.log('adjustBarrelIndex indexFilePath:', indexFilePath);
             // console.log('tree.exists(indexFilePath):', tree.exists(indexFilePath));
             const indexSource = tree.read(indexFilePath).toString('utf-8');
             const indexSourceFile = (0, typescript_1.createSourceFile)(indexFilePath, indexSource, typescript_1.ScriptTarget.Latest, true);
-            (0, ast_1.insert)(tree, indexFilePath, [
-                ...(0, ast_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${options.directory ? options.directory + '/' : ''}${options.name.toLowerCase()}';`, true),
-            ]);
-            return tree;
+            // insert(tree, indexFilePath, [
+            //   ...addGlobal(
+            //     devKitTree,
+            //     indexSourceFile,
+            //     indexFilePath,
+            //     `export * from './${
+            //       options.directory ? options.directory + '/' : ''
+            //     }${options.name.toLowerCase()}';`,
+            //     true
+            //   ),
+            // ]);
+            (0, ast_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `export * from './${options.directory ? options.directory + '/' : ''}${options.name.toLowerCase()}';`, true);
+            return devKitTree.tree;
         };
     }
     XplatFeatureHelpers.adjustBarrelIndex = adjustBarrelIndex;