@nstudio/xplat 15.0.4-rc.0 → 16.2.0-beta.0

package/README.md

@@ -24,13 +24,19 @@
 
 ```
 npx create-nx-workspace@latest
-```
 
-At the prompts:
+// Choose "Integrated monorepo" at the prompt:
+
+? Choose what to create                 … 
+> Integrated monorepo:    Nx configures your favorite frameworks and lets you focus on shipping features.
 
-> What to create in the new workspace
+// 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]
+```
 
-> choose `apps`
+Install the tools:
 
 ```
 npm i @nstudio/xplat -D
@@ -39,7 +45,7 @@ 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 version specified, for example:
@@ -59,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`
@@ -67,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`
@@ -81,7 +87,7 @@ npm run start.electron.desktop
 ### Ionic
 
 ```
-nx g app sample
+npx nx g @nstudio/xplat:app sample
 ```
 
 > choose `ionic`
@@ -89,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
@@ -125,7 +131,7 @@ npm run open.ionic.sample.android
 ### NativeScript
 
 ```
-nx g app mobile
+nx g @nstudio/xplat:app mobile
 ```
 
 > choose `nativescript`
@@ -133,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/xplat",
-  "version": "15.0.4-rc.0",
+  "version": "16.2.0-beta.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.0",
-    "@nstudio/xplat-utils": "15.0.4-rc.0"
+    "@nx/devkit": "^16.0.0",
+    "@nx/js": "^16.0.0",
+    "@nstudio/focus": "16.2.0-beta.0",
+    "@nstudio/xplat-utils": "16.2.0-beta.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,5 +1,5 @@
 import * as ts from 'typescript';
-import { Tree } from '@nrwl/devkit';
+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 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,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insert = exports.addGlobal = void 0;
-const js_1 = require("@nrwl/js");
+const js_1 = require("@nx/js");
 const typescript_1 = require("nx/src/utils/typescript");
 const ts = require("typescript");
 const general_1 = require("./general");
@@ -12,22 +12,20 @@ function addGlobal(tree, source, modulePath, statement, isExport) {
         if (allExports.length > 0) {
             const lastExport = allExports[allExports.length - 1];
             // console.log('lastExport.end:', lastExport.end);
-            return [(0, js_1.insertChange)(tree, source, modulePath, lastExport.end, `\n${statement}\n`)];
+            return (0, js_1.insertChange)(tree, source, modulePath, lastExport.end, `\n${statement}\n`);
         }
         else {
-            return [(0, js_1.insertChange)(tree, source, modulePath, 0, `${statement}\n`)];
+            return (0, js_1.insertChange)(tree, source, modulePath, 0, `${statement}\n`);
         }
     }
     else {
         const allImports = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
         if (allImports.length > 0) {
             const lastImport = allImports[allImports.length - 1];
-            return [
-                (0, js_1.insertChange)(tree, source, modulePath, lastImport.end + 1, `\n${statement}\n`),
-            ];
+            return (0, js_1.insertChange)(tree, source, modulePath, lastImport.end + 1, `\n${statement}\n`);
         }
         else {
-            return [(0, js_1.insertChange)(tree, source, modulePath, 0, `${statement}\n`)];
+            return (0, js_1.insertChange)(tree, source, modulePath, 0, `${statement}\n`);
         }
     }
 }

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

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.0';
-exports.nxVersion = '^15.0.0';
+exports.xplatVersion = '16.2.0-beta.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) {
@@ -197,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);
                             }
@@ -227,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);
                 }
@@ -316,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);
                 }
@@ -373,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:',
@@ -398,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:',
@@ -452,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 = {
@@ -464,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;