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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(ui-components): Convert RESM to NESM #3646

Merged
merged 2 commits into from
Aug 12, 2021
Merged

refactor(ui-components): Convert RESM to NESM #3646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8baa929
refactor(ui-components): Convert RESM to NESM
kriskowal Aug 10, 2021
e5875f2
test(ui-components): Add coverage script
kriskowal Aug 10, 2021
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
5 changes: 3 additions & 2 deletions packages/ui-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "@agoric/ui-components",
"version": "0.2.18",
"description": "Reusable UI Components for Agoric Dapps, built with React and MaterialUI",
"type": "module",
"main": "dist/index.js",
"dependencies": {
"@agoric/assert": "^0.3.7",
Expand All @@ -20,6 +21,7 @@
"scripts": {
"test": "BABEL_ENV='test' ava",
"test:xs": "exit 0",
"test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
"build:tests": "rm -rf compiled && BABEL_ENV='test' ./node_modules/.bin/babel test/components --out-dir compiled/test/components",
"build:src": "rm -rf dist && BABEL_ENV='test' ./node_modules/.bin/babel src --out-dir dist",
"build": "yarn build:src && yarn build:tests",
Expand Down Expand Up @@ -59,13 +61,13 @@
"babel-eslint": "^10.1.0",
"babel-plugin-named-asset-import": "^0.3.7",
"babel-preset-react-app": "^10.0.0",
"c8": "^7.7.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"eslint-config-react-app": "^6.0.0",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0",
"esm": "agoric-labs/esm#Agoric-built",
"prettier": "^1.19.0",
"react": "^16.14.0",
"react-dom": "^16.8.0",
Expand All @@ -78,7 +80,6 @@
"!test/components"
],
"require": [
"esm",
"./test/_setup-enzyme-adapter.js"
]
},
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/src/components/NatAmountInput.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { parseAsNat } from '../display/natValue/parseAsNat';
import { stringifyNat } from '../display/natValue/stringifyNat';
import { parseAsNat } from '../display/natValue/parseAsNat.js';
import { stringifyNat } from '../display/natValue/stringifyNat.js';

// https://material-ui.com/api/text-field/

Expand Down
2 changes: 1 addition & 1 deletion packages/ui-components/src/components/NatPurseSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AssetKind } from '@agoric/ertp';
import clsx from 'clsx';
import { stringifyValue } from '../display';
import { stringifyValue } from '../display/index.js';

/**
* Return `purses` filtered to just the fungible ones, and optionally just the ones for a
Expand Down
10 changes: 5 additions & 5 deletions packages/ui-components/src/display/display.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// @ts-check
import { assert, details } from '@agoric/assert';
import { AssetKind } from '@agoric/ertp';
import '@agoric/ertp/exported';
import '@agoric/ertp/exported.js';

import { parseAsNat } from './natValue/parseAsNat';
import { stringifyNat } from './natValue/stringifyNat';
import { parseAsSet } from './setValue/parseAsSet';
import { stringifySet } from './setValue/stringifySet';
import { parseAsNat } from './natValue/parseAsNat.js';
import { stringifyNat } from './natValue/stringifyNat.js';
import { parseAsSet } from './setValue/parseAsSet.js';
import { stringifySet } from './setValue/stringifySet.js';

/**
*
Expand Down
8 changes: 4 additions & 4 deletions packages/ui-components/src/display/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './display';
export * from './natValue/stringifyRatioAsFraction';
export * from './natValue/stringifyRatio';
export * from './natValue/stringifyRatioAsPercent';
export * from './display.js';
export * from './natValue/stringifyRatioAsFraction.js';
export * from './natValue/stringifyRatio.js';
export * from './natValue/stringifyRatioAsPercent.js';
6 changes: 3 additions & 3 deletions packages/ui-components/src/display/natValue/parseAsNat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// @ts-check
import { assert, details } from '@agoric/assert';
import { Nat } from '@agoric/nat';
import '@agoric/ertp/exported';
import '@agoric/ertp/exported.js';

import { captureNum } from './helpers/captureNum';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces';
import { captureNum } from './helpers/captureNum.js';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces.js';

/**
* Parse a string as a Nat, using `decimalPlaces`, the number of
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-components/src/display/natValue/stringifyNat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { assert } from '@agoric/assert';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces.js';

const CONVENTIONAL_DECIMAL_PLACES = 2;

Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/src/display/natValue/stringifyRatio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { assert, details } from '@agoric/assert';
import { captureNum } from './helpers/captureNum';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces';
import { captureNum } from './helpers/captureNum.js';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces.js';

const PLACES_TO_SHOW = 2;

Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/src/display/natValue/stringifyRatioAsFraction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { assert } from '@agoric/assert';
import { isNatValue } from '@agoric/ertp';

// eslint-disable-next-line import/no-extraneous-dependencies
import '@agoric/zoe/exported';
import '@agoric/zoe/exported.js';

import { stringifyNat } from './stringifyNat';
import { stringifyNat } from './stringifyNat.js';

const PLACES_TO_SHOW = 2;

Expand Down
6 changes: 3 additions & 3 deletions packages/ui-components/src/display/natValue/stringifyRatioAsPercent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// @ts-check

import { assert, details } from '@agoric/assert';
import '@agoric/zoe/exported';
import '@agoric/zoe/exported.js';

import { captureNum } from './helpers/captureNum';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces';
import { captureNum } from './helpers/captureNum.js';
import { roundToDecimalPlaces } from './helpers/roundToDecimalPlaces.js';

const PERCENT_BASE = 100n;
const PLACES_TO_SHOW = 0;
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-components/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable import/no-unresolved */
export { default as makeNatAmountInput } from './components/NatAmountInput';
export { default as makeNatAmountInput } from './components/NatAmountInput.js';
// eslint-disable-next-line import/no-unresolved
export {
default as makeNatPurseSelector,
filterPurses,
} from './components/NatPurseSelector';
export * from './display';
} from './components/NatPurseSelector.js';
export * from './display/index.js';
6 changes: 4 additions & 2 deletions packages/ui-components/test/components/test-NatAmountInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ import { TextField } from '@material-ui/core';
// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava';
// eslint-disable-next-line import/no-extraneous-dependencies
import { shallow, render } from 'enzyme';
import * as enzyme from 'enzyme';

