@nstudio/xplat 12.7.0 → 13.4.1

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

@@ -15,7 +15,7 @@ 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");
-xplat_utils_1.setTest();
+(0, xplat_utils_1.setTest)();
 describe('xplat init', () => {
     let appTree;
     const defaultOptions = {
@@ -24,16 +24,16 @@ describe('xplat init', () => {
         isTesting: true,
     };
     beforeEach(() => {
-        appTree = testing_1.createEmptyWorkspace(schematics_1.Tree.empty());
+        appTree = (0, testing_1.createEmptyWorkspace)(schematics_1.Tree.empty());
     });
     it('should init default xplat deps', () => __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('init', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('init', options, appTree);
         const files = tree.files;
         // console.log('files:', files);
-        let packageJson = JSON.parse(testing_3.getFileContent(tree, 'package.json'));
+        let packageJson = JSON.parse((0, testing_3.getFileContent)(tree, 'package.json'));
         // console.log(packageJson);
         const devDeps = [
             '@nrwl/angular',
@@ -44,7 +44,6 @@ describe('xplat init', () => {
             '@angular/compiler-cli',
             '@angular/language-service',
             '@angular-devkit/build-angular',
-            'codelyzer',
         ];
         for (const dep of devDeps) {
             expect(packageJson.devDependencies[dep]).toBeDefined();
@@ -54,28 +53,28 @@ describe('xplat init', () => {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'web,nativescript';
         options.framework = 'angular';
-        const tree = yield testing_2.runSchematic('init', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('init', options, appTree);
         // const files = tree.files;
         // console.log('files:', files);
         expect(tree.exists('/libs/xplat/web/core/src/lib/index.ts')).toBeTruthy();
         expect(tree.exists('/libs/xplat/nativescript/core/src/lib/index.ts')).toBeTruthy();
         expect(tree.exists('/libs/xplat/web-angular/core/src/lib/index.ts')).toBeFalsy();
         expect(tree.exists('/libs/xplat/nativescript-angular/core/src/lib/index.ts')).toBeFalsy();
-        let packageJson = JSON.parse(testing_3.getFileContent(tree, 'package.json'));
+        let packageJson = JSON.parse((0, testing_3.getFileContent)(tree, 'package.json'));
         // console.log(packageJson);
         expect(packageJson.xplat.framework).toBe('angular');
     }));
     it('should NOT create unsupported platform xplat option and throw', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'desktop';
-        yield expect(testing_2.runSchematic('init', options, appTree)).rejects.toThrow(`desktop is currently not a supported platform. Supported at the moment: ${xplat_utils_1.supportedPlatforms}. Please request support for this platform if you'd like and/or submit a PR which we would greatly appreciate.`);
+        yield expect((0, testing_2.runSchematic)('init', options, appTree)).rejects.toThrow(`desktop is currently not a supported platform. Supported at the moment: ${xplat_utils_1.supportedPlatforms}. Please request support for this platform if you'd like and/or submit a PR which we would greatly appreciate.`);
     }));
     it('should NOT create unsupported framework xplat option and throw', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'web';
         options.framework = 'blah';
         let tree;
-        yield expect(testing_2.runSchematic('init', options, appTree)).rejects.toThrow(`blah is currently not a supported framework. Supported at the moment: ${xplat_utils_1.supportedFrameworks.map((f) => utils_1.stringUtils.capitalize(f))}. Please request support for this framework if you'd like and/or submit a PR which we would greatly appreciate.`);
+        yield expect((0, testing_2.runSchematic)('init', options, appTree)).rejects.toThrow(`blah is currently not a supported framework. Supported at the moment: ${xplat_utils_1.supportedFrameworks.map((f) => utils_1.stringUtils.capitalize(f))}. Please request support for this framework if you'd like and/or submit a PR which we would greatly appreciate.`);
     }));
     /**
      * TODO: This passes when run with "fdescribe" only

package/src/schematics/mode/index.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 function default_1(options) {
-    return schematics_1.chain([
-        xplat_utils_1.prerun(options, true),
-        (tree, context) => schematics_1.externalSchematic('@nstudio/focus', 'mode', options),
+    return (0, schematics_1.chain)([
+        (0, xplat_utils_1.prerun)(options, true),
+        (tree, context) => (0, schematics_1.externalSchematic)('@nstudio/focus', 'mode', options),
     ]);
 }
 exports.default = default_1;

package/src/schematics/ng-add/index.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 function default_1(options) {
-    return schematics_1.chain([
-        xplat_utils_1.prerun(options, true),
-        (tree, context) => schematics_1.externalSchematic('@nstudio/xplat', 'init', options),
+    return (0, schematics_1.chain)([
+        (0, xplat_utils_1.prerun)(options, true),
+        (tree, context) => (0, schematics_1.externalSchematic)('@nstudio/xplat', 'init', options),
     ]);
 }
 exports.default = default_1;

package/src/utils/ast.js

@@ -283,7 +283,7 @@ function insert(host, modulePath, changes) {
 }
 exports.insert = insert;
 function getProjectConfig(tree, name) {
-    const workspaceJson = general_1.readWorkspaceJson(tree);
+    const workspaceJson = (0, general_1.readWorkspaceJson)(tree);
     const projectConfig = workspaceJson.projects[name];
     if (!projectConfig) {
         throw new Error(`Cannot find project '${name}'`);

package/src/utils/general.d.ts

@@ -34,7 +34,6 @@ export declare function updateTsConfig(tree: Tree, callback: (data: any) => void
 export declare function updatePackageScripts(tree: Tree, scripts: any): import("@angular-devkit/schematics/src/tree/interface").Tree;
 export declare function readWorkspaceJson(tree: Tree): any;
 export declare function updateWorkspace(updates: any): any;
-export declare function updateNxProjects(tree: Tree, projects: any): import("@angular-devkit/schematics/src/tree/interface").Tree;
 export declare function getPrefixWarning(prefix: string): string;
 export declare function getDefaultTemplateOptions(): {
     tmpl: string;

package/src/utils/general.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toNgModuleClassName = exports.toComponentClassName = exports.stringUtils = exports.sanitize = exports.getDefaultTemplateOptions = exports.getPrefixWarning = exports.updateNxProjects = exports.updateWorkspace = exports.readWorkspaceJson = exports.updatePackageScripts = exports.updateTsConfig = exports.updatePackageForNgrx = exports.hasWebPlatform = exports.hasFrontendPlatform = exports.supportedSandboxPlatforms = exports.supportedHelpers = void 0;
+exports.toNgModuleClassName = exports.toComponentClassName = exports.stringUtils = exports.sanitize = exports.getDefaultTemplateOptions = exports.getPrefixWarning = exports.updateWorkspace = 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 xplat_utils_1 = require("@nstudio/xplat-utils");
 // list of all supported helpers
@@ -35,7 +35,7 @@ function hasWebPlatform(targetPlatforms) {
 exports.hasWebPlatform = hasWebPlatform;
 function updatePackageForNgrx(tree, packagePath = 'package.json') {
     if (tree.exists(packagePath)) {
-        const packageJson = xplat_utils_1.getJsonFromFile(tree, packagePath);
+        const packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, packagePath);
         if (packageJson) {
             // sync version with what user has store set at
             let rootNgrxVersion = packageJson.dependencies
@@ -47,7 +47,7 @@ function updatePackageForNgrx(tree, packagePath = 'package.json') {
             };
             packageJson.dependencies = Object.assign(Object.assign({}, (packageJson.dependencies || {})), dependencies);
             packageJson.devDependencies = Object.assign(Object.assign({}, (packageJson.devDependencies || {})), devDependencies);
-            return xplat_utils_1.updateJsonFile(tree, packagePath, packageJson);
+            return (0, xplat_utils_1.updateJsonFile)(tree, packagePath, packageJson);
         }
     }
     return tree;
@@ -69,25 +69,25 @@ function updateTsConfig(tree, callback, targetSuffix = '', prefixPath = '') {
         }
     }
     // console.log('tsConfigPath:', tsConfigPath)
-    const tsConfig = xplat_utils_1.getJsonFromFile(tree, tsConfigPath);
+    const tsConfig = (0, xplat_utils_1.getJsonFromFile)(tree, tsConfigPath);
     callback(tsConfig);
-    return xplat_utils_1.updateJsonFile(tree, tsConfigPath, tsConfig);
+    return (0, xplat_utils_1.updateJsonFile)(tree, tsConfigPath, tsConfig);
 }
 exports.updateTsConfig = updateTsConfig;
 function updatePackageScripts(tree, scripts) {
     const path = 'package.json';
-    const packageJson = xplat_utils_1.getJsonFromFile(tree, path);
+    const packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, path);
     const scriptsMap = Object.assign({}, packageJson.scripts);
     packageJson.scripts = Object.assign(scriptsMap, scripts);
-    return xplat_utils_1.updateJsonFile(tree, path, packageJson);
+    return (0, xplat_utils_1.updateJsonFile)(tree, path, packageJson);
 }
 exports.updatePackageScripts = updatePackageScripts;
 function readWorkspaceJson(tree) {
-    return workspace_1.readJsonInTree(tree, workspace_1.getWorkspacePath(tree));
+    return (0, workspace_1.readJsonInTree)(tree, (0, workspace_1.getWorkspacePath)(tree));
 }
 exports.readWorkspaceJson = readWorkspaceJson;
 function updateWorkspace(updates) {
-    return workspace_1.updateWorkspaceInTree((json) => {
+    return (0, workspace_1.updateWorkspaceInTree)((json) => {
         for (const key in updates) {
             json[key] = Object.assign(Object.assign({}, (json[key] || {})), updates[key]);
         }
@@ -95,14 +95,6 @@ function updateWorkspace(updates) {
     });
 }
 exports.updateWorkspace = updateWorkspace;
-function updateNxProjects(tree, projects) {
-    const path = 'nx.json';
-    const nxJson = xplat_utils_1.getJsonFromFile(tree, path);
-    const projectsMap = Object.assign({}, nxJson.projects);
-    nxJson.projects = Object.assign(projectsMap, projects);
-    return xplat_utils_1.updateJsonFile(tree, path, nxJson);
-}
-exports.updateNxProjects = updateNxProjects;
 // export function persistPrefix(prefix: string) {
 //   return (tree: Tree) => {
 //     const nxConfig = getNxWorkspaceConfig(tree);
@@ -119,8 +111,8 @@ function getDefaultTemplateOptions() {
     return {
         tmpl: '',
         utils: exports.stringUtils,
-        npmScope: xplat_utils_1.getNpmScope(),
-        prefix: xplat_utils_1.getPrefix(),
+        npmScope: (0, xplat_utils_1.getNpmScope)(),
+        prefix: (0, xplat_utils_1.getPrefix)(),
         dot: '.',
     };
 }

package/src/utils/helpers.js

@@ -6,7 +6,7 @@ const errors_1 = require("./errors");
 function buildHelperChain(helper, options, config, helperChain) {
     // throw if target required and it's missing
     if (config.requiresTarget && !options.target) {
-        throw new schematics_1.SchematicsException(errors_1.helperTargetError(helper));
+        throw new schematics_1.SchematicsException((0, errors_1.helperTargetError)(helper));
     }
     if (config.addHelperFiles) {
         // add files for the helper

package/src/utils/postinstall.js

@@ -13,9 +13,9 @@ exports.updateConfig = void 0;
 const fs = require("fs");
 const path = require("path");
 const util_1 = require("util");
-const fsExists = util_1.promisify(fs.exists);
-const fsWriteFile = util_1.promisify(fs.writeFile);
-const fsReadFile = util_1.promisify(fs.readFile);
+const fsExists = (0, util_1.promisify)(fs.exists);
+const fsWriteFile = (0, util_1.promisify)(fs.writeFile);
+const fsReadFile = (0, util_1.promisify)(fs.readFile);
 function updateConfig() {
     return __awaiter(this, void 0, void 0, function* () {
         const cwd = process.cwd();
@@ -26,16 +26,16 @@ function updateConfig() {
             return;
         }
         // console.log(process.cwd());
-        let configFilename = 'workspace.json';
-        let workspaceConfigPath = path.join(process.cwd(), '/../../..', configFilename);
-        if (!fs.existsSync(workspaceConfigPath)) {
+        let configFilename = 'nx.json';
+        let nxConfigPath = path.join(process.cwd(), '/../../..', configFilename);
+        if (!fs.existsSync(nxConfigPath)) {
             configFilename = 'angular.json';
-            workspaceConfigPath = path.join(process.cwd(), '/../../..', configFilename);
+            nxConfigPath = path.join(process.cwd(), '/../../..', configFilename);
         }
         // console.log(workspaceConfigPath);
         try {
             let ngCli;
-            let config = fs.readFileSync(workspaceConfigPath, { encoding: 'utf-8' });
+            let config = fs.readFileSync(nxConfigPath, { encoding: 'utf-8' });
             if (config) {
                 ngCli = JSON.parse(config);
                 // update default
@@ -52,7 +52,7 @@ function updateConfig() {
                     },
                 };
             }
-            fs.writeFileSync(workspaceConfigPath, JSON.stringify(ngCli, null, 2));
+            fs.writeFileSync(nxConfigPath, JSON.stringify(ngCli, null, 2));
         }
         catch (err) {
             console.warn(`An issue was detected during installation: ${configFilename} does not exist.`);

package/src/utils/testing-utils.js

@@ -353,9 +353,9 @@ function createNativeScriptAngularApp(tree, withRouting) {
     }
 }
 exports.createNativeScriptAngularApp = createNativeScriptAngularApp;
-const isInModuleMetadata = (moduleName, property, value, inArray) => exports.isInDecoratorMetadata(moduleName, property, value, 'NgModule', inArray);
+const isInModuleMetadata = (moduleName, property, value, inArray) => (0, exports.isInDecoratorMetadata)(moduleName, property, value, 'NgModule', inArray);
 exports.isInModuleMetadata = isInModuleMetadata;
-const isInComponentMetadata = (componentName, property, value, inArray) => exports.isInDecoratorMetadata(componentName, property, value, 'Component', inArray);
+const isInComponentMetadata = (componentName, property, value, inArray) => (0, exports.isInDecoratorMetadata)(componentName, property, value, 'Component', inArray);
 exports.isInComponentMetadata = isInComponentMetadata;
 const isInDecoratorMetadata = (moduleName, property, value, decoratorName, inArray) => new RegExp(`@${decoratorName}\\(\\{([^}]*)` +
     objectContaining(property, value, inArray) +

package/src/utils/testing.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runMigration = exports.callRule = exports.runSchematic = void 0;
 const path_1 = require("path");
 const testing_1 = require("@angular-devkit/schematics/testing");
-const testRunner = new testing_1.SchematicTestRunner('@nstudio/xplat', path_1.join(__dirname, '../../collection.json'));
-const migrationTestRunner = new testing_1.SchematicTestRunner('@nstudio/xplat/migrations', path_1.join(__dirname, '../../migrations.json'));
+const testRunner = new testing_1.SchematicTestRunner('@nstudio/xplat', (0, path_1.join)(__dirname, '../../collection.json'));
+const migrationTestRunner = new testing_1.SchematicTestRunner('@nstudio/xplat/migrations', (0, path_1.join)(__dirname, '../../migrations.json'));
 function runSchematic(schematicName, options, tree) {
     return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
 }

package/src/utils/versions.d.ts

@@ -1,2 +1,2 @@
 export declare const xplatVersion = "*";
-export declare const nxVersion = "^12.0.0";
+export declare const nxVersion = "^13.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 = '12.7.0';
-exports.nxVersion = '^12.0.0';
+exports.xplatVersion = '13.4.1';
+exports.nxVersion = '^13.0.0';