Skip to content

Commit 2b1ac37

Browse files
authored
Merge pull request #1325 from input-output-hk/chore/tsc-alias
LW-10722 chore: add tsc-alias to make dist/esm files imports complient with latest node.js versions
2 parents d6b3c7b + 741d794 commit 2b1ac37

File tree

101 files changed

+276
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+276
-188
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ module.exports = {
5454
'error',
5555
{
5656
paths: ['lodash'],
57-
patterns: ['@cardano-sdk/*/src/*']
57+
patterns: ['@cardano-sdk/*/src/*', 'lodash/*', '!lodash/*.js']
5858
}
5959
],
6060
'no-shadow': 'off',

.github/workflows/continuous-integration-e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: 🔨 Build
5252
run: |
5353
yarn install --immutable --inline-builds --mode=skip-build
54-
yarn build
54+
yarn build:cjs
5555
docker build --no-cache .
5656
env:
5757
NODE_OPTIONS: '--max_old_space_size=8192'

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN yarn --immutable --inline-builds --mode=skip-build
5555
COPY packages packages
5656
RUN \
5757
echo "export const unused = 'unused';" > packages/e2e/src/index.ts &&\
58-
NODE_OPTIONS=--max_old_space_size=10240 yarn build
58+
NODE_OPTIONS=--max_old_space_size=10240 yarn build:cjs
5959

