diff --git a/readme.md b/readme.md index c5bda30e..689781e7 100755 --- a/readme.md +++ b/readme.md @@ -14,11 +14,11 @@ This [Yeoman](http://yeoman.io) generator creates a Node.js [Office Add-in](http In addition you can use it to create add-ins that use single sign-on or Excel custom functions. -Like other Yeoman generators, this generator simply creates the scaffolding of files for your Office Add-in project. You can choose to create Office Add-in projects using plain HTML, CSS & JavaScript, or using Angular or React, and can choose between JavaScript and Typescript as well. +Like other Yeoman generators, this generator simply creates the scaffolding of files for your Office Add-in project. You can choose to create Office Add-in projects using plain HTML, CSS & JavaScript, or using React, and can choose between JavaScript and Typescript as well. > **Note:** While you can also use [Visual Studio](https://visualstudio.microsoft.com/vs) to create Office Add-in projects, the Yeoman generator provides more options in terms of the types of projects you can create. For example: > -> - The Yeoman generator can create Office Add-in projects that use plain HTML, CSS & JavaScript, or React, or Angular; whereas Visual Studio can only create Office Add-in projects that use plain HTML, CSS & JavaScript. +> - The Yeoman generator can create Office Add-in projects that use plain HTML, CSS & JavaScript, or React; whereas Visual Studio can only create Office Add-in projects that use plain HTML, CSS & JavaScript. > - The Yeoman generator can create Office Add-ins projects that use either JavaScript or TypeScript; whereas Visual Studio only creates JavaScript projects which you would need to convert manually if you want to use TypeScript. > - The Yeoman generator can create add-ins for Excel, OneNote, Outlook, PowerPoint, Project, and Word; whereas Visual Studio can only create add-ins for Excel, Outlook, PowerPoint, and Word. @@ -61,7 +61,6 @@ Specifies the project type to create. Project Type | Description ----------- | ------------------------ taskpane | Task Pane add-in using HTML -angular | Task Pane add-in using the Angular framework react | Task Pane add-in using the React framework excel-functions | Task Pane add-in with Excel Custom Functions single-sign-on | Taskpane add-in supporting single-sign-on diff --git a/src/app/index.ts b/src/app/index.ts index b4ee34ce..4d0243c2 100755 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -422,7 +422,6 @@ module.exports = class extends yo { this.log(`\nYo Office ${chalk.bgGreen('Arguments')} and ${chalk.bgMagenta('Options.')}\n`); this.log(`NOTE: ${chalk.bgGreen('Arguments')} must be specified in the order below, and ${chalk.bgMagenta('Options')} must follow ${chalk.bgGreen('Arguments')}.\n`); this.log(` ${chalk.bgGreen('projectType')}:Specifies the type of project to create. Valid project types include:`); - this.log(` ${chalk.yellow('angular:')} Creates an Office add-in using Angular framework.`); this.log(` ${chalk.yellow('excel-functions-shared:')} Creates an Office add-in for Excel custom functions using a Shared Runtime.`); this.log(` ${chalk.yellow('excel-functions:')} Creates an Office add-in for Excel custom functions using a JavaScript-only Runtime.`); this.log(` ${chalk.yellow('jquery:')} Creates an Office add-in using Jquery framework.`); diff --git a/src/test/convert-to-single-host.ts b/src/test/convert-to-single-host.ts index 07834cc8..058e8c9e 100644 --- a/src/test/convert-to-single-host.ts +++ b/src/test/convert-to-single-host.ts @@ -85,67 +85,6 @@ describe('Office-Add-Taskpane-Ts projects', () => { }); }); -// Test to verify converting a project to a single host -// for Angular JavaScript project using Word host -describe('Office-Add-Taskpane-Angular-Js project', () => { - const expectedFiles = [ - packageJsonFile, - manifestFile, - 'src/taskpane/app/app.component.js', - ] - const unexpectedFiles = [ - 'src/taskpane/app/excel.app.component.js', - 'src/taskpane/app/onenote.app.component.js', - 'src/taskpane/app/outlook.app.component.js', - 'src/taskpane/app/powerpoint.app.component.js', - 'src/taskpane/app/project.app.component.js', - 'src/taskpane/app/word.app.component.js', - ] - const answers = { - projectType: "angular", - scriptType: "JavaScript", - name: "AngularProject", - host: hosts[5] - }; - - describe('Office-Add-Taskpane project', () => { - before((done) => { - helpers.run(path.join(__dirname, '../app')).withOptions({ 'test': true }).withPrompts(answers).on('end', done); - }); - - it('creates expected files', (done) => { - assert.file(expectedFiles); - assert.noFile(unexpectedFiles); - assert.noFile(unexpectedManifestFiles); - done(); - }); - }); - - describe('Package.json is updated appropriately', () => { - it('Package.json is updated properly', async () => { - const data: string = await readFileAsync(packageJsonFile, 'utf8'); - const content = JSON.parse(data); - assert.equal(content.config["app_to_debug"], hosts[5]); - - // Verify host-specific sideload and unload sripts have been removed - let unexexpectedScriptsFound = false; - Object.keys(content.scripts).forEach(function (key) { - if (key.includes("sideload:") || key.includes("unload:")) { - unexexpectedScriptsFound = true; - } - }); - assert.equal(unexexpectedScriptsFound, false); - }); - }); - - describe('Manifest.xml is updated appropriately', () => { - it('Manifest.xml is updated appropriately', async () => { - const manifestInfo = await OfficeAddinManifest.readManifestFile(manifestFile); - assert.equal(manifestInfo.hosts, "Document"); - }); - }); -}); - // Test to verify converting a project to a single host // for React Typescript project using PowerPoint host describe('Office-Add-Taskpane-React-Ts project', () => {