Skip to content

Commit

Permalink
Rename proposal-json-modules to transform-json-modules (#16924)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolo-ribaudo authored Oct 24, 2024
1 parent b8002e2 commit a7f2c6f
Show file tree
Hide file tree
Showing 120 changed files with 94 additions and 89 deletions.
1 change: 1 addition & 0 deletions .github/workflows/reminders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ jobs:
```
npm deprecate @babel/plugin-proposal-duplicate-named-capturing-groups-regex "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-duplicate-named-capturing-groups-regex instead."
npm deprecate @babel/plugin-proposal-regexp-modifiers "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-regexp-modifiers instead."
npm deprecate @babel/plugin-proposal-json-modules "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-json-modules instead."
```
19 changes: 0 additions & 19 deletions packages/babel-plugin-proposal-json-modules/README.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

19 changes: 19 additions & 0 deletions packages/babel-plugin-transform-json-modules/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# @babel/plugin-transform-json-modules

> Transform json modules imports (`import '...' with { type: 'json' }`) to work in browsers and Node.js.
See our website [@babel/plugin-transform-json-modules](https://babeljs.io/docs/babel-plugin-transform-json-modules) for more information.

## Install

Using npm:

```sh
npm install --save-dev @babel/plugin-transform-json-modules
```

or using yarn:

```sh
yarn add @babel/plugin-transform-json-modules --dev
```
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@babel/plugin-proposal-json-modules",
"name": "@babel/plugin-transform-json-modules",
"version": "7.25.9",
"description": "Transform json modules imports (`import '...' with { type: 'json' }`) to work in browsers and Node.js.",
"repository": {
"type": "git",
"url": "https://github.com/babel/babel.git",
"directory": "packages/babel-plugin-proposal-json-modules"
"directory": "packages/babel-plugin-transform-json-modules"
},
"homepage": "https://babel.dev/docs/en/next/babel-plugin-proposal-json-modules",
"homepage": "https://babel.dev/docs/en/next/babel-plugin-transform-json-modules",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default declare((api, options: Options) => {
return (helperESM ??= importToPlatformApi(targets, transformers, false));
}
throw new Error(
`@babel/plugin-proposal-json-modules can only be used when not ` +
`@babel/plugin-transform-json-modules can only be used when not ` +
`compiling modules, or when compiling them to CommonJS.`,
);
};
Expand All @@ -58,7 +58,7 @@ export default declare((api, options: Options) => {
}

return {
name: "proposal-json-modules",
name: "transform-json-modules",

inherits: syntaxImportAttributes,

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sourceType": "module",
"targets": { "firefox": "110", "node": "20.6" },
"plugins": ["proposal-json-modules"]
"plugins": ["transform-json-modules"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sourceType": "module",
"targets": { "firefox": "110" },
"plugins": ["transform-json-modules", "transform-modules-commonjs"]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sourceType": "module",
"targets": { "firefox": "110" },
"plugins": ["proposal-json-modules"]
"plugins": ["transform-json-modules"]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sourceType": "module",
"plugins": ["proposal-json-modules", "syntax-import-defer"],
"plugins": ["transform-json-modules", "syntax-import-defer"],
"throws": "JSON modules do not support phase modifiers."
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sourceType": "module",
"plugins": ["proposal-json-modules"],
"plugins": ["transform-json-modules"],
"throws": "Unknown attribute for JSON modules."
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sourceType": "module",
"plugins": ["proposal-json-modules", "syntax-import-source"],
"plugins": ["transform-json-modules", "syntax-import-source"],
"throws": "JSON modules do not support phase modifiers."
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceType": "module",
"targets": { "firefox": "41" },
"plugins": [
"proposal-json-modules",
"transform-json-modules",
["babel-plugin-polyfill-corejs3", { "method": "usage-pure" }]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sourceType": "module",
"targets": { "node": "20.6" },
"plugins": ["transform-json-modules", "transform-modules-commonjs"]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sourceType": "module",
"targets": { "node": "20.6" },
"plugins": ["proposal-json-modules"]
"plugins": ["transform-json-modules"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceType": "module",
"targets": { "firefox": "110", "node": "16" },
"plugins": [
["proposal-json-modules", { "uncheckedRequire": true }],
["transform-json-modules", { "uncheckedRequire": true }],
"transform-modules-commonjs"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sourceType": "module",
"targets": { "firefox": "110", "node": "16" },
"plugins": [["proposal-json-modules", { "uncheckedRequire": true }]]
"plugins": [["transform-json-modules", { "uncheckedRequire": true }]]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceType": "module",
"targets": { "firefox": "110" },
"plugins": [
["proposal-json-modules", { "uncheckedRequire": true }],
["transform-json-modules", { "uncheckedRequire": true }],
"transform-modules-commonjs"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sourceType": "module",
"targets": { "firefox": "110" },
"plugins": [["transform-json-modules", { "uncheckedRequire": true }]]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"sourceType": "module",
"targets": { "node": "16" },
"plugins": [
["proposal-json-modules", { "uncheckedRequire": true }],
["transform-json-modules", { "uncheckedRequire": true }],
"transform-modules-commonjs"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sourceType": "module",
"targets": { "node": "16" },
"plugins": [["transform-json-modules", { "uncheckedRequire": true }]]
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"../../tsconfig.paths.json"
],
"include": [
"../../packages/babel-plugin-proposal-json-modules/src/**/*.ts",
"../../packages/babel-plugin-transform-json-modules/src/**/*.ts",
"../../lib/globals.d.ts",
"../../scripts/repo-utils/*.d.ts"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-standalone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"@babel/plugin-proposal-function-bind": "workspace:^",
"@babel/plugin-proposal-function-sent": "workspace:^",
"@babel/plugin-proposal-import-defer": "workspace:^",
"@babel/plugin-proposal-json-modules": "workspace:^",
"@babel/plugin-proposal-optional-chaining-assign": "workspace:^",
"@babel/plugin-proposal-pipeline-operator": "workspace:^",
"@babel/plugin-proposal-record-and-tuple": "workspace:^",
Expand Down Expand Up @@ -67,6 +66,7 @@
"@babel/plugin-transform-function-name": "workspace:^",
"@babel/plugin-transform-instanceof": "workspace:^",
"@babel/plugin-transform-jscript": "workspace:^",
"@babel/plugin-transform-json-modules": "workspace:^",
"@babel/plugin-transform-json-strings": "workspace:^",
"@babel/plugin-transform-literals": "workspace:^",
"@babel/plugin-transform-logical-assignment-operators": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-standalone/scripts/pluginConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"transform-function-name",
"transform-instanceof",
"transform-jscript",
"transform-json-modules",
"transform-literals",
"transform-member-expression-literals",
"transform-modules-amd",
Expand Down Expand Up @@ -118,7 +119,6 @@
"transform-unicode-escapes",
"transform-unicode-regex",
"proposal-explicit-resource-management",
"proposal-import-defer",
"proposal-json-modules"
"proposal-import-defer"
]
}
6 changes: 3 additions & 3 deletions packages/babel-standalone/src/generated/plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import transformForOf from "@babel/plugin-transform-for-of";
import transformFunctionName from "@babel/plugin-transform-function-name";
import transformInstanceof from "@babel/plugin-transform-instanceof";
import transformJscript from "@babel/plugin-transform-jscript";
import transformJsonModules from "@babel/plugin-transform-json-modules";
import transformLiterals from "@babel/plugin-transform-literals";
import transformMemberExpressionLiterals from "@babel/plugin-transform-member-expression-literals";
import transformModulesAmd from "@babel/plugin-transform-modules-amd";
Expand Down Expand Up @@ -103,7 +104,6 @@ import transformUnicodeEscapes from "@babel/plugin-transform-unicode-escapes";
import transformUnicodeRegex from "@babel/plugin-transform-unicode-regex";
import proposalExplicitResourceManagement from "@babel/plugin-proposal-explicit-resource-management";
import proposalImportDefer from "@babel/plugin-proposal-import-defer";
import proposalJsonModules from "@babel/plugin-proposal-json-modules";
export const syntaxAsyncGenerators = makeNoopPlugin(),
syntaxClassProperties = makeNoopPlugin(),
syntaxClassStaticBlock = makeNoopPlugin(),
Expand Down Expand Up @@ -175,6 +175,7 @@ export {
transformFunctionName,
transformInstanceof,
transformJscript,
transformJsonModules,
transformLiterals,
transformMemberExpressionLiterals,
transformModulesAmd,
Expand Down Expand Up @@ -212,7 +213,6 @@ export {
transformUnicodeRegex,
proposalExplicitResourceManagement,
proposalImportDefer,
proposalJsonModules,
};
export const all: { [k: string]: any } = {
"syntax-async-generators": syntaxAsyncGenerators,
Expand Down Expand Up @@ -286,6 +286,7 @@ export const all: { [k: string]: any } = {
"transform-function-name": transformFunctionName,
"transform-instanceof": transformInstanceof,
"transform-jscript": transformJscript,
"transform-json-modules": transformJsonModules,
"transform-literals": transformLiterals,
"transform-member-expression-literals": transformMemberExpressionLiterals,
"transform-modules-amd": transformModulesAmd,
Expand Down Expand Up @@ -324,5 +325,4 @@ export const all: { [k: string]: any } = {
"transform-unicode-regex": transformUnicodeRegex,
"proposal-explicit-resource-management": proposalExplicitResourceManagement,
"proposal-import-defer": proposalImportDefer,
"proposal-json-modules": proposalJsonModules,
};
2 changes: 1 addition & 1 deletion packages/babel-standalone/src/preset-stage-3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default (_: any, opts: any = {}) => {
},
],
babelPlugins.proposalExplicitResourceManagement,
babelPlugins.proposalJsonModules,
// These are Stage 4
...(process.env.BABEL_8_BREAKING
? []
Expand All @@ -29,6 +28,7 @@ export default (_: any, opts: any = {}) => {
[babelPlugins.transformNullishCoalescingOperator, { loose }],
[babelPlugins.transformClassProperties, { loose }],
babelPlugins.transformJsonStrings,
babelPlugins.transformJsonModules,
babelPlugins.transformNumericSeparator,
[babelPlugins.transformPrivateMethods, { loose }],
babelPlugins.transformPrivatePropertyInObject,
Expand Down
6 changes: 3 additions & 3 deletions packages/babel-standalone/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
{
"path": "../../packages/babel-plugin-proposal-import-defer"
},
{
"path": "../../packages/babel-plugin-proposal-json-modules"
},
{
"path": "../../packages/babel-plugin-proposal-optional-chaining-assign"
},
Expand Down Expand Up @@ -176,6 +173,9 @@
{
"path": "../../packages/babel-plugin-transform-jscript"
},
{
"path": "../../packages/babel-plugin-transform-json-modules"
},
{
"path": "../../packages/babel-plugin-transform-json-strings"
},
Expand Down
4 changes: 4 additions & 0 deletions scripts/integration-tests/e2e-babel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ startLocalRegistry "$PWD"/scripts/integration-tests/verdaccio-config.yml
node "$PWD"/scripts/integration-tests/utils/bump-babel-dependencies.js
export YARN_ENABLE_IMMUTABLE_INSTALLS=false

# This packages has been renamed
sed -i 's/proposal-json-modules/transform-json-modules/g' package.json
sed -i 's/proposal-json-modules/transform-json-modules/g' babel.config.js

if [ "$BABEL_8_BREAKING" = true ] ; then
# This option is removed in Babel 8
sed -i 's/allowDeclareFields: true,\?/\/* allowDeclareFields: true *\//g' babel.config.js
Expand Down
2 changes: 1 addition & 1 deletion test/babel-7-8-compat/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"babel-plugin-proposal-explicit-resource-management",
"babel-plugin-proposal-import-attributes-to-assertions",
"babel-plugin-proposal-import-wasm-source",
"babel-plugin-proposal-json-modules",
"babel-plugin-transform-json-modules",
"babel-plugin-syntax-decorators",
"babel-plugin-syntax-explicit-resource-management",
"babel-plugin-syntax-import-source",
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,6 @@
{
"path": "./packages/babel-plugin-proposal-import-wasm-source"
},
{
"path": "./packages/babel-plugin-proposal-json-modules"
},
{
"path": "./packages/babel-plugin-proposal-optional-chaining-assign"
},
Expand Down Expand Up @@ -319,6 +316,9 @@
{
"path": "./packages/babel-plugin-transform-jscript"
},
{
"path": "./packages/babel-plugin-transform-json-modules"
},
{
"path": "./packages/babel-plugin-transform-json-strings"
},
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.paths.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@
"@babel/plugin-proposal-import-wasm-source": [
"./packages/babel-plugin-proposal-import-wasm-source/src"
],
"@babel/plugin-proposal-json-modules": [
"./packages/babel-plugin-proposal-json-modules/src"
],
"@babel/plugin-proposal-optional-chaining-assign": [
"./packages/babel-plugin-proposal-optional-chaining-assign/src"
],
Expand Down Expand Up @@ -308,6 +305,9 @@
"@babel/plugin-transform-jscript": [
"./packages/babel-plugin-transform-jscript/src"
],
"@babel/plugin-transform-json-modules": [
"./packages/babel-plugin-transform-json-modules/src"
],
"@babel/plugin-transform-json-strings": [
"./packages/babel-plugin-transform-json-strings/src"
],
Expand Down
Loading

0 comments on commit a7f2c6f

Please sign in to comment.