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

bump: [#4684] Upgrade d3-format using import-sync for esm-only package #4784

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

bump: [#4684] Upgrade d3-format using import-sync for esm-only package #4784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e152dfb
Replace browserify with tsup in adaptive-expressions
sw-joelmut Oct 16, 2024
ac8b60e
Remove remaining browserify packages
sw-joelmut Oct 17, 2024
8dd0191
Fix streaming tests
sw-joelmut Oct 17, 2024
4289261
Upgrade d3-format to latest version (esm-only)
ceciliaavila Oct 23, 2024
7c19b70
Merge branch 'main' into southworks/update/esm-only-d3-format
ceciliaavila Nov 1, 2024
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 libraries/adaptive-expressions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@
"big-integer": "^1.6.52",
"@types/xmldom": "^0.1.34",
"btoa-lite": "^1.0.0",
"d3-format": "^2.0.0",
"d3-format": "^3.1.0",
"dayjs": "^1.11.13",
"eslint-plugin-only-warn": "^1.1.0",
"import-sync": "^2.2.2",
"jspath": "^0.4.0",
"lodash": "^4.17.21",
"lru-cache": "^5.1.1",
Expand All @@ -60,7 +61,7 @@
"build:browser:clean": "rimraf --glob lib/browser.*",
"build:browser:run": "tsup --config ../../tsup/browser.config.ts",
"clean": "rimraf lib tsconfig.tsbuildinfo",
"depcheck": "depcheck --config ../../.depcheckrc --ignores sinon,@types/xmldom",
"depcheck": "depcheck --config ../../.depcheckrc --ignores d3-format,sinon,@types/xmldom",
"build-docs": "typedoc --theme markdown --entryPoint adaptive-expressions --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\adaptive-expressions .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Expression\" --readme none",
"test": "yarn build && mocha tests --timeout 60000",
"test:compat": "api-extractor run --verbose",
Expand Down
3 changes: 2 additions & 1 deletion libraries/adaptive-expressions/src/builtinFunctions/formatNumber.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
* Licensed under the MIT License.
*/

import { formatLocale as d3formatLocale, format as d3format } from 'd3-format';
import { Expression } from '../expression';
import { EvaluateExpressionDelegate, ExpressionEvaluator } from '../expressionEvaluator';
import { ExpressionType } from '../expressionType';
import { FunctionUtils } from '../functionUtils';
import { ReturnType } from '../returnType';
import { Options } from '../options';
import { localeInfo } from '../localeInfo';
import importSync from 'import-sync';

const { formatLocale: d3formatLocale, format: d3format } = importSync('d3-format');
/**
* Format number into required decimal numbers.
*/
Expand Down
4 changes: 3 additions & 1 deletion libraries/adaptive-expressions/src/builtinFunctions/string.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* Licensed under the MIT License.
*/

import { formatLocale as d3formatLocale, format as d3format } from 'd3-format';
import { EvaluateExpressionDelegate, ExpressionEvaluator, ValueWithError } from '../expressionEvaluator';
import { ExpressionType } from '../expressionType';
import { FunctionUtils } from '../functionUtils';
Expand All @@ -15,6 +14,9 @@ import { ReturnType } from '../returnType';
import { localeInfo } from '../localeInfo';
import { Expression } from '../expression';
import { InternalFunctionUtils } from '../functionUtils.internal';
import importSync from 'import-sync';

const { formatLocale: d3formatLocale, format: d3format } = importSync('d3-format');

/**
* Return the string version of a value.
Expand Down
9 changes: 5 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6893,10 +6893,10 @@ csv@^6.2.2:
csv-stringify "^6.5.0"
stream-transform "^3.3.2"

d3-format@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-2.0.0.tgz#a10bcc0f986c372b729ba447382413aabf5b0767"
integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==
d3-format@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==

dashdash@^1.12.0:
version "1.14.1"
Expand Down Expand Up @@ -14367,6 +14367,7 @@ string-argv@~0.3.1:
integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==

"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.2.2, string-width@^4.2.3:
name string-width-cjs
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down
Loading