Skip to content

Commit dc5429e

Browse files
authored
chore: remove custom babel plugin for stripping namespaces (#10729)
1 parent 132e3d1 commit dc5429e

File tree

13 files changed

+21
-23
lines changed

13 files changed

+21
-23
lines changed

babel.config.js

+11-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,22 @@ module.exports = {
1717
overrides: [
1818
{
1919
plugins: [
20-
'babel-plugin-typescript-strip-namespaces',
2120
'babel-plugin-replace-ts-export-assignment',
2221
require.resolve(
2322
'./scripts/babel-plugin-jest-replace-ts-require-assignment.js',
2423
),
2524
],
26-
presets: ['@babel/preset-typescript'],
25+
presets: [
26+
[
27+
'@babel/preset-typescript',
28+
{
29+
// will be the default in Babel 8, so let's just turn it on now
30+
allowDeclareFields: true,
31+
// will be default in the future, but we don't want to use it
32+
allowNamespaces: false,
33+
},
34+
],
35+
],
2736
test: /\.tsx?$/,
2837
},
2938
// we want this file to keep `import()`, so exclude the transform for it

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"ansi-styles": "^4.2.0",
2626
"babel-eslint": "^10.0.3",
2727
"babel-plugin-replace-ts-export-assignment": "^0.0.2",
28-
"babel-plugin-typescript-strip-namespaces": "^1.1.1",
2928
"camelcase": "^6.0.0",
3029
"chalk": "^4.0.0",
3130
"chokidar": "^3.3.0",

packages/expect/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ expect.extractExpectedAssertionsErrors = extractExpectedAssertionsErrors;
421421

422422
const expectExport = expect as Expect;
423423

424-
namespace expectExport {
424+
declare namespace expectExport {
425425
export type MatcherState = JestMatcherState;
426426
export interface Matchers<R> extends MatcherInterface<R> {}
427427
}

packages/jest-haste-map/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ type Watcher = {
104104
type WorkerInterface = {worker: typeof worker; getSha1: typeof getSha1};
105105

106106
// TODO: Ditch namespace when this module exports ESM
107-
namespace HasteMap {
107+
declare namespace HasteMap {
108108
export type ModuleMap = HasteModuleMap;
109109
export type SerializableModuleMap = HasteSerializableModuleMap;
110110
export type FS = HasteFS;

packages/jest-jasmine2/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ const addSnapshotData = (
220220
return results;
221221
};
222222

223-
namespace jasmine2 {
223+
declare namespace jasmine2 {
224224
export type Jasmine = JestJasmine;
225225
}
226226

packages/jest-mock/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
type Global = NodeJS.Global; // | Window – add once TS improves typings;
1111

12-
namespace JestMock {
12+
declare namespace JestMock {
1313
export type ModuleMocker = ModuleMockerClass;
1414
export type MockFunctionMetadataType =
1515
| 'object'

packages/jest-resolve-dependencies/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {FS as HasteFS} from 'jest-haste-map';
1111
import type {ResolveModuleConfig, ResolverType} from 'jest-resolve';
1212
import {SnapshotResolver, isSnapshotPath} from 'jest-snapshot';
1313

14-
namespace DependencyResolver {
14+
declare namespace DependencyResolver {
1515
export type ResolvedModule = {
1616
file: Config.Path;
1717
dependencies: Array<Config.Path>;

packages/jest-resolve/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type FindNodeModuleConfig = {
3434
// TODO: replace with a Map in Jest 26
3535
type BooleanObject = Record<string, boolean>;
3636

37-
namespace Resolver {
37+
declare namespace Resolver {
3838
export type ResolveModuleConfig = {
3939
skipNodeResolution?: boolean;
4040
paths?: Array<Config.Path>;

packages/jest-runner/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface WorkerInterface extends Worker {
3434
worker: typeof worker;
3535
}
3636

37-
namespace TestRunner {
37+
declare namespace TestRunner {
3838
export type Test = JestTest;
3939
export type OnTestFailure = JestOnTestFailure;
4040
export type OnTestStart = JestOnTestStart;

packages/jest-runtime/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ const fromEntries: typeof Object.fromEntries =
107107
}, {});
108108
};
109109

110-
namespace Runtime {
110+
declare namespace Runtime {
111111
export type Context = JestContext;
112112
// ditch this export when moving to esm - for now we need it for to avoid faulty type elision
113113
export type RuntimeType = Runtime;

packages/jest-snapshot/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ const JestSnapshot = {
560560
utils,
561561
};
562562

563-
namespace JestSnapshot {
563+
declare namespace JestSnapshot {
564564
export type SnapshotResolver = JestSnapshotResolver;
565565
export type SnapshotStateType = SnapshotState;
566566
}

packages/pretty-format/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ prettyFormat.plugins = {
530530
ReactTestComponent,
531531
};
532532

533-
namespace prettyFormat {
533+
declare namespace prettyFormat {
534534
export type Colors = PrettyFormat.Colors;
535535
export type Config = PrettyFormat.Config;
536536
export type Options = PrettyFormat.Options;

yarn.lock

-10
Original file line numberDiff line numberDiff line change
@@ -4839,15 +4839,6 @@ __metadata:
48394839
languageName: node
48404840
linkType: hard
48414841

4842-
"babel-plugin-typescript-strip-namespaces@npm:^1.1.1":
4843-
version: 1.1.1
4844-
resolution: "babel-plugin-typescript-strip-namespaces@npm:1.1.1"
4845-
peerDependencies:
4846-
"@babel/core": ^7.0.0
4847-
checksum: f0e59ea0d37bcf98cc7891db8f6089b1a1f2607e43ddc6a8c6b19ed782f1277f8f46998267e8ab636c12f8d0ed70194fb0a84ab610f4df463e1712e493002ee9
4848-
languageName: node
4849-
linkType: hard
4850-
48514842
"babel-preset-current-node-syntax@npm:^0.1.3":
48524843
version: 0.1.4
48534844
resolution: "babel-preset-current-node-syntax@npm:0.1.4"
@@ -17152,7 +17143,6 @@ fsevents@^1.2.7:
1715217143
ansi-styles: ^4.2.0
1715317144
babel-eslint: ^10.0.3
1715417145
babel-plugin-replace-ts-export-assignment: ^0.0.2
17155-
babel-plugin-typescript-strip-namespaces: ^1.1.1
1715617146
camelcase: ^6.0.0
1715717147
chalk: ^4.0.0
1715817148
chokidar: ^3.3.0

0 commit comments

Comments
 (0)