From 5e272c360a6c93a107d9154fecc6a25bea3de96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Thu, 18 Nov 2021 21:58:40 +0100 Subject: [PATCH] Only bundle in production --- Makefile | 2 +- jest.config.js | 13 ------------- packages/babel-parser/test/unit/tokenizer/types.js | 2 +- packages/babel-parser/test/unit/util/identifier.js | 2 +- packages/babel-parser/test/unit/util/location.js | 2 +- .../test/util.test.js | 2 +- .../test/util.test.js | 2 +- .../test/util.test.js | 2 +- .../test/normalize-options.spec.js | 4 +++- .../test/normalize-options.spec.js | 4 +++- yarn.lock | 3 +++ 11 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 6936a21e86ae..efb03706a05b 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ NODE := $(YARN) node .PHONY: build build-dist watch lint fix clean test-clean test-only test test-ci publish bootstrap -build: build-bundle +build: build-no-bundle ifneq ("$(BABEL_COVERAGE)", "true") $(MAKE) build-standalone endif diff --git a/jest.config.js b/jest.config.js index 22fd65c51e14..fd11a502d12d 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,17 +1,5 @@ const supportsESM = parseInt(process.versions.node) >= 12; -// These tests files are directly importing `src` files rather than the compiled versions -const importsSrc = [ - "packages/babel-parser/test/unit/tokenizer/types.js", - "packages/babel-parser/test/unit/util/identifier.js", - "packages/babel-parser/test/unit/util/location.js", - "packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.test.js", - "packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.test.js", - "packages/babel-plugin-proposal-optional-chaining/test/util.test.js", - "packages/babel-preset-react/test/normalize-options.spec.js", - "packages/babel-preset-typescript/test/normalize-options.spec.js", -]; - module.exports = { runner: supportsESM ? "./test/jest-light-runner" : "jest-runner", @@ -37,7 +25,6 @@ module.exports = { "/build/", "/.history/", // local directory for VSCode Extension - https://marketplace.visualstudio.com/items?itemName=xyz.local-history "_browser\\.js", - ...(supportsESM ? importsSrc : []), ], testEnvironment: "node", setupFilesAfterEnv: ["/test/testSetupFile.js"], diff --git a/packages/babel-parser/test/unit/tokenizer/types.js b/packages/babel-parser/test/unit/tokenizer/types.js index f242441bd588..0cbcaa8d6fd6 100644 --- a/packages/babel-parser/test/unit/tokenizer/types.js +++ b/packages/babel-parser/test/unit/tokenizer/types.js @@ -1,4 +1,4 @@ -import { tt, tokenOperatorPrecedence } from "../../../src/tokenizer/types.js"; +import { tt, tokenOperatorPrecedence } from "../../../lib/tokenizer/types.js"; describe("token types", () => { it("should check if the binOp for relational === in", () => { diff --git a/packages/babel-parser/test/unit/util/identifier.js b/packages/babel-parser/test/unit/util/identifier.js index c6c25ec942da..6a9b3f7b20fb 100644 --- a/packages/babel-parser/test/unit/util/identifier.js +++ b/packages/babel-parser/test/unit/util/identifier.js @@ -1,7 +1,7 @@ import { isKeyword, keywordRelationalOperator, -} from "../../../src/util/identifier.js"; +} from "../../../lib/util/identifier.js"; describe("identifier", () => { describe("isKeyword", () => { diff --git a/packages/babel-parser/test/unit/util/location.js b/packages/babel-parser/test/unit/util/location.js index 9c8fb79b37a4..463463c88921 100644 --- a/packages/babel-parser/test/unit/util/location.js +++ b/packages/babel-parser/test/unit/util/location.js @@ -1,4 +1,4 @@ -import { getLineInfo } from "../../../src/util/location.js"; +import { getLineInfo } from "../../../lib/util/location.js"; describe("getLineInfo", () => { const input = "a\nb\nc\nd\ne\nf\ng\nh\ni"; diff --git a/packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.test.js b/packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.test.js index f6e9282e42fa..ed7576030378 100644 --- a/packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.test.js +++ b/packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.test.js @@ -1,5 +1,5 @@ import { parseSync, traverse } from "@babel/core"; -import { shouldTransform } from "../src/util.ts"; +import { shouldTransform } from "../lib/util.js"; function getPath(input, parserOpts = {}) { let targetPath; diff --git a/packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.test.js b/packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.test.js index 89bc17afb5d7..e475940c0b31 100644 --- a/packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.test.js +++ b/packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.test.js @@ -1,5 +1,5 @@ import { parseSync, traverse } from "@babel/core"; -import { shouldTransform } from "../src/util.ts"; +import { shouldTransform } from "../lib/util.js"; function getPath(input, parserOpts = {}) { let targetPath; diff --git a/packages/babel-plugin-proposal-optional-chaining/test/util.test.js b/packages/babel-plugin-proposal-optional-chaining/test/util.test.js index d2b8a3d83331..ee3289dcc530 100644 --- a/packages/babel-plugin-proposal-optional-chaining/test/util.test.js +++ b/packages/babel-plugin-proposal-optional-chaining/test/util.test.js @@ -1,4 +1,4 @@ -import { willPathCastToBoolean } from "../src/util.js"; +import { willPathCastToBoolean } from "../lib/util.js"; import { parseSync, traverse } from "@babel/core"; function getPath(input, parserOpts) { diff --git a/packages/babel-preset-react/test/normalize-options.spec.js b/packages/babel-preset-react/test/normalize-options.spec.js index b3e1b8dee390..7ed499820ca7 100644 --- a/packages/babel-preset-react/test/normalize-options.spec.js +++ b/packages/babel-preset-react/test/normalize-options.spec.js @@ -1,4 +1,6 @@ -import normalizeOptions from "../src/normalize-options.js"; +import _normalizeOptions from "../lib/normalize-options.js"; +const normalizeOptions = _normalizeOptions.default; + describe("normalize options", () => { (process.env.BABEL_8_BREAKING ? describe : describe.skip)("Babel 8", () => { it("should throw on unknown options", () => { diff --git a/packages/babel-preset-typescript/test/normalize-options.spec.js b/packages/babel-preset-typescript/test/normalize-options.spec.js index 710c9dc797c6..170fae264259 100644 --- a/packages/babel-preset-typescript/test/normalize-options.spec.js +++ b/packages/babel-preset-typescript/test/normalize-options.spec.js @@ -1,4 +1,6 @@ -import normalizeOptions from "../src/normalize-options.js"; +import _normalizeOptions from "../lib/normalize-options.js"; +const normalizeOptions = _normalizeOptions.default; + describe("normalize options", () => { (process.env.BABEL_8_BREAKING ? describe : describe.skip)("Babel 8", () => { it("should throw on unknown options", () => { diff --git a/yarn.lock b/yarn.lock index 5f94041f4972..2a2f97c68417 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1031,8 +1031,11 @@ __metadata: jest-each: ^27.3.1 jest-mock: ^27.3.0 jest-snapshot: ^27.3.1 + minimatch: ^3.0.4 piscina: ^3.1.0 supports-color: ^9.0.2 + peerDependencies: + "@babel/core": "*" languageName: unknown linkType: soft