GoogleForCreators · swissspidy · May 15, 2024 · May 15, 2024 · May 15, 2024 · May 15, 2024
diff --git a/__mocks__/fs.js → __mocks__/node:fs.js b/__mocks__/fs.js → __mocks__/node:fs.js
diff --git a/packages/animation/src/components/test/animationProvider.tsx b/packages/animation/src/components/test/animationProvider.tsx
@@ -50,9 +50,9 @@ function createWrapperWithProps<T>(
  Wrapper: React.FunctionComponent<T>,
  props: T
 ) {
- const WrapperWithProps = function ({ children }: PropsWithChildren<T>) {
- return <Wrapper {...props}>{children}</Wrapper>;
- };
+ const WrapperWithProps = ({ children }: PropsWithChildren<T>) => (
+ <Wrapper {...props}>{children}</Wrapper>
+ );
  return WrapperWithProps;
 }
 

diff --git a/packages/animation/src/parts/createAnimation.tsx b/packages/animation/src/parts/createAnimation.tsx
@@ -48,30 +48,28 @@ function createAnimation<T extends Keyframes>(
  ? {}
  : getInitialStyleFromKeyframes(keyframes);
 
- const AMPTarget: VoidFunctionComponent<AMPAnimationProps> = function ({
+ const AMPTarget: VoidFunctionComponent<AMPAnimationProps> = ({
  children,
  style = {},
- }) {
- return (
- <WithAnimation
- id={id}
- className="animation-wrapper"
- useClippingContainer={useClippingContainer}
- style={style}
- animationStyle={animationStyle}
- >
- {children}
- </WithAnimation>
- );
- };
+ }) => (
+ <WithAnimation
+ id={id}
+ className="animation-wrapper"
+ useClippingContainer={useClippingContainer}
+ style={style}
+ animationStyle={animationStyle}
+ >
+ {children}
+ </WithAnimation>
+ );
 
  const selector = targetLeafElement
  ? `#${id} [data-leaf-element="true"]`
  : `#${id}`;
 
- const AMPAnimation: VoidFunctionComponent = function () {
- return <AnimationOutput config={{ selector, keyframes, ...timings }} />;
- };
+ const AMPAnimation: VoidFunctionComponent = () => (
+ <AnimationOutput config={{ selector, keyframes, ...timings }} />
+ );
 
  return {
  id,

diff --git a/packages/animation/src/parts/effects/backgroundPan.ts b/packages/animation/src/parts/effects/backgroundPan.ts
@@ -26,7 +26,7 @@ import createAnimation from '../createAnimation';
 import {
  type AMPEffectTiming,
  AnimationDirection,
- AnimationType,
+ type AnimationType,
  type Element,
  FieldType,
 } from '../../types';

diff --git a/packages/animation/src/parts/effects/drop.ts b/packages/animation/src/parts/effects/drop.ts
@@ -26,7 +26,7 @@ import type { DimensionableElement } from '@googleforcreators/units';
 import createAnimation from '../createAnimation';
 import {
  type AMPEffectTiming,
- AnimationType,
+ type AnimationType,
  type Element,
  FieldType,
  type Keyframes,

diff --git a/packages/animation/src/parts/effects/pan.ts b/packages/animation/src/parts/effects/pan.ts
@@ -33,7 +33,7 @@ import createAnimation from '../createAnimation';
 import {
  type AMPEffectTiming,
  AnimationDirection,
- AnimationType,
+ type AnimationType,
  type Element,
  FieldType,
 } from '../../types';

diff --git a/packages/animation/src/parts/simple/blinkOn.ts b/packages/animation/src/parts/simple/blinkOn.ts
@@ -19,7 +19,11 @@
  */
 import generateLookupMap from '../../utils/generateLookupMap';
 import padArray from '../../utils/padArray';
-import { type AMPEffectTiming, AnimationType, FieldType } from '../../types';
+import {
+ type AMPEffectTiming,
+ type AnimationType,
+ FieldType,
+} from '../../types';
 import createAnimation from '../createAnimation';
 
 const DEFAULT_BLINKS = 10;

diff --git a/packages/animation/src/parts/simple/fade.ts b/packages/animation/src/parts/simple/fade.ts
@@ -17,7 +17,11 @@
 /**
  * Internal dependencies
  */
-import { type AMPEffectTiming, AnimationType, FieldType } from '../../types';
+import {
+ type AMPEffectTiming,
+ type AnimationType,
+ FieldType,
+} from '../../types';
 import createAnimation from '../createAnimation';
 
 const defaults: AMPEffectTiming = {

diff --git a/packages/animation/src/parts/simple/flip.ts b/packages/animation/src/parts/simple/flip.ts
@@ -19,7 +19,7 @@
  */
 import {
  type AMPEffectTiming,
- AnimationType,
+ type AnimationType,
  Axis,
  FieldType,
  Rotation,

diff --git a/packages/animation/src/parts/simple/floatOn.ts b/packages/animation/src/parts/simple/floatOn.ts
@@ -20,7 +20,7 @@
 import {
  type AMPEffectTiming,
  AnimationDirection,
- AnimationType,
+ type AnimationType,
  FieldType,
 } from '../../types';
 import createAnimation from '../createAnimation';

diff --git a/packages/animation/src/parts/simple/move.ts b/packages/animation/src/parts/simple/move.ts
@@ -19,7 +19,7 @@
  */
 import {
  type AMPEffectTiming,
- AnimationType,
+ type AnimationType,
  type Element,
  FieldType,
 } from '../../types';

diff --git a/packages/animation/src/parts/simple/spin.ts b/packages/animation/src/parts/simple/spin.ts
@@ -19,7 +19,7 @@
  */
 import {
  type AMPEffectTiming,
- AnimationType,
+ type AnimationType,
  type Element,
  FieldType,
 } from '../../types';

diff --git a/packages/animation/src/parts/simple/zoom.ts b/packages/animation/src/parts/simple/zoom.ts
@@ -17,7 +17,11 @@
 /**
  * Internal dependencies
  */
-import { type AMPEffectTiming, AnimationType, FieldType } from '../../types';
+import {
+ type AMPEffectTiming,
+ type AnimationType,
+ FieldType,
+} from '../../types';
 import createAnimation from '../createAnimation';
 
 const defaults: AMPEffectTiming = { fill: 'forwards', duration: 1000 };

diff --git a/packages/animation/src/typings/global.d.ts b/packages/animation/src/typings/global.d.ts
@@ -33,5 +33,3 @@ declare global {
  }
  }
 }
-
-export {};
diff --git a/packages/animation/src/utils/createKeyframeEffect.ts b/packages/animation/src/utils/createKeyframeEffect.ts
@@ -28,7 +28,9 @@ function createKeyframeEffect(
  const convertedTimings: EffectTiming = {
  ...timings,
  iterations:
- timings.iterations === 'infinity' ? Infinity : timings.iterations,
+ timings.iterations === 'infinity'
+ ? Number.POSITIVE_INFINITY
+ : timings.iterations,
  };
 
  return new KeyframeEffect(target, keyframes, convertedTimings);

diff --git a/packages/animation/src/utils/padArray.ts b/packages/animation/src/utils/padArray.ts
@@ -15,7 +15,7 @@
  */
 
 function padArray(values: number[], padCount: number) {
- return values.map((val) => Array<number>(padCount).fill(val)).flat();
+ return values.flatMap((val) => Array<number>(padCount).fill(val));
 }
 
 export default padArray;
diff --git a/packages/animation/src/utils/test/createKeyframeEffect.ts b/packages/animation/src/utils/test/createKeyframeEffect.ts
@@ -34,7 +34,7 @@ describe('createKeyframeEffect', () => {
 
  createKeyframeEffect(element, keyframes, timings);
  expect(mockKeyframeEffect).toHaveBeenCalledWith(element, keyframes, {
- iterations: Infinity,
+ iterations: Number.POSITIVE_INFINITY,
  });
  });
 

diff --git a/packages/commander/src/index.ts b/packages/commander/src/index.ts
@@ -18,8 +18,8 @@
 /**
  * External dependencies
  */
-import { mkdirSync, rmSync, existsSync } from 'fs';
-import { relative } from 'path';
+import { mkdirSync, rmSync, existsSync } from 'node:fs';
+import { relative } from 'node:path';
 import { Command } from 'commander';
 import { inc as semverInc, type ReleaseType } from 'semver';
 
@@ -181,7 +181,7 @@ program
  const pluginFilePath = `${PLUGIN_DIR}/${PLUGIN_FILE}`;
  updateCdnUrl(
  pluginFilePath,
- version === 'main' ? version : parseInt(version)
+ version === 'main' ? version : Number.parseInt(version)
  );
 
  console.log(`Assets CDN URL successfully updated!`);

diff --git a/packages/commander/src/utils/appendRevisionToVersion.ts b/packages/commander/src/utils/appendRevisionToVersion.ts
@@ -17,7 +17,7 @@
 /**
  * External dependencies
  */
-import { execSync } from 'child_process';
+import { execSync } from 'node:child_process';
 
 /**
  * Appends the current revision to the version number for nightly builds.

diff --git a/packages/commander/src/utils/bundlePlugin.ts b/packages/commander/src/utils/bundlePlugin.ts
@@ -17,7 +17,7 @@
 /**
  * External dependencies
  */
-import { dirname } from 'path';
+import { dirname } from 'node:path';
 
 /**
  * Internal dependencies

diff --git a/packages/commander/src/utils/copyFiles.ts b/packages/commander/src/utils/copyFiles.ts
@@ -17,7 +17,7 @@
 /**
  * External dependencies
  */
-import { execFileSync } from 'child_process';
+import { execFileSync } from 'node:child_process';
 
 /**
  * Copies all files minuses ignored ones from source to target directory.

diff --git a/packages/commander/src/utils/deleteExistingZipFiles.ts b/packages/commander/src/utils/deleteExistingZipFiles.ts
@@ -17,7 +17,7 @@
 /**
  * External dependencies
  */
-import { readdirSync, unlinkSync } from 'fs';
+import { readdirSync, unlinkSync } from 'node:fs';
 
 /**
  * Removes all existing ZIP files in the build folder.

diff --git a/packages/commander/src/utils/generateZipFile.ts b/packages/commander/src/utils/generateZipFile.ts
@@ -17,9 +17,9 @@
 /**
  * External dependencies
  */
-import { dirname, basename, join } from 'path';
-import { execFileSync } from 'child_process';
-import { existsSync, unlinkSync } from 'fs';
+import { dirname, basename, join } from 'node:path';
+import { execFileSync } from 'node:child_process';
+import { existsSync, unlinkSync } from 'node:fs';
 
 /**
  * Generates a ZIP file.

diff --git a/packages/commander/src/utils/getCurrentVersionNumber.ts b/packages/commander/src/utils/getCurrentVersionNumber.ts
@@ -17,7 +17,7 @@
 /**
  * External dependencies
  */
-import { readFileSync } from 'fs';
+import { readFileSync } from 'node:fs';
 
 const VERSION_REGEX = /\* Version:(.+)/;
 const VERSION_CONSTANT_REGEX =

diff --git a/packages/commander/src/utils/getIgnoredFiles.ts b/packages/commander/src/utils/getIgnoredFiles.ts
@@ -17,7 +17,7 @@
 /**
  * External dependencies
  */
-import { existsSync, lstatSync, readFileSync } from 'fs';
+import { existsSync, lstatSync, readFileSync } from 'node:fs';
 
 /**
  * Returns a list of files that should be ignored based on the .distignore file.

diff --git a/packages/commander/src/utils/resizeSvgPath.ts b/packages/commander/src/utils/resizeSvgPath.ts
@@ -21,7 +21,7 @@ export default function resizeSvgPath(x: number, y: number, path: string) {
  .split(' ');
  let coordIndex = 0;
  return coords.reduce((acc, value) => {
- const parsed = parseFloat(value);
+ const parsed = Number.parseFloat(value);
  if (!isNaN(parsed)) {
  const scaled = coordIndex % 2 === 0 ? parsed / x : parsed / y;
  return `${acc} ${scaled.toFixed(6)}`;

diff --git a/packages/commander/src/utils/test/appendRevisionToVersion.js b/packages/commander/src/utils/test/appendRevisionToVersion.js
@@ -19,7 +19,7 @@
  */
 import appendRevisionToVersion from '../appendRevisionToVersion';
 
-jest.mock('child_process', () => {
+jest.mock('node:child_process', () => {
  return {
  execSync: () => '1234567',
  };

diff --git a/packages/commander/src/utils/test/bundlePlugin.js b/packages/commander/src/utils/test/bundlePlugin.js
@@ -17,7 +17,7 @@
 /**
  * External dependencies
  */
-import { __setMockFiles } from 'fs';
+import { __setMockFiles } from 'node:fs';
 
 /**
  * Internal dependencies
@@ -27,8 +27,8 @@ import generateZipFile from '../generateZipFile';
 import getCurrentVersionNumber from '../getCurrentVersionNumber';
 import deleteExistingZipFiles from '../deleteExistingZipFiles';
 
-jest.mock('fs');
-jest.mock('child_process');
+jest.mock('node:fs');
+jest.mock('node:child_process');
 
 jest.mock('../generateZipFile');
 jest.mock('../getCurrentVersionNumber');

diff --git a/packages/commander/src/utils/test/copyFiles.js b/packages/commander/src/utils/test/copyFiles.js
@@ -17,14 +17,14 @@
 /**
  * External dependencies
  */
-import { execFileSync } from 'child_process';
+import { execFileSync } from 'node:child_process';
 
 /**
  * Internal dependencies
  */
 import copyFiles from '../copyFiles';
 
-jest.mock('child_process');
+jest.mock('node:child_process');
 
 describe('copyFiles', () => {
  it('should sync source files to target', () => {

diff --git a/packages/commander/src/utils/test/createBuild.js b/packages/commander/src/utils/test/createBuild.js
@@ -17,15 +17,15 @@
 /**
  * External dependencies
  */
-import { __setMockFiles } from 'fs';
+import { __setMockFiles } from 'node:fs';
 
 /**
  * Internal dependencies
  */
 import createBuild from '../createBuild';
 import copyFiles from '../copyFiles';
 
-jest.mock('fs');
+jest.mock('node:fs');
 
 jest.mock('../getIgnoredFiles', () => jest.fn(() => ['bar.txt', 'baz/']));
 jest.mock('../copyFiles');

diff --git a/packages/commander/src/utils/test/deleteExistingZipFiles.js b/packages/commander/src/utils/test/deleteExistingZipFiles.js
@@ -17,14 +17,14 @@
 /**
  * External dependencies
  */
-import { __setMockFiles, readdirSync } from 'fs';
+import { __setMockFiles, readdirSync } from 'node:fs';
 
 /**
  * Internal dependencies
  */
 import deleteExistingZipFiles from '../deleteExistingZipFiles';
 
-jest.mock('fs');
+jest.mock('node:fs');
 
 describe('deleteExistingZipFiles', () => {
  const MOCK_FILE_INFO = {

diff --git a/packages/commander/src/utils/test/generateZipFile.js b/packages/commander/src/utils/test/generateZipFile.js
@@ -17,14 +17,14 @@
 /**
  * External dependencies
  */
-import { execFileSync } from 'child_process';
+import { execFileSync } from 'node:child_process';
 
 /**
  * Internal dependencies
  */
 import generateZipFile from '../generateZipFile';
 
-jest.mock('child_process');
+jest.mock('node:child_process');
 
 describe('generateZipFile', () => {
  it('should ZIP the web-stories directory', () => {