Skip to content

Commit 1498131

Browse files
committed
ci: revert to older version of chalk to avoid ESM import issue in jest
1 parent 3c99024 commit 1498131

File tree

21 files changed

+48
-50
lines changed

21 files changed

+48
-50
lines changed

jest.config.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** @type {import('@jest/types').Config.InitialOptions} */
2-
module.exports = {
2+
export default {
33
preset: 'ts-jest',
44
collectCoverage: true,
55
coverageProvider: 'v8',
@@ -14,9 +14,6 @@ module.exports = {
1414
"packages/vscode-extension"
1515
],
1616
transform: {
17-
'^.+\\.ts$': ['ts-jest', { isolatedModules: true, esModuleInterop: true }]
18-
},
19-
transformIgnorePatterns: [
20-
"/node_modules/"
21-
]
17+
'^.+\\.ts$': ['ts-jest', { esModuleInterop: true, isolatedModules: true }]
18+
}
2219
};

packages/apex/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [

packages/apex/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"Grammar"
1111
],
1212
"main": "src/index.ts",
13+
"module": "dist/index.ts",
14+
"type": "module",
1315
"publishConfig": {
1416
"main": "dist/index.cjs",
1517
"module": "dist/index.mjs",

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@vlocode/util": "workspace:*",
6060
"@vlocode/vlocity": "workspace:*",
6161
"@vlocode/vlocity-deploy": "workspace:*",
62-
"chalk": "^5.4.1",
62+
"chalk": "^4.1.2",
6363
"commander": "^11.1.0",
6464
"esbuild": "^0.25.4",
6565
"esbuild-loader": "^4.3.0",

packages/core/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [

packages/core/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"version": "1.28.2",
44
"description": "Vlocode core IoC container framework library",
55
"main": "src/index.ts",
6+
"module": "dist/index.ts",
7+
"type": "module",
68
"publishConfig": {
79
"main": "dist/index.cjs",
810
"module": "dist/index.mjs",
@@ -55,7 +57,7 @@
5557
},
5658
"dependencies": {
5759
"@vlocode/util": "workspace:*",
58-
"chalk": "^5.4.1",
60+
"chalk": "^4.1.2",
5961
"fast-glob": "^3.3.3",
6062
"luxon": "^3.4.4",
6163
"memfs": "^4.17.0",

packages/core/src/logging/writers/fancyConsoleWriter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { LogWriter, LogEntry, LogLevel } from '..';
2-
import { Chalk } from 'chalk';
2+
import chalk from 'chalk';
33
import { DateTime } from 'luxon';
44

55
export class FancyConsoleWriterOptions {
@@ -12,7 +12,7 @@ export class FancyConsoleWriterOptions {
1212
export class FancyConsoleWriter implements LogWriter {
1313

1414
private readonly options: FancyConsoleWriterOptions;
15-
private readonly chalk = new Chalk({ level: 2 });
15+
private readonly chalk = new chalk.Instance({ level: 2 });
1616
private readonly colors = {
1717
[LogLevel.debug]: this.chalk.magenta,
1818
[LogLevel.verbose]: this.chalk.dim,

packages/core/src/logging/writers/terminalWriter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type * as vscode from 'vscode';
2-
import { Chalk } from 'chalk';
2+
import chalk from 'chalk';
33
import { DateTime } from 'luxon';
44
import { LogLevel, LogWriter, LogEntry } from '../../logging';
55

@@ -18,7 +18,7 @@ export class TerminalWriter implements LogWriter {
1818
private terminalWatchdog? : any;
1919
private isOpened = false;
2020
private readonly queuedMessages : LogEntry[] = [];
21-
private readonly chalk = new Chalk({ level: 2 });
21+
private readonly chalk = new chalk.Instance({ level: 2 });
2222
// eslint-disable-next-line @typescript-eslint/no-require-imports
2323
private readonly vscode: typeof vscode = require('vscode');
2424
private readonly colors = {

packages/omniscript/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [

packages/omniscript/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"OmniStudio"
1010
],
1111
"main": "src/index.ts",
12+
"module": "dist/index.ts",
13+
"type": "module",
1214
"publishConfig": {
1315
"main": "dist/index.cjs",
1416
"module": "dist/index.mjs",

packages/salesforce/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [

packages/salesforce/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"Salesforce"
77
],
88
"main": "src/index.ts",
9+
"module": "dist/index.ts",
10+
"type": "module",
911
"publishConfig": {
1012
"main": "dist/index.cjs",
1113
"module": "dist/index.mjs",
@@ -70,7 +72,7 @@
7072
"dependencies": {
7173
"@vlocode/core": "workspace:*",
7274
"@vlocode/util": "workspace:*",
73-
"chalk": "^5.4.1",
75+
"chalk": "^4.1.2",
7476
"csv-parse": "^5.6.0",
7577
"fs-extra": "^11.0",
7678
"jsforce": "1.11.0",

packages/util/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [

packages/util/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"version": "1.28.2",
44
"description": "Vlocode utility library",
55
"main": "src/index.ts",
6+
"module": "dist/index.ts",
7+
"type": "module",
68
"publishConfig": {
79
"main": "dist/index.cjs",
810
"module": "dist/index.mjs",
@@ -58,7 +60,7 @@
5860
"dependencies": {
5961
"@salesforce/core": "3.31.18",
6062
"@xmldom/xmldom": "^0.9",
61-
"fast-xml-parser": "^4.4.1",
63+
"fast-xml-parser": "^4.1.2",
6264
"fs-extra": "^11.0",
6365
"open": "^8.2.1",
6466
"optional-require": "^1.1.7",

packages/vlocity-deploy/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [

packages/vlocity-deploy/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"Deployment"
1010
],
1111
"main": "src/index.ts",
12+
"module": "dist/index.ts",
13+
"type": "module",
1214
"publishConfig": {
1315
"main": "dist/index.cjs",
1416
"module": "dist/index.mjs",

packages/vlocity/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [

packages/vlocity/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
"Datapacks"
99
],
1010
"main": "src/index.ts",
11+
"module": "dist/index.ts",
12+
"type": "module",
1113
"publishConfig": {
1214
"main": "dist/index.cjs",
1315
"module": "dist/index.mjs",
@@ -62,7 +64,7 @@
6264
"@vlocode/core": "workspace:*",
6365
"@vlocode/salesforce": "workspace:*",
6466
"@vlocode/util": "workspace:*",
65-
"chalk": "^5.4.1"
67+
"chalk": "^4.1.2"
6668
},
6769
"publisher": "curlybracket",
6870
"gitHead": "f16fa9dcbf7ef17328047ecb07ab4a7e6a94140a"

packages/vscode-extension/jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
roots: [ 'src' ],
44
collectCoverageFrom: [
@@ -7,7 +7,7 @@ module.exports = {
77
],
88
testRegex: "(\\.)(test)\\.[jt]sx?$",
99
transform: {
10-
'^.+\\.ts$': ['ts-jest', { isolatedModules: true, esModuleInterop: true }],
10+
'^.+\\.ts$': ['ts-jest', { esModuleInterop: true, isolatedModules: true }],
1111
'\\.yaml$': '<rootDir>/webpack/loaders/yaml.js'
1212
},
1313
moduleNameMapper: {

packages/vscode-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@
15261526
"@vlocode/vlocity-deploy": "workspace:*",
15271527
"@vscode/test-electron": "^2.3.8",
15281528
"@vscode/vsce": "^3.4.1",
1529-
"chalk": "^5.4.1",
1529+
"chalk": "^4.1.2",
15301530
"copy-webpack-plugin": "^9.1.0",
15311531
"esbuild-loader": "^4.3.0",
15321532
"escape-string-regexp": "^4.0.0",

pnpm-lock.yaml

Lines changed: 12 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)