@nstudio/angular 15.0.4-rc.0 → 15.0.4-rc.1

package/README.md

@@ -42,10 +42,12 @@ You are now ready to create apps:
 nx g app
 ```
 
-**NOTE:** If you encounter any issue, you can try creating an Nx workspace with version specified, for example:
+**NOTE:** If you encounter any issue, you can try creating an Nx workspace with a version specified.
+
+We have tested with the following, for example:
 
 ```
-npx create-nx-workspace@14.1.7
+npx create-nx-workspace@15.9.2
 ```
 
 ## App generation examples

package/collection.json

@@ -54,11 +54,6 @@
       "schema": "./src/schematics/elements/schema.json",
       "description": "Create custom elements for the web with Angular."
     },
-    "helpers": {
-      "factory": "./src/schematics/helpers",
-      "schema": "./src/schematics/helpers/schema.json",
-      "description": "Helpers for Angular."
-    },
     "xplat": {
       "factory": "./src/schematics/xplat",
       "schema": "./src/schematics/xplat/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/angular",
-  "version": "15.0.4-rc.0",
+  "version": "15.0.4-rc.1",
   "description": "Angular Plugin for xplat",
   "homepage": "https://nstudio.io/xplat",
   "repository": {
@@ -32,6 +32,6 @@
     "@nrwl/angular": "^15.0.0"
   },
   "peerDependencies": {
-    "@nstudio/xplat": "15.0.4-rc.0"
+    "@nstudio/xplat": "15.0.4-rc.1"
   }
 }

package/src/schematics/elements/index.js

@@ -4,6 +4,7 @@ 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 devkit_1 = require("@nrwl/devkit");
 let customElementList;
 let componentSymbols;
 let componentSymbolList;
@@ -170,15 +171,16 @@ function addFiles(options, extra = '') {
     ])));
 }
 function updateWorkspaceSupport(options, tree, context) {
-    const packagePath = 'package.json';
-    const json = (0, xplat_utils_1.getJsonFromFile)(tree, packagePath);
-    json.scripts = json.scripts || {};
-    json.dependencies = json.dependencies || {};
-    const angularVersion = json.dependencies['@angular/core'];
-    json.dependencies = Object.assign(Object.assign({}, json.dependencies), { '@angular/elements': angularVersion, '@webcomponents/webcomponentsjs': '^2.6.0' });
-    json.devDependencies = json.devDependencies || {};
-    json.devDependencies = Object.assign(Object.assign({}, json.devDependencies), { 'http-server': '^14.1.1', 'ngx-build-plus': '^15.0.0' });
-    return (0, xplat_utils_1.updateJsonFile)(tree, packagePath, json);
+    const nxTree = (0, xplat_1.convertNgTreeToDevKit)(tree, context);
+    (0, devkit_1.updateJson)(nxTree, 'package.json', (json) => {
+        json.scripts = json.scripts || {};
+        json.dependencies = json.dependencies || {};
+        const angularVersion = json.dependencies['@angular/core'];
+        json.dependencies = Object.assign(Object.assign({}, json.dependencies), { '@angular/elements': angularVersion, '@webcomponents/webcomponentsjs': '^2.6.0' });
+        json.devDependencies = json.devDependencies || {};
+        json.devDependencies = Object.assign(Object.assign({}, json.devDependencies), { 'http-server': '^14.1.1', 'ngx-build-plus': '^15.0.0' });
+        return json;
+    });
 }
 function createCustomElementList(componentSymbols) {
     const customElements = ['let component;'];

package/src/schematics/feature/index.js

@@ -37,7 +37,7 @@ function default_1(options) {
         // update libs index
         (tree, context) => options.onlyProject
             ? (0, schematics_1.noop)()(tree, context)
-            : xplat_1.XplatFeatureHelpers.adjustBarrelIndex(options, 'libs/xplat/features/src/lib/index.ts'),
+            : xplat_1.XplatFeatureHelpers.adjustBarrelIndex(options, 'libs/xplat/features/src/lib/index.ts')(tree, context),
         // external schematic handling
         (tree, context) => (0, schematics_1.chain)(externalChains),
         (0, workspace_1.formatFiles)({ skipFormat: options.skipFormat }),

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

@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sandboxHomeSetup = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const testing_1 = require("@nstudio/xplat/testing");
-const testing_2 = require("../../utils/testing");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
+const testing_2 = require("../../utils/testing");
 describe('feature schematic', () => {
     let appTree;
     const defaultOptions = {

package/src/utils/ast.d.ts

@@ -1,78 +1,15 @@
 import * as ts from 'typescript';
-import { Tree } from '@nrwl/devkit';
-declare type DecoratorName = 'Component' | 'Directive' | 'NgModule' | 'Pipe';
-export declare function addToCollection(tree: Tree, source: ts.SourceFile, barrelIndexPath: string, symbolName: string, insertSpaces?: string): ts.SourceFile[];
-/**
- * Check if the Component, Directive or Pipe is standalone
- * @param sourceFile TS Source File containing the token to check
- * @param decoratorName The type of decorator to check (Component, Directive, Pipe)
- */
-export declare function isStandalone(sourceFile: ts.SourceFile, decoratorName: DecoratorName): boolean;
-export declare function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[];
-export declare function _addSymbolToNgModuleMetadata(host: Tree, source: ts.SourceFile, ngModulePath: string, metadataField: string, expression: string): ts.SourceFile;
-export declare function removeFromNgModule(host: Tree, source: ts.SourceFile, modulePath: string, property: string): ts.SourceFile;
-/**
- * Add an import to a Standalone Component
- * @param host Virtual Tree
- * @param source TS Source File containing the Component
- * @param componentPath The path to the Component
- * @param symbolName The import to add to the Component
- */
-export declare function addImportToComponent(host: Tree, source: ts.SourceFile, componentPath: string, symbolName: string): ts.SourceFile;
-/**
- * Add an import to a Standalone Directive
- * @param host Virtual Tree
- * @param source TS Source File containing the Directive
- * @param directivePath The path to the Directive
- * @param symbolName The import to add to the Directive
- */
-export declare function addImportToDirective(host: Tree, source: ts.SourceFile, directivePath: string, symbolName: string): ts.SourceFile;
-/**
- * Add an import to a Standalone Pipe
- * @param host Virtual Tree
- * @param source TS Source File containing the Pipe
- * @param pipePath The path to the Pipe
- * @param symbolName The import to add to the Pipe
- */
-export declare function addImportToPipe(host: Tree, source: ts.SourceFile, pipePath: string, symbolName: string): ts.SourceFile;
-/**
- * Add an import to an NgModule
- * @param host Virtual Tree
- * @param source TS Source File containing the NgModule
- * @param modulePath The path to the NgModule
- * @param symbolName The import to add to the NgModule
- */
-export declare function addImportToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
-export declare function addImportToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string): ts.SourceFile;
-export declare function addDeclarationsToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string[]): ts.SourceFile;
-export declare function replaceIntoToTestBed(host: Tree, source: ts.SourceFile, specPath: string, newSymbol: string, previousSymbol: string): ts.SourceFile;
+import { Tree } from '@angular-devkit/schematics';
+export declare function addToCollection(source: ts.SourceFile, barrelIndexPath: string, symbolName: string, insertSpaces?: string): any[];
+export declare function addSymbolToNgModuleMetadata(source: ts.SourceFile, ngModulePath: string, metadataField: string, expression: string): any[];
+export declare function removeFromNgModule(source: ts.SourceFile, modulePath: string, property: string): any[];
+export declare function addImportToModule(source: ts.SourceFile, modulePath: string, symbolName: string): any[];
+export declare function addImportToTestBed(source: ts.SourceFile, specPath: string, symbolName: string): any[];
 export declare function getBootstrapComponent(source: ts.SourceFile, moduleClassName: string): string;
-export declare function addRouteToNgModule(host: Tree, ngModulePath: string, source: ts.SourceFile, route: string): ts.SourceFile;
-/**
- * Add a provider to bootstrapApplication call for Standalone Applications
- * @param tree Virtual Tree
- * @param filePath Path to the file containing the bootstrapApplication call
- * @param providerToAdd Provider to add
- */
-export declare function addProviderToBootstrapApplication(tree: Tree, filePath: string, providerToAdd: string): void;
-/**
- * Add a provider to an NgModule
- * @param host Virtual Tree
- * @param source TS Source File containing the NgModule
- * @param modulePath Path to the NgModule
- * @param symbolName The provider to add
- */
-export declare function addProviderToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
-/**
- * Add a provider to a Standalone Component
- * @param host Virtual Tree
- * @param source TS Source File containing the Component
- * @param componentPath Path to the Component
- * @param symbolName The provider to add
- */
-export declare function addProviderToComponent(host: Tree, source: ts.SourceFile, componentPath: string, symbolName: string): ts.SourceFile;
-export declare function addDeclarationToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
-export declare function addEntryComponents(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
+export declare function addRoute(ngModulePath: string, source: ts.SourceFile, route: string): any[];
+export declare function addProviderToModule(source: ts.SourceFile, modulePath: string, symbolName: string): any[];
+export declare function addDeclarationToModule(source: ts.SourceFile, modulePath: string, symbolName: string): any[];
+export declare function addEntryComponents(source: ts.SourceFile, modulePath: string, symbolName: string): any[];
 export declare function readBootstrapInfo(host: Tree, app: string): {
     moduleSpec: string;
     modulePath: string;
@@ -83,5 +20,3 @@ export declare function readBootstrapInfo(host: Tree, app: string): {
     bootstrapComponentFileName: string;
 };
 export declare function getDecoratorPropertyValueNode(host: Tree, modulePath: string, identifier: string, property: string, module: string): ts.Node;
-export declare function getTsSourceFile(host: Tree, path: string): ts.SourceFile;
-export {};