@nstudio/xplat 16.8.0 → 17.0.0-alpha.1

package/collection.json

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

package/package.json

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

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

@@ -13,7 +13,6 @@ 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("@nx/workspace/testing");
 (0, xplat_utils_1.setTest)();
 describe('xplat schematic', () => {
     let appTree;
@@ -61,7 +60,7 @@ describe('xplat schematic', () => {
             const files = tree.files;
             // console.log('files:', files);
             expect(tree.exists('/apps/express-sample/src/main.ts')).toBeTruthy();
-            let fileContent = (0, testing_3.getFileContent)(tree, '/apps/express-sample/src/main.ts');
+            let fileContent = (0, testing_1.getFileContent)(tree, '/apps/express-sample/src/main.ts');
             // console.log(fileContent);
             expect(fileContent.indexOf(`from 'express'`)).toBeGreaterThan(0);
         }));
@@ -76,7 +75,7 @@ describe('xplat schematic', () => {
             const files = tree.files;
             // console.log('files:', files);
             expect(tree.exists('/apps/nest-sample/src/main.ts')).toBeTruthy();
-            let fileContent = (0, testing_3.getFileContent)(tree, '/apps/nest-sample/src/main.ts');
+            let fileContent = (0, testing_1.getFileContent)(tree, '/apps/nest-sample/src/main.ts');
             // console.log(fileContent);
             expect(fileContent.indexOf(`from '@nestjs/core'`)).toBeGreaterThan(0);
         }));
@@ -91,7 +90,7 @@ describe('xplat schematic', () => {
             const files = tree.files;
             // console.log('files:', files);
             expect(tree.exists('/apps/node-sample/src/main.ts')).toBeTruthy();
-            let fileContent = (0, testing_3.getFileContent)(tree, '/apps/node-sample/src/main.ts');
+            let fileContent = (0, testing_1.getFileContent)(tree, '/apps/node-sample/src/main.ts');
             // console.log(fileContent);
             expect(fileContent.indexOf(`console.log('Hello World!')`)).toBeGreaterThanOrEqual(0);
         }));

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("@nx/workspace/testing");
+const testing_3 = require("@nstudio/xplat/testing");
 (0, xplat_utils_1.setTest)();
 describe('xplat init', () => {
     let appTree;

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("@nx/workspace");
+const nxStringUtils = require("@nx/devkit/src/utils/string-utils");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const path_1 = require("path");
 // list of all supported helpers
@@ -52,9 +52,7 @@ function updatePackageForNgrx(tree, packagePath = 'package.json') {
                 ? packageJson.dependencies['@ngrx/store']
                 : null;
             const dependencies = {};
-            const devDependencies = {
-                'jasmine-marbles': '~0.6.0',
-            };
+            const devDependencies = {};
             packageJson.dependencies = Object.assign(Object.assign({}, (packageJson.dependencies || {})), dependencies);
             packageJson.devDependencies = Object.assign(Object.assign({}, (packageJson.devDependencies || {})), devDependencies);
             return (0, xplat_utils_1.updateJsonFile)(tree, packagePath, packageJson);
@@ -131,7 +129,7 @@ const sanitize = (str) => str
     .filter((char) => /[a-zA-Z0-9]/.test(char))
     .join('');
 exports.sanitize = sanitize;
-exports.stringUtils = Object.assign({ sanitize: exports.sanitize }, workspace_1.stringUtils);
+exports.stringUtils = Object.assign({ sanitize: exports.sanitize }, nxStringUtils);
 const toComponentClassName = (name) => `${exports.stringUtils.classify(name)}Component`;
 exports.toComponentClassName = toComponentClassName;
 const toNgModuleClassName = (name) => `${exports.stringUtils.classify(name)}Module`;

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

@@ -1,6 +1,7 @@
 import { Tree } from '@angular-devkit/schematics';
+import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import { FrameworkTypes } from '@nstudio/xplat-utils';
-export { getFileContent } from '@nx/workspace/testing';
+export declare function getFileContent(tree: UnitTestTree, filePath: string): string;
 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,8 +1,10 @@
 "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("@nx/workspace/testing");
-Object.defineProperty(exports, "getFileContent", { enumerable: true, get: function () { return testing_1.getFileContent; } });
+function getFileContent(tree, filePath) {
+    return tree.readContent(filePath);
+}
+exports.getFileContent = getFileContent;
 function createEmptyWorkspace(tree, framework) {
     tree.create('/.gitignore', '');
     tree.create('/angular.json', JSON.stringify({ version: 1, projects: {}, newProjectRoot: '' }));

package/src/utils/versions.d.ts

@@ -1,2 +1,2 @@
 export declare const xplatVersion = "*";
-export declare const nxVersion = "^16.0.0";
+export declare const nxVersion = "^17.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 = '16.8.0';
-exports.nxVersion = '^16.0.0';
+exports.xplatVersion = '17.0.0-alpha.1';
+exports.nxVersion = '^17.0.0';

package/src/utils/xplat.js

@@ -4,12 +4,14 @@ exports.XplatFeatureHelpers = exports.XplatComponentHelpers = exports.XplatHelpe
 const schematics_1 = require("@angular-devkit/schematics");
 const typescript_1 = require("typescript");
 const general_1 = require("./general");
+const js_1 = require("@nx/js");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const ast_1 = require("./ast");
 const errors_1 = require("./errors");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const versions_1 = require("./versions");
 const output_1 = require("./output");
+const devkit_1 = require("@nx/devkit");
 exports.packageInnerDependencies = {
     '@nstudio/angular': ['@nx/angular'],
     '@nstudio/electron-angular': [
@@ -452,7 +454,7 @@ var XplatHelpers;
                 directory = `${directory}-${framework}`;
             }
             if (tree.exists(`libs/${directory ? directory + '/' : ''}${libName}/tsconfig.json`)) {
-                // console.log(`externalSchematic('@nx/workspace', 'lib') ALREADY EXISTS for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
+                // console.log(`convertNxGenerator(libraryGenerator)(libOptions) ALREADY EXISTS for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
                 return (0, schematics_1.noop)()(tree, context);
             }
             const libOptions = {
@@ -468,7 +470,7 @@ var XplatHelpers;
                 libOptions.skipTsConfig = true;
             }
             // 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)]);
+            return (0, devkit_1.convertNxGenerator)(js_1.libraryGenerator)(libOptions);
         };
     }
     XplatHelpers.generateLib = generateLib;