6060
FROM nodejs-builder as cardano-services-production-deps
6161
RUN yarn workspaces focus --all --production

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
],
1212
"scripts": {
1313
"build": "yarn workspaces foreach -v run build",
14+
"build:cjs": "yarn workspaces foreach -v run build:cjs",
1415
"circular-deps:check": "yarn workspaces foreach -v run circular-deps:check",
1516
"cleanup-build": "yarn workspaces foreach -v run cleanup && yarn install && yarn workspaces foreach -v run build",
1617
"reinstall": "yarn workspaces foreach -v run cleanup:nm && yarn install",
@@ -84,6 +85,7 @@
8485
"ts-jest": "^28.0.7",
8586
"ts-node": "^10.0.0",
8687
"ts-node-dev": "^1.1.8",
88+
"tsc-alias": "^1.8.10",
8789
"typedoc": "^0.23.24",
8890
"typedoc-plugin-missing-exports": "^1.0.0",
8991
"typescript": "^4.7.4"

packages/cardano-services-client/package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
},
2121
"license": "Apache-2.0",
2222
"scripts": {
23-
"build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
24-
"build:cjs": "tsc --build src",
25-
"build:version": "bash -c 'if node ./scripts/createVersionSource.js --check ; then node ./scripts/createVersionSource.js --create && yarn lint:fix ; fi && cp ./package.json ./dist/package.json'",
26-
"build": "yarn build:version && run-s build:cjs build:esm module-fixup",
27-
"module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
23+
"build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
24+
"build:cjs": "yarn build:version && tsc --build src && cp ./package.json dist/ && cp ../../build/cjs-package.json ./dist/cjs/package.json",
25+
"build:version": "bash -c 'if node ./scripts/createVersionSource.js --check ; then node ./scripts/createVersionSource.js --create && yarn lint:fix ; fi'",
2826
"tscNoEmit": "echo typescript --noEmit command not implemented yet",
2927
"cleanup:dist": "rm -rf dist",
3028
"circular-deps:check": "madge --circular dist/cjs",
@@ -50,6 +48,7 @@
5048
"madge": "^5.0.1",
5149
"npm-run-all": "^4.1.5",
5250
"ts-jest": "^28.0.7",
51+
"tsc-alias": "^1.8.10",
5352
"typescript": "^4.7.4"
5453
},
5554
"dependencies": {
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
declare module '*.json';
2+
3+
// exclude from build, as it has to be imported at runtime
4+
declare module '../package.json';

packages/cardano-services/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
"sideEffects": false,
2222
"license": "Apache-2.0",
2323
"scripts": {
24-
"build:cjs": "tsc --build src && chmod +x ./dist/cjs/cli.js",
25-
"build:copy-assets": "bash ./copy-assets.sh",
26-
"build": "run-s build:cjs build:copy-assets",
24+
"build": "yarn build:cjs",
25+
"build:cjs": "tsc --build src && chmod +x ./dist/cjs/cli.js && bash ./copy-assets.sh",
2726
"build:test-db": "./test/jest-setup/rebuild-test-db.sh",
2827
"cleanup:dist": "rm -rf dist",
2928
"cleanup:nm": "rm -rf node_modules",

packages/cardano-services/src/Asset/CardanoTokenRegistry.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Logger } from 'ts-log';
44
import { TokenMetadataService } from './types';
55
import { contextLogger } from '@cardano-sdk/util';
66
import axios, { AxiosInstance } from 'axios';
7-
import pick from 'lodash/pick';
7+
import pick from 'lodash/pick.js';
88

99
export const DEFAULT_TOKEN_METADATA_CACHE_TTL = Seconds(10 * 60);
1010
export const DEFAULT_TOKEN_METADATA_REQUEST_TIMEOUT = Milliseconds(3 * 1000);

packages/cardano-services/src/ChainHistory/DbSyncChainHistory/ChainHistoryBuilder.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import {
3939
mapTxTokenMap,
4040
mapWithdrawal
4141
} from './mappers';
42-
import omit from 'lodash/omit';
43-
import orderBy from 'lodash/orderBy';
42+
import omit from 'lodash/omit.js';
43+
import orderBy from 'lodash/orderBy.js';
4444

4545
export class ChainHistoryBuilder {
4646
#db: Pool;

packages/cardano-services/src/ChainHistory/DbSyncChainHistory/DbSyncChainHistoryProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { QueryResult } from 'pg';
1818
import { TxMetadataService } from '../../Metadata';
1919
import { hexStringToBuffer } from '@cardano-sdk/util';
2020
import { mapBlock, mapTxAlonzo, mapTxIn, mapTxOut } from './mappers';
21-
import orderBy from 'lodash/orderBy';
21+
import orderBy from 'lodash/orderBy.js';
2222

2323
/** Properties that are need to create DbSyncChainHistoryProvider */
2424
export interface ChainHistoryProviderProps {

packages/cardano-services/src/NetworkInfo/DbSyncNetworkInfoProvider/DbSyncNetworkInfoProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { Logger } from 'ts-log';
1717
import { NetworkInfoBuilder } from './NetworkInfoBuilder';
1818
import { RunnableModule } from '@cardano-sdk/util';
1919
import { toGenesisParams, toLedgerTip, toProtocolParams, toSupply } from './mappers';
20-
import memoize from 'lodash/memoize';
20+
import memoize from 'lodash/memoize.js';
2121

2222
/** Dependencies that are need to create DbSyncNetworkInfoProvider */
2323
export interface NetworkInfoProviderDependencies extends DbSyncProviderDependencies {

packages/cardano-services/src/Program/programs/providerServer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { createLogger } from 'bunyan';
3838
import { getConnectionConfig, getOgmiosTxSubmitProvider } from '../services';
3939
import { getEntities } from '../../Projection/prepareTypeormProjection';
4040
import { isNotNil } from '@cardano-sdk/util';
41-
import memoize from 'lodash/memoize';
41+
import memoize from 'lodash/memoize.js';
4242

4343
export const ALLOWED_ORIGINS_DEFAULT = false;
4444
export const DISABLE_DB_CACHE_DEFAULT = false;

packages/cardano-services/src/StakePool/DbSyncStakePoolProvider/DbSyncStakePoolProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { PromiseOrValue, RunnableModule, resolveObjectValues } from '@cardano-sd
3333
import { StakePoolBuilder } from './StakePoolBuilder';
3434
import { StakePoolMetadataService } from '../types';
3535
import { toStakePoolResults } from './mappers';
36-
import merge from 'lodash/merge';
36+
import merge from 'lodash/merge.js';
3737

3838
/** Properties that are need to create DbSyncStakePoolProvider */
3939
export interface StakePoolProviderProps {

packages/cardano-services/src/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
},
3131
{
3232
"path": "../../util-rxjs/src"
33-
},
33+
}
3434
]
3535
}

packages/cardano-services/test/StakePool/TypeormStakePoolProvider/TypeormStakePoolProvider.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { getPort } from 'get-port-please';
2424
import { isNotNil } from '@cardano-sdk/util';
2525
import { logger } from '@cardano-sdk/util-dev';
2626
import axios from 'axios';
27-
import lowerCase from 'lodash/lowerCase';
27+
import lowerCase from 'lodash/lowerCase.js';
2828

2929
const UNSUPPORTED_MEDIA_STRING = 'Request failed with status code 415';
3030
const APPLICATION_CBOR = 'application/cbor';

packages/cardano-services/test/data-mocks/tx.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Cardano } from '@cardano-sdk/core';
22
import { Hash28ByteBase16, Hash32ByteBase16 } from '@cardano-sdk/crypto';
33

