@nstudio/xplat 15.0.2 → 15.0.4-rc.0

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)([

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",
@@ -37,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.2",
+  "version": "15.0.4-rc.0",
   "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.2",
-    "@nstudio/xplat-utils": "15.0.2"
+    "@nstudio/focus": "15.0.4-rc.0",
+    "@nstudio/xplat-utils": "15.0.4-rc.0"
   },
   "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/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 '@nrwl/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;