Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to Typescript #228

Merged
merged 38 commits into from
Aug 3, 2018
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1e813b1
babelify compiled source, and don't minify for distribution
davidgoli Jul 30, 2018
d33908c
make some progress converting
davidgoli Jul 31, 2018
eb9695f
make dist folder self-sufficient
nickarora Jul 31, 2018
2ff3eeb
remove jquery manual import
nickarora Jul 31, 2018
03fa0d4
clean up formatting on webpack config
nickarora Jul 31, 2018
554a9ac
index.js => rrule.js
nickarora Jul 31, 2018
2606a8d
fix license warning
nickarora Jul 31, 2018
586c059
fix rrule & rruleset
davidgoli Jul 31, 2018
3a4e675
Merge pull request #1 from substantial/streamline-webpack-bundle
davidgoli Jul 31, 2018
1bb5593
package es6 & es6 outputs
davidgoli Jul 31, 2018
4b63cae
Merge branch 'master' into convert-to-typescript
davidgoli Jul 31, 2018
abe919f
get tests passing
davidgoli Jul 31, 2018
076c0b5
rebuild
davidgoli Jul 31, 2018
7d83ba8
fix demo
davidgoli Jul 31, 2018
5fce53f
ensure output is built to the correct target
davidgoli Jul 31, 2018
a3a6748
add extra typing info
davidgoli Jul 31, 2018
4874534
remove old index file
davidgoli Jul 31, 2018
83ef28a
use main & module appropriately
davidgoli Jul 31, 2018
e743349
fix nlp import
davidgoli Jul 31, 2018
e7078e9
export more secondary types
davidgoli Aug 1, 2018
1d498b4
add RRuleStrOptions
davidgoli Aug 1, 2018
91a22ff
remove beta babel; fix lint warnings
davidgoli Aug 1, 2018
036a08c
make Options non-optional; tighten up types
davidgoli Aug 1, 2018
7c15462
streamline .d.ts output
davidgoli Aug 1, 2018
7efa064
remove a ts-ignore
davidgoli Aug 1, 2018
5ceef88
get rid of some anys
davidgoli Aug 2, 2018
5eeac9e
tighten up types around iterators
davidgoli Aug 2, 2018
ed63fd0
update README
davidgoli Aug 2, 2018
2056612
get rid of any in Parser
davidgoli Aug 2, 2018
6539cfb
get rid of any in ToText
davidgoli Aug 2, 2018
86a1d68
extract IterInfo
davidgoli Aug 2, 2018
9075c58
isolate some ugliness
davidgoli Aug 2, 2018
a22982b
reduce scope of many variables
davidgoli Aug 2, 2018
72e36c8
extract initializeOptions
davidgoli Aug 2, 2018
d984ce0
extract parseOptions
davidgoli Aug 2, 2018
fc2cd1f
define ParsedOptions and remove unnecessary casting
davidgoli Aug 2, 2018
8c92c8b
plb -> notEmpty
davidgoli Aug 2, 2018
481a646
Merge remote-tracking branch 'upstream/master' into convert-to-typesc…
davidgoli Aug 3, 2018
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules/
bower_components/
.idea
.vscode
.vscode
*.log
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ $ yarn add rrule
```

Alternatively, download
[rrule.js](https://raw.github.com/jakubroztocil/rrule/master/dist/index.js) manually.
[rrule.js](https://raw.github.com/jakubroztocil/rrule/master/dist/es5/rrule.js) manually.

```html
<script src="rrule/dist/index.js"></script>
<script src="rrule/dist/es5/rrule.js"></script>
```

#### Server Side
Expand All @@ -43,18 +43,16 @@ Alternatively, download
$ yarn add rrule
```

```javascript
var RRule = require('rrule').RRule
var RRuleSet = require('rrule').RRuleSet
var rrulestr = require('rrule').rrulestr
```es6
import { RRule, RRuleSet, rrulestr } from 'rrule/es6'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💛 I don't think its mentioned anywhere in the README but we should point out that you can use

import { RRule, RRuleSet, rrulestr } from 'rrule'

to pull in RRule that requires no transpiling

```

#### Usage

**RRule:**
```js
// Create a rule:
var rule = new RRule({
const rule = new RRule({
freq: RRule.WEEKLY,
interval: 5,
byweekday: [RRule.MO, RRule.FR],
Expand Down Expand Up @@ -88,7 +86,7 @@ rule.toText()

**RRuleSet:**
```js
var rruleSet = new RRuleSet()
const rruleSet = new RRuleSet()

// Add a rrule to rruleSet
rruleSet.rrule(new RRule({
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}, {
"name": "Lars Schöning"
}],
"main": "dist/index.js",
"main": "dist/rrule.js",
"ignore": [
"**/.*",
"node_modules",
Expand Down
2 changes: 2 additions & 0 deletions demo/demo.coffee
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
RRule = rrule.RRule

getFormValues = ($form) ->
paramObj = {}
$.each $form.serializeArray(), (_, kv) ->
Expand Down
278 changes: 0 additions & 278 deletions demo/demo.js

This file was deleted.

6 changes: 3 additions & 3 deletions index.html → demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

<head>
<title>rrule.js demo</title>
<link rel="stylesheet" href="demo/demo.css" />
<script src="demo/jquery-1.12.0.min.js"></script>
<script type="text/javascript" src="dist/demo.js"></script>
<link rel="stylesheet" href="./demo.css" />
<script type="text/javascript" src="./es5/rrule.js"></script>
<script type="text/javascript" src="./demo.js"></script>
</head>

<body>
Expand Down
5 changes: 0 additions & 5 deletions demo/jquery-1.12.0.min.js

This file was deleted.

Loading