@nstudio/xplat 13.0.0 → 13.4.2-rc.0

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

@@ -29,8 +29,8 @@ function updateNativeScriptApps(tree, context) {
     const appsDir = tree.getDir('apps');
     const appFolders = appsDir.subdirs;
     const cwd = process.cwd();
-    const nativeScriptAppsPaths = xplat_utils_1.getAppPaths(tree, 'nativescript');
-    const npmScope = xplat_utils_1.getNpmScope();
+    const nativeScriptAppsPaths = (0, xplat_utils_1.getAppPaths)(tree, 'nativescript');
+    const npmScope = (0, xplat_utils_1.getNpmScope)();
     const appsNames = [];
     // update {N} apps and configs
     for (const dirPath of nativeScriptAppsPaths) {
@@ -49,17 +49,17 @@ function updateNativeScriptApps(tree, context) {
             .map((p) => '..')
             .join('\\');
         const cwd = process.cwd();
-        const webpackConfigPath = path_1.join(cwd, 'node_modules/@nstudio/nativescript-angular/src/schematics/application/_files/webpack.config.js');
+        const webpackConfigPath = (0, path_1.join)(cwd, 'node_modules/@nstudio/nativescript-angular/src/schematics/application/_files/webpack.config.js');
         // console.log('webpackConfigPath:', webpackConfigPath);
         const webpackConfig = fs.readFileSync(webpackConfigPath, {
             encoding: 'utf-8',
         });
-        workspace_1.createOrUpdate(tree, `${dirPath}/webpack.config.js`, webpackConfig
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/webpack.config.js`, webpackConfig
             .replace(/<%= pathOffset %>/gi, relativePath + '/')
             .replace(/<%= npmScope %>/gi, npmScope));
         // update {N} app deps
         const packagePath = `${dirPath}/package.json`;
-        const packageJson = xplat_utils_1.getJsonFromFile(tree, packagePath);
+        const packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, packagePath);
         if (packageJson) {
             packageJson.main = './src/main.ts';
             packageJson.scripts = packageJson.scripts || {};
@@ -93,7 +93,7 @@ function updateNativeScriptApps(tree, context) {
             };
             // console.log('path:',path);
             // console.log('packageJson overwrite:', JSON.stringify(packageJson));
-            tree = xplat_utils_1.updateJsonFile(tree, packagePath, packageJson);
+            tree = (0, xplat_utils_1.updateJsonFile)(tree, packagePath, packageJson);
         }
         if (tree.exists(`${dirPath}/tsconfig.env.json`)) {
             tree.delete(`${dirPath}/tsconfig.env.json`);
@@ -101,7 +101,7 @@ function updateNativeScriptApps(tree, context) {
         if (tree.exists(`${dirPath}/tsconfig.tns.json`)) {
             tree.delete(`${dirPath}/tsconfig.tns.json`);
         }
-        workspace_1.createOrUpdate(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
 
 const fs = require('fs-extra');
 const path = require('path');
@@ -125,7 +125,7 @@ child.on('close', (code) => {
 
 });
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.app.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.app.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -141,7 +141,7 @@ child.on('close', (code) => {
     "./src/polyfills.ts"
   ]
 }`);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.editor.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.editor.json`, `{
   "extends": "./tsconfig.json",
   "include": ["**/*.ts"],
   "compilerOptions": {
@@ -149,7 +149,7 @@ child.on('close', (code) => {
   }
 }
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.json`, `{
   "extends": "${relativePath}/tsconfig.base.json",
   "files": [],
   "include": [],
@@ -166,7 +166,7 @@ child.on('close', (code) => {
   ]
 }      
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.spec.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.spec.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -177,8 +177,8 @@ child.on('close', (code) => {
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }      
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/src/test-setup.ts`, `import 'jest-preset-angular';`);
-        workspace_1.createOrUpdate(tree, `${dirPath}/src/polyfills.ts`, `/**
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/src/test-setup.ts`, `import 'jest-preset-angular';`);
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/src/polyfills.ts`, `/**
 * NativeScript Polyfills
 */
 
@@ -199,7 +199,7 @@ import 'zone.js';
 // Add NativeScript specific Zone JS patches
 import '@nativescript/zone-js';
        `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/.eslintrc.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/.eslintrc.json`, `{
   "extends": "${relativePath}/.eslintrc.json",
   "ignorePatterns": [
     "!**/*"
@@ -223,7 +223,7 @@ import '@nativescript/zone-js';
           "error",
           {
             "type": "attribute",
-            "prefix": "${xplat_utils_1.getPrefix()}",
+            "prefix": "${(0, xplat_utils_1.getPrefix)()}",
             "style": "camelCase"
           }
         ],
@@ -231,7 +231,7 @@ import '@nativescript/zone-js';
           "error",
           {
             "type": "element",
-            "prefix": "${xplat_utils_1.getPrefix()}",
+            "prefix": "${(0, xplat_utils_1.getPrefix)()}",
             "style": "kebab-case"
           }
         ]
@@ -264,7 +264,7 @@ import '@nativescript/zone-js';
     return tree;
 }
 function updateRootPackage(tree, context) {
-    return workspace_1.updateJsonInTree('package.json', (json) => {
+    return (0, workspace_1.updateJsonInTree)('package.json', (json) => {
         json.scripts = json.scripts || {};
         const nativeScriptDeps = {
             '@nativescript/angular': nsNgScopedVersion,
@@ -289,8 +289,8 @@ function updateRootPackage(tree, context) {
     })(tree, context);
 }
 function default_1() {
-    return schematics_1.chain([
-        xplat_utils_1.prerun({
+    return (0, schematics_1.chain)([
+        (0, xplat_utils_1.prerun)({
             framework: 'angular',
         }, true),
         updateNativeScriptApps,

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

@@ -11,8 +11,8 @@ const nsNgScopedVersion = '^12.2.0';
 const nsCoreVersion = '~8.1.0';
 let hasNativeScriptApps = false;
 function updateNativeScriptApps(tree, context) {
-    const nativeScriptAppsPaths = xplat_utils_1.getAppPaths(tree, 'nativescript');
-    const npmScope = xplat_utils_1.getNpmScope();
+    const nativeScriptAppsPaths = (0, xplat_utils_1.getAppPaths)(tree, 'nativescript');
+    const npmScope = (0, xplat_utils_1.getNpmScope)();
     const appsNames = [];
     // update {N} apps and configs
     for (const dirPath of nativeScriptAppsPaths) {
@@ -27,7 +27,7 @@ function updateNativeScriptApps(tree, context) {
             .join('/');
         // update {N} app deps
         const packagePath = `${dirPath}/package.json`;
-        const packageJson = xplat_utils_1.getJsonFromFile(tree, packagePath);
+        const packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, packagePath);
         if (packageJson) {
             packageJson.main = './src/main.ts';
             packageJson.scripts = packageJson.scripts || {};
@@ -63,7 +63,7 @@ function updateNativeScriptApps(tree, context) {
             };
             // console.log('path:',path);
             // console.log('packageJson overwrite:', JSON.stringify(packageJson));
-            tree = xplat_utils_1.updateJsonFile(tree, packagePath, packageJson);
+            tree = (0, xplat_utils_1.updateJsonFile)(tree, packagePath, packageJson);
         }
         if (tree.exists(`${dirPath}/tsconfig.env.json`)) {
             tree.delete(`${dirPath}/tsconfig.env.json`);
@@ -71,7 +71,7 @@ function updateNativeScriptApps(tree, context) {
         if (tree.exists(`${dirPath}/tsconfig.tns.json`)) {
             tree.delete(`${dirPath}/tsconfig.tns.json`);
         }
-        workspace_1.createOrUpdate(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tools/xplat-postinstall.js`, `//#!/usr/bin/env node
 
 const fs = require('fs-extra');
 const path = require('path');
@@ -111,7 +111,7 @@ child.stdout.on('data', function (data) {
 });
       
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.app.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.app.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -127,7 +127,7 @@ child.stdout.on('data', function (data) {
     "./src/polyfills.ts"
   ]
 }`);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.editor.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.editor.json`, `{
   "extends": "./tsconfig.json",
   "include": ["**/*.ts"],
   "compilerOptions": {
@@ -135,7 +135,7 @@ child.stdout.on('data', function (data) {
   }
 }
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.json`, `{
   "extends": "${relativePath}/tsconfig.base.json",
   "files": [],
   "include": [],
@@ -152,7 +152,7 @@ child.stdout.on('data', function (data) {
   ]
 }      
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/tsconfig.spec.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/tsconfig.spec.json`, `{
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "${relativePath}/dist/out-tsc",
@@ -163,8 +163,8 @@ child.stdout.on('data', function (data) {
   "include": ["**/*.spec.ts", "**/*.d.ts"]
 }      
       `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/src/test-setup.ts`, `import 'jest-preset-angular/setup-jest';`);
-        workspace_1.createOrUpdate(tree, `${dirPath}/src/polyfills.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`, `/**
 * NativeScript Polyfills
 */
 
@@ -185,7 +185,7 @@ import 'zone.js';
 // Add NativeScript specific Zone JS patches
 import '@nativescript/zone-js';
        `);
-        workspace_1.createOrUpdate(tree, `${dirPath}/.eslintrc.json`, `{
+        (0, workspace_1.createOrUpdate)(tree, `${dirPath}/.eslintrc.json`, `{
   "extends": "${relativePath}/.eslintrc.json",
   "ignorePatterns": [
     "!**/*"
@@ -209,7 +209,7 @@ import '@nativescript/zone-js';
           "error",
           {
             "type": "attribute",
-            "prefix": "${xplat_utils_1.getPrefix()}",
+            "prefix": "${(0, xplat_utils_1.getPrefix)()}",
             "style": "camelCase"
           }
         ],
@@ -217,7 +217,7 @@ import '@nativescript/zone-js';
           "error",
           {
             "type": "element",
-            "prefix": "${xplat_utils_1.getPrefix()}",
+            "prefix": "${(0, xplat_utils_1.getPrefix)()}",
             "style": "kebab-case"
           }
         ]
@@ -250,7 +250,7 @@ import '@nativescript/zone-js';
     return tree;
 }
 function updateRootPackage(tree, context) {
-    return workspace_1.updateJsonInTree('package.json', (json) => {
+    return (0, workspace_1.updateJsonInTree)('package.json', (json) => {
         json.scripts = json.scripts || {};
         const nativeScriptDeps = {
             '@nativescript/angular': nsNgScopedVersion,
@@ -283,14 +283,14 @@ function updateRootPackage(tree, context) {
     })(tree, context);
 }
 function default_1() {
-    return schematics_1.chain([
-        xplat_utils_1.prerun({
+    return (0, schematics_1.chain)([
+        (0, xplat_utils_1.prerun)({
             framework: 'angular',
         }, true),
         updateNativeScriptApps,
         updateRootPackage,
         (tree) => {
-            return schematics_1.externalSchematic('@nrwl/workspace', 'convert-to-nx-project', {
+            return (0, schematics_1.externalSchematic)('@nrwl/workspace', 'convert-to-nx-project', {
                 all: true
             });
         },

package/migrations.json

@@ -30,9 +30,9 @@
       "description": "Migrate workspace to 12.4.3",
       "factory": "./migrations/update-12-4-3/update-12-4-3"
     },
-    "update-to-13.0.0": {
-      "version": "13.0.0",
-      "description": "Migrate workspace to 13.0.0",
+    "update-to-13.0.1": {
+      "version": "13.0.1",
+      "description": "Migrate workspace to 13.0.1",
       "factory": "./migrations/update-13-0-0/update-13-0-0"
     }
   },
@@ -119,47 +119,46 @@
         }
       }
     },
-    "13.0.0": {
-      "version": "13.0.0",
+    "13.0.1": {
+      "version": "13.0.1",
       "packages": {
         "@nstudio/angular": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/electron": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/electron-angular": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/ionic": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/ionic-angular": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/nativescript": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/nativescript-angular": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/web": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         },
         "@nstudio/web-angular": {
-          "version": "13.0.0",
+          "version": "13.0.1",
           "alwaysAddToPackageJson": false
         }
       }
     }
   }
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/xplat",
-  "version": "13.0.0",
+  "version": "13.4.2-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": "13.0.0",
-    "@nstudio/xplat-utils": "13.0.0"
+    "@nstudio/focus": "13.4.2-rc.0",
+    "@nstudio/xplat-utils": "13.4.2-rc.0"
   },
   "author": "Nathan Walker",
   "license": "MIT",

package/src/schematics/app-generate/index.js

@@ -6,9 +6,9 @@ const xplat_utils_1 = require("@nstudio/xplat-utils");
 let packagesToRunXplat = [];
 function default_1(options) {
     const externalChains = utils_1.XplatHelpers.getExternalChainsForGenerator(options, 'app', packagesToRunXplat);
-    return schematics_1.chain([
-        xplat_utils_1.prerun(options, true),
-        (tree, context) => schematics_1.chain(externalChains),
+    return (0, schematics_1.chain)([
+        (0, xplat_utils_1.prerun)(options, true),
+        (tree, context) => (0, schematics_1.chain)(externalChains),
     ]);
 }
 exports.default = default_1;

package/src/schematics/application/index.js

@@ -6,6 +6,6 @@ const utils_1 = require("../../utils");
 let packagesToRun = [];
 function default_1(options) {
     const externalChains = utils_1.XplatHelpers.getExternalChainsForApplication(options, 'app', packagesToRun);
-    return schematics_1.chain([xplat_utils_1.prerun(options, true), (tree) => schematics_1.chain(externalChains)]);
+    return (0, schematics_1.chain)([(0, xplat_utils_1.prerun)(options, true), (tree) => (0, schematics_1.chain)(externalChains)]);
 }
 exports.default = default_1;

package/src/schematics/application/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 testing_3 = require("@nrwl/workspace/testing");
-xplat_utils_1.setTest();
+(0, xplat_utils_1.setTest)();
 describe('xplat schematic', () => {
     let appTree;
     const defaultOptions = {
@@ -24,13 +24,13 @@ describe('xplat schematic', () => {
     };
     beforeEach(() => {
         appTree = schematics_1.Tree.empty();
-        appTree = testing_1.createEmptyWorkspace(appTree);
+        appTree = (0, testing_1.createEmptyWorkspace)(appTree);
     });
     it('should create web angular app', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'web';
         options.framework = 'angular';
-        const tree = yield testing_2.runSchematic('app', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('app', options, appTree);
         const files = tree.files;
         // console.log('files:', files);
         expect(tree.exists('/apps/web-sample/tsconfig.json')).toBeTruthy();
@@ -43,7 +43,7 @@ describe('xplat schematic', () => {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'nativescript';
         options.framework = 'angular';
-        const tree = yield testing_2.runSchematic('app', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('app', options, appTree);
         const files = tree.files;
         // console.log('files:', files);
         expect(tree.exists('/apps/nativescript-sample/nativescript.config.ts')).toBeTruthy();
@@ -54,44 +54,44 @@ describe('xplat schematic', () => {
     describe('Nx app generators supporte via proxy xplat app generator', () => {
         it('should create Nx express', () => __awaiter(void 0, void 0, void 0, function* () {
             appTree = schematics_1.Tree.empty();
-            appTree = testing_1.createEmptyWorkspace(appTree);
+            appTree = (0, testing_1.createEmptyWorkspace)(appTree);
             const options = Object.assign({}, defaultOptions);
             options.platforms = 'express';
-            const tree = yield testing_2.runSchematic('app', options, appTree);
+            const tree = yield (0, testing_2.runSchematic)('app', options, appTree);
             const files = tree.files;
             // console.log('files:', files);
             expect(tree.exists('/apps/express-sample/src/main.ts')).toBeTruthy();
-            let fileContent = testing_3.getFileContent(tree, '/apps/express-sample/src/main.ts');
+            let fileContent = (0, testing_3.getFileContent)(tree, '/apps/express-sample/src/main.ts');
             // console.log(fileContent);
             expect(fileContent.indexOf(`from 'express'`)).toBeGreaterThan(0);
         }));
         xit('should create Nx nest', () => __awaiter(void 0, void 0, void 0, function* () {
             appTree = schematics_1.Tree.empty();
-            appTree = testing_1.createEmptyWorkspace(appTree);
+            appTree = (0, testing_1.createEmptyWorkspace)(appTree);
             const options = Object.assign({}, defaultOptions);
             options.platforms = 'nest';
             delete options.prefix;
             delete options.isTesting;
-            const tree = yield testing_2.runSchematic('app', options, appTree);
+            const tree = yield (0, testing_2.runSchematic)('app', options, appTree);
             const files = tree.files;
             // console.log('files:', files);
             expect(tree.exists('/apps/nest-sample/src/main.ts')).toBeTruthy();
-            let fileContent = testing_3.getFileContent(tree, '/apps/nest-sample/src/main.ts');
+            let fileContent = (0, testing_3.getFileContent)(tree, '/apps/nest-sample/src/main.ts');
             // console.log(fileContent);
             expect(fileContent.indexOf(`from '@nestjs/core'`)).toBeGreaterThan(0);
         }));
         xit('should create Nx node', () => __awaiter(void 0, void 0, void 0, function* () {
             appTree = schematics_1.Tree.empty();
-            appTree = testing_1.createEmptyWorkspace(appTree);
+            appTree = (0, testing_1.createEmptyWorkspace)(appTree);
             const options = Object.assign({}, defaultOptions);
             options.platforms = 'node';
             delete options.prefix;
             delete options.isTesting;
-            const tree = yield testing_2.runSchematic('app', options, appTree);
+            const tree = yield (0, testing_2.runSchematic)('app', options, appTree);
             const files = tree.files;
             // console.log('files:', files);
             expect(tree.exists('/apps/node-sample/src/main.ts')).toBeTruthy();
-            let fileContent = testing_3.getFileContent(tree, '/apps/node-sample/src/main.ts');
+            let fileContent = (0, testing_3.getFileContent)(tree, '/apps/node-sample/src/main.ts');
             // console.log(fileContent);
             expect(fileContent.indexOf(`console.log('Hello World!')`)).toBeGreaterThanOrEqual(0);
         }));

package/src/schematics/component/index.js

@@ -6,6 +6,6 @@ const utils_1 = require("../../utils");
 let packagesToRunXplat = [];
 function default_1(options) {
     const externalChains = utils_1.XplatHelpers.getExternalChainsForGenerator(options, 'component', packagesToRunXplat);
-    return schematics_1.chain([xplat_utils_1.prerun(options, true), (tree) => schematics_1.chain(externalChains)]);
+    return (0, schematics_1.chain)([(0, xplat_utils_1.prerun)(options, true), (tree) => (0, schematics_1.chain)(externalChains)]);
 }
 exports.default = default_1;