Skip to content

Commit

Permalink
Merge branch 'master' into pr891
Browse files Browse the repository at this point in the history
  • Loading branch information
gitbrent committed Apr 20, 2021
2 parents 79d891e + 5ec1a27 commit d87bda0
Show file tree
Hide file tree
Showing 47 changed files with 6,296 additions and 4,501 deletions.
21 changes: 11 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
### MacOS
.DS_Store
### Node

### Others
*.html
*.icloud
.icloud
demo-react/
docs/
img/
website
bower_components/
node_modules/
npm-debug.log
bower_components/
.icloud
*.icloud
/.idea
/website
/demo
/demo-react
/docs
/.rpt2_cache
src/bld
./*.html
27 changes: 24 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Notes]

## [3.5.0] - 2021-04-??
## [3.6.0] - 2021-??-??
### Release Summary
- write()/writeFile() now take a props object as their argument (`WriteProps`/`WriteFileProps`)
- Demos: Major Update (five years in the making! IE11 is dead, long live IE11!)
- Browser Demo: Dropped support for IE11 (use v3.5.0 or below) (library still works with IE11 using polyfill)
### Changes
- Margin not working with placeholder text [\#640](https://github.com/gitbrent/PptxGenJS/issues/640) ([bestis](https://github.com/bestis))
- Small API documentation glitch [\#895](https://github.com/gitbrent/PptxGenJS/issues/895) ([Slidemagic](https://github.com/Slidemagic))
- Doc/Website Updates: Docusaurus docs and website updated to v2.0 [\#931](https://github.com/gitbrent/PptxGenJS/pull/931) ([gitbrent](https://github.com/gitbrent))
- pptx.stream() WriteBaseProps should be optional [\#932](https://github.com/gitbrent/PptxGenJS/issues/932) ([arbourd](https://github.com/arbourd))
- Running StdTests generate a corrupt PPT [\#937](https://github.com/gitbrent/PptxGenJS/issues/937) ([michaeltford](https://github.com/michaeltford))



## [3.5.0] - 2021-03-30
### Release Summary
- write()/writeFile() method string arguments are deprecated - props object in now the sole arg (`WriteProps`/`WriteFileProps`)
### Added
- Enable JSZip compression [\#713](https://github.com/gitbrent/PptxGenJS/issues/713) ([pimlottc-gov](https://github.com/pimlottc-gov))
- Enabled JSZip compression [\#713](https://github.com/gitbrent/PptxGenJS/issues/713) ([pimlottc-gov](https://github.com/pimlottc-gov))
- Soft line break property: `softBreakBefore` [\#806](https://github.com/gitbrent/PptxGenJS/pull/806) ([memorsolutions](https://github.com/memorsolutions))
- More text styles: underline/strike/baseline [\#854](https://github.com/gitbrent/PptxGenJS/pull/854) ([wangfengming](https://github.com/wangfengming))
- Support line spacing by multiple: `lineSpacingMultiple` [\#855](https://github.com/gitbrent/PptxGenJS/pull/855) ([wangfengming](https://github.com/wangfengming))
- Chart val axis option: logarithmic scale base: `valAxisLogScaleBase` [\#878](https://github.com/gitbrent/PptxGenJS/issues/878) ([rkspx](https://github.com/rkspx))
### Changed
- Fixed: Setting the "Wrap text in shape" option [\#771](https://github.com/gitbrent/PptxGenJS/issues/771) ([CroniD](https://github.com/CroniD))
- Fixed: `dataLabelFormatCode` option creates corrupted file if the value includes quotes [\#834](https://github.com/gitbrent/PptxGenJS/issues/834) ([kornarakis](https://github.com/kornarakis)) [\#884](https://github.com/gitbrent/PptxGenJS/pull/884) ([gazlo](https://github.com/gazlo))
- Fixed: Improve typescipt defs: fix dupes, etc [\#886](https://github.com/gitbrent/PptxGenJS/pull/886) ([mmarkelov](https://github.com/mmarkelov))
- Fixed: Wrong type definition for placeholder type property [\#921](https://github.com/gitbrent/PptxGenJS/issues/921) ([lukevella](https://github.com/lukevella))
### Internal Updates
- Doc/Website Updates: Docusaurus docs and website updated to v2.0 [\#924](https://github.com/gitbrent/PptxGenJS/pull/924) ([gitbrent](https://github.com/gitbrent))



Expand Down
29 changes: 15 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,22 @@
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

- [Table of Contents](#table-of-contents)
- [Introduction](#introduction)
- [Features](#features)
- [Live Demo](#live-demo)
- [Installation](#installation)
- [CDN](#cdn)
- [Download](#download)
- [Npm](#npm)
- [Yarn](#yarn)
- [Additional Builds](#additional-builds)
- [CDN](#cdn)
- [Download](#download)
- [Npm](#npm)
- [Yarn](#yarn)
- [Additional Builds](#additional-builds)
- [Documentation](#documentation)
- [Quick Start Guide](#quick-start-guide)
- [Angular/React, ES6, TypeScript](#angularreact-es6-typescript)
- [Script/Web Browser](#scriptweb-browser)
- [Library API](#library-api)
- [HTML-to-PowerPoint Feature](#html-to-powerpoint-feature)
- [Quick Start Guide](#quick-start-guide)
- [Angular/React, ES6, TypeScript](#angularreact-es6-typescript)
- [Script/Web Browser](#scriptweb-browser)
- [Library API](#library-api)
- [HTML-to-PowerPoint Feature](#html-to-powerpoint-feature)
- [Library Ports](#library-ports)
- [Issues / Suggestions](#issues--suggestions)
- [Need Help?](#need-help)
Expand Down Expand Up @@ -84,14 +85,14 @@ Use the online demo to create a simple presentation to see how easy it is to use
Bundle: Modern Browsers and IE11

```html
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.4.0/dist/pptxgen.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.5.0/dist/pptxgen.bundle.js"></script>
```

Min files: Modern Browsers

```html
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.4.0/libs/jszip.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.4.0/dist/pptxgen.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.5.0/libs/jszip.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@3.5.0/dist/pptxgen.min.js"></script>
```

## Download
Expand Down Expand Up @@ -266,6 +267,6 @@ PowerPoint shape definitions and some XML code via [Officegen Project](https://g

# License

Copyright &copy; 2015-2020 [Brent Ely](https://github.com/gitbrent/PptxGenJS)
Copyright &copy; 2015-present [Brent Ely](https://github.com/gitbrent/PptxGenJS)

[MIT](https://github.com/gitbrent/PptxGenJS/blob/master/LICENSE)
20 changes: 11 additions & 9 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ $ npm run demo-stream
### React/TypeScript Test

1. Ensure newest `dist/pptxgen.es.js` and `types/index.d.ts` under local node_modules
2. Update `demos/react-demo/package.json` version
3. Open `demos/react-demo/src/tstest/Test.tsx`
4. Check existing code
5. Test defs by using auto-complete, "pptxgen.ChartType." etc.
2. Note: Any updates to `node_modules/dist/pptxgen.es.js` are not picked up by the server (ctrl-C and restart)
3. Update `demos/react-demo/package.json` version
4. Open `demos/react-demo/src/tstest/Test.tsx`
5. Check existing code
6. Test defs by using auto-complete, "pptxgen.ChartType." etc.

```bash
$ cd ~/GitHub/PptxGenJS/demos/react-demo
Expand All @@ -69,9 +70,8 @@ $ cd ~/GitHub/PptxGenJS/demos/react-demo
$ npm run build
```

1. Copy entire "build" folder to Downloads for subsequently updating gh-pages with latest build (DO NOT use the deploy script offered onscreen!)

**NOTE** Any updates to `node_modules/dist/pptxgen.es.js` are not picked up by the server (ctrl-C and restart)
1. Copy entire "build" folder to Downloads for subsequently updating gh-pages with latest build
2. Note: **DO NOT** use the deploy script offered onscreen!

## Release New Version

Expand All @@ -90,8 +90,10 @@ $ npm run build

### NPM

1. `cd ~/GitHub/PptxGenJS`
2. `npm publish`
```bash
$ cd ~/GitHub/PptxGenJS
$ npm publish
```

## Post-Release Tasks

Expand Down
Loading

0 comments on commit d87bda0

Please sign in to comment.