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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

馃彈 Switch from third_party/rrule to the rrule module #22946

Merged
merged 3 commits into from Jun 24, 2019
Merged

馃彈 Switch from third_party/rrule to the rrule module #22946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1df6ae
Switch from third_party/rrule to the rrule module
rsimha Jun 20, 2019
a6d26a1
Roll back to rrule 2.2.0 (currently used in third_party)
rsimha Jun 21, 2019
21cb170
Suppress type error due to closure bug
rsimha Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions build-system/compile/compile.js
View file
Open in desktop
Expand Up @@ -97,7 +97,6 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
'third_party/mustache/',
'third_party/vega/',
'third_party/webcomponentsjs/',
'third_party/rrule/',
'third_party/react-dates/',
'third_party/amp-toolbox-cache-url/',
'third_party/inputmask/',
Expand Down Expand Up @@ -228,7 +227,6 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
'third_party/d3/**/*.js',
'third_party/subscriptions-project/*.js',
'third_party/webcomponentsjs/ShadowCSS.js',
'third_party/rrule/rrule.js',
'third_party/react-dates/bundle.js',
'third_party/amp-toolbox-cache-url/**/*.js',
'third_party/inputmask/**/*.js',
Expand Down
1 change: 0 additions & 1 deletion build-system/dep-check-config.js
View file
Open in desktop
Expand Up @@ -91,7 +91,6 @@ exports.rules = [
'third_party/timeagojs/timeago.js->' +
'third_party/timeagojs/timeago-locales.js',
'extensions/amp-date-picker/**->third_party/react-dates/bundle.js',
'extensions/amp-date-picker/**->third_party/rrule/rrule.js',
'extensions/amp-subscriptions/**/*.js->' +
'third_party/subscriptions-project/apis.js',
'extensions/amp-subscriptions/**/*.js->' +
Expand Down
5 changes: 3 additions & 2 deletions extensions/amp-date-picker/0.1/dates-list.js
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/

import {requireExternal} from '../../../src/module';
import RRule from '../../../third_party/rrule/rrule';
import {rrulestr} from 'rrule';

/** @enum {string} */
const DateType = {
Expand Down Expand Up @@ -139,10 +139,11 @@ export class DatesList {
* Tries to parse a string into an RRULE object.
* @param {string} str A string which represents a repeating date RRULE spec.
* @return {?JsonObject}
* @suppress {missingProperties} // Remove after https://github.com/google/closure-compiler/issues/3041 is fixed
*/
function tryParseRrulestr(str) {
try {
return RRule.fromString(str);
return rrulestr(str);
} catch (e) {
return null;
}
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@
"promise-pjs": "1.1.3",
"prop-types": "15.7.2",
"react-dates": "15.5.3",
"rrule": "2.2.0",
"set-dom": "7.5.2",
"web-activities": "1.13.0",
"web-animations-js": "2.3.1"
Expand Down