Merge 1b59897 into 835d5d2

build-system/common/update-packages.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const checkDependencies = require('check-dependencies');
-const del = require('del');
 const fs = require('fs-extra');
 const path = require('path');
 const {cyan, red} = require('kleur/colors');
@@ -180,19 +179,6 @@ function patchShadowDom() {
   writeIfUpdated(patchedName, file);
 }
 
-/**
- * Deletes the map file for rrule, which breaks closure compiler.
- * TODO(wg-infra): Remove this workaround after a fix is merged for
- * https://github.com/google/closure-compiler/issues/3720.
- */
-function removeRruleSourcemap() {
-  const rruleMapFile = 'node_modules/rrule/dist/es5/rrule.js.map';
-  if (fs.existsSync(rruleMapFile)) {
-    del.sync(rruleMapFile);
-    logLocalDev('Deleted', cyan(rruleMapFile));
-  }
-}
-
 /**
  * Checks if all packages are current, and if not, runs `npm install`.
  */
@@ -227,7 +213,6 @@ function updatePackages() {
   patchIntersectionObserver();
   patchResizeObserver();
   patchShadowDom();
-  removeRruleSourcemap();
   if (isCiBuild()) {
     runNpmChecks();
   }

extensions/amp-date-picker/0.1/dates-list.js

@@ -1,7 +1,6 @@
-import * as rrule from '../../../node_modules/rrule/dist/es5/rrule';
-import {requireExternal} from '../../../src/module';
+import {rrulestr} from 'rrule';
 
-const rrulestr = rrule.default.rrulestr || rrule.rrulestr; // closure imports into .default, esbuild flattens a layer.
+import {requireExternal} from '../../../src/module';
 
 /** @enum {string} */
 const DateType = {

extensions/amp-date-picker/1.0/component/dates-list.js

@@ -1,7 +1,5 @@
 import {addDays, isSameDay, isValid} from 'date-fns';
-import * as rrule from 'rrule';
-
-const rrulestr = rrule.default.rrulestr || rrule.rrulestr; // closure imports into .default, esbuild flattens a layer.
+import {rrulestr} from 'rrule';
 
 /**
  * RRULE returns dates as local time formatted at UTC, so the

package.json

@@ -34,7 +34,7 @@
     "react-day-picker": "8.0.0-beta.37",
     "react-jss": "10.8.2",
     "resize-observer-polyfill": "1.5.1",
-    "rrule": "2.6.8",
+    "rrule": "2.7.2",
     "timeago.js": "4.0.2",
     "web-activities": "1.24.0",
     "web-animations-js": "2.3.2"