// @ts-ignore path is correct for compiled output
import { makeNatAmountInput } from '../../../dist'; // eslint-disable-line import/no-unresolved
import { makeNatAmountInput } from '../../../dist/index.js'; // eslint-disable-line import/no-unresolved

const { shallow, render } = enzyme.default || enzyme;

const NatAmountInput = makeNatAmountInput({ React, TextField });

Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/test/display/natValue/test-captureNum.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

import { captureNum } from '../../../src/display/natValue/helpers/captureNum';
import { captureNum } from '../../../src/display/natValue/helpers/captureNum.js';

test('captureNum', t => {
t.deepEqual(captureNum('200'), { left: '200', right: '' });
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/test/display/natValue/test-parseAsNat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// @ts-check

// eslint-disable-next-line import/no-extraneous-dependencies
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

import { parseAsNat } from '../../../src/display/natValue/parseAsNat';
import { parseAsNat } from '../../../src/display/natValue/parseAsNat.js';

test('parseAsNat dollars to cents', t => {
// 1 dollar is 100 cents, or 2 decimal points to the right
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/test/display/natValue/test-roundToDecimalPlaces.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

import { roundToDecimalPlaces as round } from '../../../src/display/natValue/helpers/roundToDecimalPlaces';
import { roundToDecimalPlaces as round } from '../../../src/display/natValue/helpers/roundToDecimalPlaces.js';

test('roundToDecimalPlaces', t => {
t.deepEqual(round('00', 0), '');
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/test/display/natValue/test-stringifyNat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

import { stringifyNat } from '../../../src/display/natValue/stringifyNat';
import { stringifyNat } from '../../../src/display/natValue/stringifyNat.js';

test('stringifyNat cents to dollars', t => {
// 1 dollar is 100 cents, or 2 decimal points to the right
Expand Down
10 changes: 5 additions & 5 deletions packages/ui-components/test/display/natValue/test-stringifyRatio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// @ts-check
// eslint-disable-next-line import/no-extraneous-dependencies
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

import { makeRatio } from '@agoric/zoe/src/contractSupport';
import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
import { makeIssuerKit, AssetKind } from '@agoric/ertp';

import { assert, details as X } from '@agoric/assert';
import { stringifyRatioAsFraction } from '../../../src/display/natValue/stringifyRatioAsFraction';
import { stringifyRatio } from '../../../src/display/natValue/stringifyRatio';
import { stringifyRatioAsPercent } from '../../../src/display/natValue/stringifyRatioAsPercent';
import { stringifyRatioAsFraction } from '../../../src/display/natValue/stringifyRatioAsFraction.js';
import { stringifyRatio } from '../../../src/display/natValue/stringifyRatio.js';
import { stringifyRatioAsPercent } from '../../../src/display/natValue/stringifyRatioAsPercent.js';

test('stringifyRatio dollars for one eth', t => {
// 1 dollar is 100 cents, or 2 decimal points to the right
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/test/display/setValue/test-parseAsSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

import { parseAsSet } from '../../../src/display/setValue/parseAsSet';
import { parseAsSet } from '../../../src/display/setValue/parseAsSet.js';

test('parseSet', t => {
t.throws(() => parseAsSet(), { message: 'parseAsSet not yet implemented' });
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/test/display/setValue/test-stringifySet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava';
import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';

import { stringifySet } from '../../../src/display/setValue/stringifySet';
import { stringifySet } from '../../../src/display/setValue/stringifySet.js';

test('stringifySet', t => {
t.throws(() => stringifySet(), {
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/test/display/test-display.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import '@agoric/swingset-vat/tools/prepare-test-env-ava';
import '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
// eslint-disable-next-line import/no-extraneous-dependencies
import test from 'ava'; // TODO ses-ava doesn't yet have test.todo

import { parseAsValue } from '../../src/display/display';
import { parseAsValue } from '../../src/display/display.js';

test('parseAsValue', t => {
t.is(parseAsValue('30'), 30n);
Expand Down