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.

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

chore: Ensure the same babel config is used across the project in a non conflicting way #5865

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 32 additions & 1 deletion web/babel.config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
{
"presets": ["@babel/preset-env", "@babel/preset-react"]
"presets": [
[
"@babel/preset-react",
{
"runtime": "automatic"
}
],
"@babel/preset-typescript",
[
"@babel/preset-env",
{
"targets": {
"browsers": [
"last 2 Chrome versions"
],
"node": "current"
}
}
]
],
"plugins": [
[
"babel-plugin-import",
{
"libraryName": "antd"
}
],
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-private-methods",
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator"
]
}
2 changes: 1 addition & 1 deletion web/dist/apps/labelstudio/main.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions web/dist/apps/labelstudio/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"message": "Merge branch 'develop' into fb-dia-989/hotkeys-stuck",
"commit": "cb6e68bc71dc0063679c60ac7d0ced52c1efd53a",
"date": "2024-05-08T20:42:38.000Z",
"branch": "fb-dia-989/hotkeys-stuck"
"message": "chore: Ensure the same babel config is used across the project in a non conflicting way",
"commit": "82d5afa6b647175e86c1bd9f1d2b8578c19ce971",
"date": "2024-05-09T11:31:34.000Z",
"branch": "fix-dev-babel"
}
23 changes: 0 additions & 23 deletions web/dist/libs/datamanager/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -208,29 +208,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


core-js
MIT
Copyright (c) 2014-2023 Denis Pushkarev

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


date-fns
MIT
MIT License
Expand Down
2 changes: 1 addition & 1 deletion web/dist/libs/datamanager/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/dist/libs/datamanager/main.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions web/dist/libs/datamanager/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"message": "Merge branch 'develop' into fb-dia-989/hotkeys-stuck",
"commit": "cb6e68bc71dc0063679c60ac7d0ced52c1efd53a",
"date": "2024-05-08T20:42:38.000Z",
"branch": "fb-dia-989/hotkeys-stuck"
"message": "chore: Ensure the same babel config is used across the project in a non conflicting way",
"commit": "82d5afa6b647175e86c1bd9f1d2b8578c19ce971",
"date": "2024-05-09T11:31:34.000Z",
"branch": "fix-dev-babel"
}
2 changes: 1 addition & 1 deletion web/dist/libs/editor/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/dist/libs/editor/main.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions web/dist/libs/editor/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"message": "Merge branch 'develop' into fb-dia-989/hotkeys-stuck",
"commit": "cb6e68bc71dc0063679c60ac7d0ced52c1efd53a",
"date": "2024-05-08T20:42:38.000Z",
"branch": "fb-dia-989/hotkeys-stuck"
"message": "chore: Ensure the same babel config is used across the project in a non conflicting way",
"commit": "82d5afa6b647175e86c1bd9f1d2b8578c19ce971",
"date": "2024-05-09T11:31:34.000Z",
"branch": "fix-dev-babel"
}
12 changes: 0 additions & 12 deletions web/libs/datamanager/.babelrc

This file was deleted.

5 changes: 4 additions & 1 deletion web/libs/datamanager/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"defaultConfiguration": "production",
"options": {
"compiler": "babel",
"babelConfig": "babel.config.json",
"webpackConfig": "webpack.config.js",
"tsConfig": "libs/datamanager/tsconfig.lib.json",
"main": "libs/datamanager/src/index.js",
Expand All @@ -34,7 +35,9 @@
},
"unit": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": {
"jestConfig": "libs/datamanager/jest.config.ts",
"passWithNoTests": true
Expand Down
27 changes: 0 additions & 27 deletions web/libs/editor/.babelrc

This file was deleted.

5 changes: 4 additions & 1 deletion web/libs/editor/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"defaultConfiguration": "production",
"options": {
"compiler": "babel",
"babelConfig": "babel.config.json",
"webpackConfig": "webpack.config.js",
"index": "libs/editor/public/index.html",
"tsConfig": "libs/editor/tsconfig.lib.json",
Expand Down Expand Up @@ -58,7 +59,9 @@
},
"unit": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": {
"jestConfig": "libs/editor/jest.config.js",
"passWithNoTests": true
Expand Down
24 changes: 0 additions & 24 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,30 +215,6 @@
"@babel/traverse": "^7.24.1",
"ip": ">=2.0.1"
},
"babel": {
"presets": [
[
"@babel/preset-react",
{
"runtime": "automatic"
}
],
"@babel/preset-typescript",
[
"@babel/preset-env",
{
"targets": {
"browsers": ["last 2 Chrome versions"]
}
}
]
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-proposal-nullish-coalescing-operator"
]
},
"copyFiles": [
{
"from": "./node_modules/@martel/audio-file-decoder/decode-audio.wasm",
Expand Down
Loading