igniteui-cli 13.1.12-beta.1 → 13.1.12-beta.2

package/lib/commands/upgrade.js

@@ -42,11 +42,10 @@ command = {
                 case "jquery":
                     cli_core_1.Util.log("Upgrading packages for jQuery projects is currently not supported!");
                     return;
-                case "react":
-                    cli_core_1.Util.log("Upgrading packages for React projects is currently not supported!");
-                    return;
                 case "angular":
-                    if (projectType === "igx-ts") {
+                case "react":
+                case "webcomponents":
+                    if (projectType === "igx-ts" || projectType === "igr-ts" || projectType === "igc-ts") {
                         const projectLibrary = command.templateManager.getProjectLibrary(framework, projectType);
                         let project;
                         if (!config.project.projectTemplate || !projectLibrary.hasProject(config.project.projectTemplate)) {
@@ -69,7 +68,7 @@ command = {
                             }
                         }
                     }
-                    else {
+                    else if (framework.toLowerCase() === "angular") {
                         cli_core_1.Util.log("Upgrading packages for Angular Wrappers projects is currently not supported!");
                         return;
                     }

package/lib/templates/IgniteUIForReactTemplate.js

@@ -58,7 +58,7 @@ class IgniteUIForReactTemplate {
             let filePath = path.posix.join(projectPath, options.modulePath, `${lowerDashed}.tsx`);
             const routingModule = new ReactTypeScriptFileUpdate_1.ReactTypeScriptFileUpdate(path.join(projectPath, routeModulePath));
             if (defaultPath) {
-                routingModule.addRoute("", options.className, nameFromPath, filePath, options.routerChildren, undefined);
+                routingModule.addRoute(lowerDashed, options.className, nameFromPath, filePath, options.routerChildren, undefined, defaultPath);
             }
             routingModule.addRoute(lowerDashed, options.className, nameFromPath, filePath, options.routerChildren, undefined);
             if (options.hasChildren) {

package/lib/templates/IgniteUIForWebComponentsTemplate.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IgniteUIForWebComponentsTemplate = void 0;
 const cli_core_1 = require("@igniteui/cli-core");
 const path = require("path");
-const package_resolve_1 = require("../../templates/webcomponents/package-resolve");
 const TypeScriptFileUpdate_1 = require("../../templates/webcomponents/TypeScriptFileUpdate");
 class IgniteUIForWebComponentsTemplate {
     constructor(rootPath) {
@@ -59,7 +58,7 @@ class IgniteUIForWebComponentsTemplate {
         config["description"] = this.description;
         config["cliVersion"] = cli_core_1.Util.version();
         config["camelCaseName"] = cli_core_1.Util.camelCase(name);
-        config["dockManagerPackage"] = (0, package_resolve_1.resolveIgcPackage)(package_resolve_1.NPM_DOCK_MANAGER);
+        config["dockManagerPackage"] = (0, cli_core_1.resolvePackage)(cli_core_1.NPM_DOCK_MANAGER);
         return config;
     }
     folderName(pathName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "igniteui-cli",
-  "version": "13.1.12-beta.1",
+  "version": "13.1.12-beta.2",
   "description": "CLI tool for creating Ignite UI projects",
   "keywords": [
     "CLI",
@@ -72,8 +72,8 @@
     "all": true
   },
   "dependencies": {
-    "@igniteui/angular-templates": "~17.1.13112-beta.1",
-    "@igniteui/cli-core": "~13.1.12-beta.1",
+    "@igniteui/angular-templates": "^17.1.13112-beta.2",
+    "@igniteui/cli-core": "^13.1.12-beta.2",
     "chalk": "^2.3.2",
     "fs-extra": "^3.0.1",
     "glob": "^7.1.2",

package/templates/react/ReactTypeScriptFileUpdate.d.ts

@@ -18,18 +18,18 @@ export declare class ReactTypeScriptFileUpdate {
     constructor(targetPath: string);
     /** Applies accumulated transforms, saves and formats the file */
     finalize(): void;
-    addRoute(path: string, component: string, name: string, filePath: string, routerChildren: string, importAlias: string, routesVariable?: string): void;
+    addRoute(path: string, component: string, name: string, filePath: string, routerChildren: string, importAlias: string, defaultRoute?: boolean): void;
     /** Initializes existing imports info, [re]sets import and `NgModule` edits */
     protected initState(): void;
     protected loadImportsMeta(): {
         lastIndex: number;
         modulePaths: any[];
     };
-    protected addRouteModuleEntry(path: string, component: string, name: string, filePath: string, routerChildren: string, importAlias: string, routesVariable?: string): void;
-    protected requestImport(modulePath: string, routerAlias: string, componentName: string): void;
+    protected addRouteModuleEntry(path: string, component: string, name: string, filePath: string, routerChildren: string, importAlias: string, defaultRoute?: boolean): void;
+    protected requestImport(modulePath: string, routerAlias: string, componentName: string, namedImport?: boolean): void;
     /** Add `import` statements not previously found in the file  */
     protected addNewFileImports(): void;
-    protected createIdentifierImport(importPath: string, as: string, component: string): ts.ImportDeclaration;
+    protected createIdentifierImport(importPath: string, as: string, component: string, namedImport: boolean): ts.ImportDeclaration;
     /** Transformation to apply edits to existing named import declarations */
     protected importsTransformer: ts.TransformerFactory<ts.Node>;
     /** Format a TS source file, very TBD */

package/templates/react/ReactTypeScriptFileUpdate.js

@@ -46,8 +46,8 @@ class ReactTypeScriptFileUpdate {
         // reset state in case of further updates
         this.initState();
     }
-    addRoute(path, component, name, filePath, routerChildren, importAlias, routesVariable = DEFAULT_ROUTES_VARIABLE) {
-        this.addRouteModuleEntry(path, component, name, filePath, routerChildren, importAlias, routesVariable);
+    addRoute(path, component, name, filePath, routerChildren, importAlias, defaultRoute = false) {
+        this.addRouteModuleEntry(path, component, name, filePath, routerChildren, importAlias, defaultRoute);
     }
     //#region File state
     /** Initializes existing imports info, [re]sets import and `NgModule` edits */
@@ -82,12 +82,15 @@ class ReactTypeScriptFileUpdate {
         return meta;
     }
     //#endregion File state
-    addRouteModuleEntry(path, component, name, filePath, routerChildren, importAlias, routesVariable = DEFAULT_ROUTES_VARIABLE) {
-        const isRouting = path.indexOf("routes") >= 0;
+    addRouteModuleEntry(path, component, name, filePath, routerChildren, importAlias, defaultRoute = false) {
+        const isRouting = path.indexOf(DEFAULT_ROUTES_VARIABLE) >= 0;
         if (isRouting && this.targetSource.text.indexOf(path.slice(0, -4)) > 0) {
             return;
         }
-        if (path) {
+        if (defaultRoute) {
+            this.requestImport("react-router-dom", undefined, "redirect", true);
+        }
+        else {
             const relativePath = cli_core_1.Util.relativePath(this.targetPath, filePath, true, true);
             this.requestImport(relativePath, importAlias, component);
         }
@@ -96,7 +99,7 @@ class ReactTypeScriptFileUpdate {
             // the visitor that should be used when adding routes to the main route array
             const conditionalVisitor = (node) => {
                 if (node.kind === ts.SyntaxKind.ArrayLiteralExpression) {
-                    const newObject = this.createRouteEntry(path, component, name, routerChildren);
+                    const newObject = this.createRouteEntry(path, component, name, routerChildren, defaultRoute);
                     const array = node;
                     this.createdStringLiterals.push(path, name);
                     const notFoundWildCard = ".*";
@@ -126,7 +129,7 @@ class ReactTypeScriptFileUpdate {
             if (!isRouting) {
                 visitCondition = (node) => {
                     return node.kind === ts.SyntaxKind.VariableDeclaration &&
-                        node.name.getText() === routesVariable;
+                        node.name.getText() === DEFAULT_ROUTES_VARIABLE;
                     // no type currently
                     //(node as ts.VariableDeclaration).type.getText() === "Route[]";
                 };
@@ -145,20 +148,19 @@ class ReactTypeScriptFileUpdate {
         }).transformed[0];
         this.finalize();
     }
-    requestImport(modulePath, routerAlias, componentName) {
+    requestImport(modulePath, routerAlias, componentName, namedImport = false) {
         const existing = this.requestedImports.find(x => x.from === modulePath);
+        // TODO: better check for named imports. There could be several named imports from same modulePath
         if (!existing) {
             // new imports, check if already exists in file
             this.requestedImports.push({
                 as: routerAlias,
                 from: modulePath,
                 component: componentName,
-                edit: this.importsMeta.modulePaths.indexOf(modulePath) !== -1
+                edit: this.importsMeta.modulePaths.indexOf(modulePath) !== -1,
+                namedImport
             });
         }
-        else {
-            return;
-        }
     }
     /** Add `import` statements not previously found in the file  */
     addNewFileImports() {
@@ -168,13 +170,13 @@ class ReactTypeScriptFileUpdate {
         }
         const newStatements = ts.factory.createNodeArray([
             ...this.targetSource.statements.slice(0, this.importsMeta.lastIndex),
-            ...newImports.map(x => this.createIdentifierImport(x.from, x.as, x.component)),
+            ...newImports.map(x => this.createIdentifierImport(x.from, x.as, x.component, x.namedImport)),
             ...this.targetSource.statements.slice(this.importsMeta.lastIndex)
         ]);
         newImports.forEach(x => this.createdStringLiterals.push(x.from));
         this.targetSource = ts.factory.updateSourceFile(this.targetSource, newStatements);
     }
-    createIdentifierImport(importPath, as, component) {
+    createIdentifierImport(importPath, as, component, namedImport) {
         let exportedObject;
         let exportedObjectName;
         let importClause;
@@ -186,7 +188,14 @@ class ReactTypeScriptFileUpdate {
             ]));
         }
         else {
-            importClause = ts.factory.createImportClause(false, ts.factory.createIdentifier(component), undefined);
+            if (namedImport) {
+                const importSpecifier = ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(component));
+                const imports = ts.factory.createNamedImports([importSpecifier]);
+                importClause = ts.factory.createImportClause(false, undefined, imports);
+            }
+            else {
+                importClause = ts.factory.createImportClause(false, ts.factory.createIdentifier(component), undefined);
+            }
         }
         const importDeclaration = ts.factory.createImportDeclaration(undefined, undefined, importClause, ts.factory.createStringLiteral(importPath, true));
         return importDeclaration;
@@ -316,7 +325,14 @@ class ReactTypeScriptFileUpdate {
             return node;
         };
     }
-    createRouteEntry(path, component, name, routerAlias) {
+    createRouteEntry(path, component, name, routerAlias, defaultRoute = false) {
+        if (defaultRoute) {
+            // for default route in React we should generate index: true, loader: () => redirect(path)
+            const index = ts.factory.createPropertyAssignment("index", ts.factory.createTrue());
+            const loader = ts.factory.createArrowFunction(undefined, undefined, [], undefined, undefined, ts.factory.createCallExpression(ts.factory.createIdentifier("redirect"), [], [ts.factory.createStringLiteral(path, true)]));
+            const redirect = ts.factory.createPropertyAssignment("loader", loader);
+            return ts.factory.createObjectLiteralExpression([index, redirect]);
+        }
         const routePath = ts.factory.createPropertyAssignment("path", ts.factory.createStringLiteral(path, true));
         const jsxElement = ts.factory.createJsxSelfClosingElement(ts.factory.createIdentifier(component), [], undefined);
         const routeComponent = ts.factory.createPropertyAssignment("element", jsxElement);
@@ -325,9 +341,7 @@ class ReactTypeScriptFileUpdate {
             const childrenData = ts.factory.createPropertyAssignment("children", ts.factory.createIdentifier(routerAlias));
             return ts.factory.createObjectLiteralExpression([routePath, routeComponent, routeData, childrenData]);
         }
-        else {
-            return ts.factory.createObjectLiteralExpression([routePath, routeComponent, routeData]);
-        }
+        return ts.factory.createObjectLiteralExpression([routePath, routeComponent, routeData]);
     }
 }
 exports.ReactTypeScriptFileUpdate = ReactTypeScriptFileUpdate;

package/templates/react/igr-ts/projects/_base/index.js

@@ -33,7 +33,7 @@ class BaseIgrTsProject {
     }
     upgradeIgniteUIPackages(projectPath, packagePath) {
         return __awaiter(this, void 0, void 0, function* () {
-            throw new Error("Method not implemented.");
+            return (0, cli_core_1.updateWorkspace)(projectPath);
         });
     }
     getExtraConfiguration() {

package/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/node.js.yml

@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ <%=yaml-default-branch%> ]
+    branches: [ $(yamlDefaultBranch) ]
   pull_request:
-    branches: [ <%=yaml-default-branch%> ]
+    branches: [ $(yamlDefaultBranch) ]
 
 jobs:
   build:

package/templates/webcomponents/igc-ts/projects/_base/index.js

@@ -31,7 +31,7 @@ class BaseIgcProject {
     }
     upgradeIgniteUIPackages(projectPath, packagePath) {
         return __awaiter(this, void 0, void 0, function* () {
-            throw new Error("Method not implemented.");
+            return (0, cli_core_1.updateWorkspace)(projectPath);
         });
     }
     getExtraConfiguration() {
@@ -48,7 +48,8 @@ class BaseIgcProject {
             DefaultTheme: "",
             dot: ".",
             path: name,
-            projectTemplate: this.id
+            projectTemplate: this.id,
+            yamlDefaultBranch: this.id === "base" ? "<%=yaml-default-branch%>" : "main"
         };
         return config;
     }

package/templates/webcomponents/package-resolve.d.ts

@@ -1,12 +0,0 @@
-export declare const NPM_DOCK_MANAGER = "igniteui-dockmanager";
-export declare const FEED_DOCK_MANAGER = "@infragistics/igniteui-dockmanager";
-export interface PackageDefinition {
-    trial: string;
-    licensed: string;
-}
-/** packages map of `trial: licensed` names */
-export declare const UPGRADEABLE_PACKAGES: {
-    "igniteui-dockmanager": string;
-};
-export declare function resolveIgcPackage(packageName: keyof typeof UPGRADEABLE_PACKAGES): string;
-export declare function getUpgradeablePackages(): PackageDefinition[];

package/templates/webcomponents/package-resolve.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpgradeablePackages = exports.resolveIgcPackage = exports.UPGRADEABLE_PACKAGES = exports.FEED_DOCK_MANAGER = exports.NPM_DOCK_MANAGER = void 0;
-const cli_core_1 = require("@igniteui/cli-core");
-exports.NPM_DOCK_MANAGER = "igniteui-dockmanager";
-exports.FEED_DOCK_MANAGER = "@infragistics/igniteui-dockmanager";
-/** packages map of `trial: licensed` names */
-exports.UPGRADEABLE_PACKAGES = {
-    [exports.NPM_DOCK_MANAGER]: exports.FEED_DOCK_MANAGER
-};
-function resolveIgcPackage(packageName) {
-    const fs = cli_core_1.App.container.get(cli_core_1.FS_TOKEN);
-    // read project package JSON
-    if (fs.fileExists("./package.json")) {
-        const packageJson = JSON.parse(fs.readFile("./package.json"));
-        const dependencies = packageJson["dependencies"];
-        const licensed = exports.UPGRADEABLE_PACKAGES[packageName];
-        if (dependencies[licensed]) {
-            return licensed;
-        }
-    }
-    return packageName;
-}
-exports.resolveIgcPackage = resolveIgcPackage;
-function getUpgradeablePackages() {
-    const fs = cli_core_1.App.container.get(cli_core_1.FS_TOKEN);
-    const upgradeable = [];
-    if (fs.fileExists("./package.json")) {
-        const packageJson = JSON.parse(fs.readFile("./package.json"));
-        const dependencies = packageJson["dependencies"];
-        for (const packageEntry in exports.UPGRADEABLE_PACKAGES) {
-            if (dependencies[packageEntry]) {
-                upgradeable.push({
-                    trial: packageEntry,
-                    licensed: exports.UPGRADEABLE_PACKAGES[packageEntry]
-                });
-            }
-        }
-    }
-    return upgradeable;
-}
-exports.getUpgradeablePackages = getUpgradeablePackages;