4-
import merge from 'lodash/merge';
4+
import merge from 'lodash/merge.js';
55

66
export const valueWithCoinOnly: Cardano.Value = {
77
coins: 7_420_514n

packages/core/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
"sideEffects": false,
2121
"license": "Apache-2.0",
2222
"scripts": {
23-
"build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
24-
"build:cjs": "tsc --build src",
25-
"build": "run-s build:cjs build:esm module-fixup",
26-
"module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
23+
"build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
24+
"build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
2725
"tscNoEmit": "echo typescript --noEmit command not implemented yet",
2826
"cleanup:dist": "rm -rf dist",
2927
"cleanup:nm": "rm -rf node_modules",
@@ -44,6 +42,7 @@
4442
"madge": "^5.0.1",
4543
"npm-run-all": "^4.1.5",
4644
"ts-jest": "^28.0.7",
45+
"tsc-alias": "^1.8.10",
4746
"typescript": "^4.7.4"
4847
},
4948
"peerDependencies": {

packages/core/src/Asset/NftMetadata/fromMetadatum.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Logger } from 'ts-log';
77
import { asMetadatumArray, asMetadatumMap } from '../../util/metadatum';
88
import { asString } from './util';
99
import { isNotNil } from '@cardano-sdk/util';
10-
import difference from 'lodash/difference';
10+
import difference from 'lodash/difference.js';
1111

1212
const isString = (obj: unknown): obj is string => typeof obj === 'string';
1313
const VersionRegExp = /^\d+\.?\d?$/;

packages/core/src/Asset/util/subtractTokenMaps.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable complexity,sonarjs/cognitive-complexity */
22
import * as Cardano from '../../Cardano';
3-
import uniq from 'lodash/uniq';
3+
import uniq from 'lodash/uniq.js';
44

55
/**
66
* Given two Cardano.TokenMaps, compute a Cardano.TokenMap with the difference between the left-hand side and the right-hand side.

packages/core/src/Serialization/TransactionWitnessSet/TransactionWitnessSet.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { Redeemers } from './Redeemer';
1010
import { SerializationError, SerializationFailure } from '../../errors';
1111
import { VkeyWitness } from './VkeyWitness';
1212
import { hexToBytes } from '../../util/misc';
13-
import _groupBy from 'lodash/groupBy';
14-
import uniqWith from 'lodash/uniqWith';
13+
import _groupBy from 'lodash/groupBy.js';
14+
import uniqWith from 'lodash/uniqWith.js';
1515

1616
/** This type represents the segregated CDDL scripts. */
1717
type CddlScripts = {

packages/core/src/util/slotCalc.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { CustomError } from 'ts-custom-error';
22
import { EpochNo, NetworkMagics, Slot } from '../Cardano';
33
import { EraSummary } from '../CardanoNode';
44
import { NetworkInfoProvider } from '../Provider/NetworkInfoProvider';
5-
import groupBy from 'lodash/groupBy';
6-
import last from 'lodash/last';
7-
import memoize from 'lodash/memoize';
8-
import orderBy from 'lodash/orderBy';
5+
import groupBy from 'lodash/groupBy.js';
6+
import last from 'lodash/last.js';
7+
import memoize from 'lodash/memoize.js';
8+
import orderBy from 'lodash/orderBy.js';
99

1010
export interface SlotDate {
1111
slot: Slot;

packages/core/src/util/tokenTransferInspector.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { AssetProvider } from '../Provider';
44
import { Inspector, resolveInputs } from './txInspector';
55
import { coalesceValueQuantities } from './coalesceValueQuantities';
66
import { subtractValueQuantities } from './subtractValueQuantities';
7-
import uniq from 'lodash/uniq';
7+
import uniq from 'lodash/uniq.js';
88

99
export type AssetInfoWithAmount = { amount: Cardano.Lovelace; assetInfo: AssetInfo };
1010

packages/core/test/util/slotCalc.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
} from '../../src';
1717
import { fromSerializableObject } from '@cardano-sdk/util';
1818

19-
import merge from 'lodash/merge';
19+
import merge from 'lodash/merge.js';
2020

2121
// Era summaries copied from util-dev package.
2222
// Importing directly from util-dev reports Milliseconds types incompatible.

packages/crypto/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
"sideEffects": false,
2121
"license": "Apache-2.0",
2222
"scripts": {
23-
"build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
24-
"build:cjs": "tsc --build src",
25-
"build": "run-s build:cjs build:esm module-fixup",
23+
"build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
24+
"build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
2625
"circular-deps:check": "madge --circular dist/cjs",
27-
"module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
2826
"tscNoEmit": "echo typescript --noEmit command not implemented yet",
2927
"cleanup:dist": "rm -rf dist",
3028
"cleanup:nm": "rm -rf node_modules",
@@ -48,6 +46,7 @@
4846
"madge": "^5.0.1",
4947
"npm-run-all": "^4.1.5",
5048
"ts-jest": "^28.0.7",
49+
"tsc-alias": "^1.8.10",
5150
"typescript": "^4.7.4"
5251
},
5352
"peerDependencies": {

packages/dapp-connector/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
"sideEffects": false,
2121
"license": "Apache-2.0",
2222
"scripts": {
23-
"build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
24-
"build:cjs": "tsc --build src",
25-
"build": "run-s build:cjs build:esm module-fixup",
23+
"build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
24+
"build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
2625
"circular-deps:check": "madge --circular dist/cjs",
27-
"module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
2826
"tscNoEmit": "echo typescript --noEmit command not implemented yet",
2927
"cleanup:dist": "rm -rf dist",
3028
"cleanup:nm": "rm -rf node_modules",
@@ -48,6 +46,7 @@
4846
"mock-browser": "^0.92.14",
4947
"npm-run-all": "^4.1.5",
5048
"ts-jest": "^28.0.7",
49+
"tsc-alias": "^1.8.10",
5150
"typescript": "^4.7.4"
5251
},
5352
"dependencies": {

packages/e2e/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@
5555
"cardano-services:up": "ts-node --transpile-only ../cardano-services/src/cli.ts start-provider-server",
5656
"cardano-services:up:debug": "npx nodemon --legacy-watch --exec 'node -r ts-node/register --inspect=0.0.0.0:9229 ../cardano-services/src/cli.ts start-provider-server'",
5757
"circular-deps:check": "madge --circular dist/cjs",
58-
"build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
59-
"build:cjs": "tsc --build src",
60-
"build": "run-s build:cjs build:esm module-fixup",
61-
"module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
58+
"build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
59+
"build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
6260
"tscNoEmit": "echo typescript --noEmit command not implemented yet",
6361
"cleanup:dist": "rm -rf dist",
6462
"cleanup:nm": "rm -rf node_modules",
@@ -171,6 +169,7 @@
171169
"readable-stream": "^3.6.0",
172170
"source-map-loader": "^4.0.1",
173171
"ts-jest": "^28.0.7",
172+
"tsc-alias": "^1.8.10",
174173
"typeorm": "^0.3.15",
175174
"typeorm-extension": "^2.7.0",
176175
"typescript": "^4.7.4",

packages/e2e/src/factories.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import { createConnectionObject } from '@cardano-ogmios/client';
5252
import { createStubStakePoolProvider } from '@cardano-sdk/util-dev';
5353
import { filter, firstValueFrom } from 'rxjs';
5454
import DeviceConnection from '@cardano-foundation/ledgerjs-hw-app-cardano';
55-
import memoize from 'lodash/memoize';
55+
import memoize from 'lodash/memoize.js';
5656

5757
const isNodeJs = typeof process !== 'undefined' && process.release?.name === 'node';
5858
// tsc doesn't like the 'import' of this package, works with webpack

packages/e2e/src/util/util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { InitializeTxProps } from '@cardano-sdk/tx-construction';
2323
import { TestWallet, networkInfoProviderFactory } from '../factories';
2424
import { getEnv, walletVariables } from '../environment';
2525
import { logger } from '@cardano-sdk/util-dev';
26-
import sortBy from 'lodash/sortBy';
26+
import sortBy from 'lodash/sortBy.js';
2727

2828
const env = getEnv(walletVariables);
2929

packages/golden-test-generator/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
"sideEffects": false,
2222
"license": "Apache-2.0",
2323
"scripts": {
24-
"build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
25-
"build:cjs": "tsc --build src",
26-
"build": "run-s build:cjs build:esm module-fixup",
24+
"build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
25+
"build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
2726
"circular-deps:check": "madge --circular dist/cjs",
28-
"module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
2927
"tscNoEmit": "echo typescript --noEmit command not implemented yet",
3028
"cleanup:dist": "rm -rf dist",
3129
"cleanup:nm": "rm -rf node_modules",
@@ -60,6 +58,7 @@
6058
"ts-log": "^2.2.3"
6159
},
6260
"devDependencies": {
61+
"@types/clear": "^0.1.4",
6362
"@types/cli-progress": "^3.9.2",
6463
"@types/fs-extra": "^9.0.12",
6564
"@types/object-hash": "^2.1.1",
@@ -70,6 +69,7 @@
7069
"npm-run-all": "^4.1.5",
7170
"pkg": "^5.3.0",
7271
"ts-jest": "^28.0.7",
72+
"tsc-alias": "^1.8.10",
7373
"typescript": "^4.7.4"
7474
},
7575
"pkg": {

packages/golden-test-generator/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import { createLogger } from 'bunyan';
99
import { ensureDir, writeFile } from 'fs-extra';
1010
import { toSerializableObject } from '@cardano-sdk/util';
1111
import chalk from 'chalk';
12+
import clear from 'clear';
1213
import hash from 'object-hash';
1314
import path from 'path';
1415

15-
const clear = require('clear');
1616
const packageJson = require('../../package.json');
1717

1818
clear();

packages/governance/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
"sideEffects": false,
2121
"license": "Apache-2.0",
2222
"scripts": {
23-
"build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
24-
"build:cjs": "tsc --build src",
25-
"build": "run-s build:cjs build:esm module-fixup",
23+
"build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
24+
"build:cjs": "tsc --build src && cp ../../build/cjs-package.json ./dist/cjs/package.json",
2625
"circular-deps:check": "madge --circular dist/cjs",
27-
"module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
2826
"tscNoEmit": "echo typescript --noEmit command not implemented yet",
2927
"cleanup:dist": "rm -rf dist",
3028
"cleanup:nm": "rm -rf node_modules",
@@ -45,6 +43,7 @@
4543
"npm-run-all": "^4.1.5",
4644
"ts-jest": "^28.0.7",
4745
"ts-log": "2.2.4",
46+
"tsc-alias": "^1.8.10",
4847
"typescript": "^4.7.4"
4948
},
5049
"dependencies": {

0 commit comments

Comments
 (0)