Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .vscode/cSpell.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
// cSpell Settings
{
// Version of the setting file. Always 0.1
"version": "0.1",
// language - current active spelling language
"language": "en",
// words - list of words to be always considered correct
"words": [
"igniteui",
"infragistics",
"igniteui"
"webcomponents"
],
// flagWords - list of words to be always considered incorrect
// This is useful for offensive words and common spelling errors.
Expand Down
15 changes: 0 additions & 15 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,6 @@
"console": "externalTerminal",
"preLaunchTask": "build",
"outFiles": ["${workspaceFolder}/**/*.js"],
"args": [
"new",
"reactproj",
"--framework=react"
]
},
{
"type": "node",
"request": "launch",
"name": "Launch New React TS ES6",
"cwd": "${workspaceRoot}/output",
"program": "${workspaceRoot}/packages/cli/bin/execute.js",
"console": "externalTerminal",
"preLaunchTask": "build",
"outFiles": ["${workspaceFolder}/**/*.js"],
"args": [
"new",
"reactproj",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ ig new "IG Project" --framework=angular --type=igx-ts --template=side-nav
```
#### Generate Ignite UI for React project

To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-es6` as project type:
To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-ts` as project type:
```bash
ig new "IG Project" --framework=react --type=igr-es6
ig new "IG Project" --framework=react --type=igr-ts
```
#### Generate Ignite UI for Web Components project

Expand Down
4 changes: 2 additions & 2 deletions packages/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ The `igniteui-cli` makes full use of the component definitions provided by [`ign

#### Generate Ignite UI for React project

To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-es6` as project type:
To create a new project with Ignite UI for React use [ig new](https://github.com/IgniteUI/igniteui-cli/wiki/New#creating-ignite-ui-for-react-applications-v400) by specifying `react` as framework and `igr-ts` as project type:
```bash
ig new "IG Project" --framework=react --type=igr-es6
ig new "IG Project" --framework=react --type=igr-ts
```

#### Adding components
Expand Down
18 changes: 3 additions & 15 deletions packages/cli/lib/commands/start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const command: StartCommandType = {
cd14: config.project.theme
});

let port = Number(argv.port) || defaultPort;
const port = Number(argv.port) || defaultPort;
// TODO: consider piping the stdin so that we handle the cp's termination
// this may require additional logic to be implemented if the cp asks for input
const options: ExecSyncOptions = { stdio: "inherit", killSignal: "SIGINT" };
Expand All @@ -82,23 +82,11 @@ const command: StartCommandType = {

browserSync.init(bsConfig);
break;
case "react":
if (port) {
if (projectType === "igr-ts") {
execSyncNpmStart(port, options);
} else {
// https://facebook.github.io/create-react-app/docs/advanced-configuration
// react-scripts start "--port=dafaultPort" is not a valid command for all environments.
// .env file is included and used by both igr-es6 and es6 now,
// to specify the port for all environments (Windows, Mac, etc)
process.env.PORT = `${port}`;
port = null;
}
}
/* falls through */
case "angular":
case "react":
case "webcomponents":
execSyncNpmStart(port, options);
break;
default:
break;
}
Expand Down
28 changes: 0 additions & 28 deletions packages/cli/lib/templates/IgniteUIForReactTemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ export class IgniteUIForReactTemplate implements Template {
options.parentRoutingModulePath = "src/app/app-routes.tsx";
}

if (this.projectType === "igr-es6") {
this.registerJSONRoute(projectPath, name, options.parentRoutingModulePath);
return;
}

const routeModulePath: string = options.parentRoutingModulePath;

if (!(options && options.skipRoute)
Expand Down Expand Up @@ -148,27 +143,4 @@ export class IgniteUIForReactTemplate implements Template {
const name = Util.nameFromPath(pathName);
return Util.lowerDashed(name);
}

protected registerJSONRoute(projectPath: string, name: string, routingModulePath: string) {
const configFile = fs.readFileSync(path.join(projectPath, routingModulePath), "utf8");
const viewsArr = JSON.parse(configFile);
viewsArr.push({
componentPath: this.getViewLink(name),
path: "/" + this.folderName(Util.nameFromPath(name)),
text: this.getToolbarLink(name)
});

fs.writeFileSync(path.join(projectPath, routingModulePath), JSON.stringify(viewsArr, null, 4));
}

protected getViewLink(name: string): string {
const filePath = "./views/" + this.folderName(name);
return filePath;
}

protected getToolbarLink(name: string): string {
name = Util.nameFromPath(name);
const toolbarLink = name.replace(/\w\S*/g, txt => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase());
return toolbarLink;
}
}

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions packages/cli/templates/react/igr-es6/bullet-graph/default/index.ts

This file was deleted.

15 changes: 0 additions & 15 deletions packages/cli/templates/react/igr-es6/bullet-graph/index.ts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions packages/cli/templates/react/igr-es6/category-chart/index.ts

This file was deleted.

Loading
Loading