Only bundle the release build, and don't import src in tests (#13978)

nicolo-ribaudo · web-flow · commit ad1798ed4825 · 2021-11-24T10:08:53.000-05:00
* Only bundle the release build, and don't import `src` in tests

* Use file extension to signal skipping

* Remove unnecessary config change

* Fix imports
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -67,10 +67,8 @@ module.exports = {
         "jest/no-standalone-expect": "off",
         "jest/no-test-callback": "off",
         "jest/valid-describe": "off",
-        "import/extensions": [
-          "error",
-          { json: "always", js: "always", cjs: "always", mjs: "always" },
-        ],
+        "import/extensions": ["error", "always"],
+        "no-restricted-imports": ["error", { patterns: ["**/src/**"] }],
       },
     },
     {
diff --git 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
@@ -28,8 +28,15 @@ build-bundle: clean clean-lib
 	$(MAKE) build-flow-typings
 	$(MAKE) build-dist
 
-build-bundle-ci: bootstrap-only
-	$(MAKE) build-bundle
+build-no-bundle-ci: bootstrap-only
+	$(YARN) gulp build-dev
+	$(MAKE) build-flow-typings
+	$(MAKE) build-dist
+
+build-no-bundle: clean clean-lib
+	BABEL_ENV=development $(YARN) gulp build-dev
+	$(MAKE) build-flow-typings
+	$(MAKE) build-dist
 
 generate-tsconfig:
 	$(NODE) scripts/generators/tsconfig.js
@@ -46,7 +53,7 @@ build-typescript-legacy-typings:
 
 build-standalone: build-babel-standalone
 
-build-standalone-ci: build-bundle-ci
+build-standalone-ci: build-no-bundle-ci
 	$(MAKE) build-standalone
 
 build-babel-standalone:
@@ -61,12 +68,6 @@ build-plugin-transform-runtime-dist:
 	cd packages/babel-plugin-transform-runtime; \
 	$(NODE) scripts/build-dist.js
 
-build-no-bundle: clean clean-lib
-	BABEL_ENV=development $(YARN) gulp build-dev
-	# Ensure that build artifacts for types are created during local
-	# development too.
-	$(MAKE) build-flow-typings
-
 watch: build-no-bundle
 	BABEL_ENV=development $(YARN) gulp watch
 
diff --git a/eslint/babel-eslint-tests/test/integration/parser-override.js b/eslint/babel-eslint-tests/test/integration/parser-override.js
@@ -34,6 +34,7 @@ describe("parserOverride", () => {
   const babel7node12 = parseInt(process.versions.node) < 12 ? it.skip : it;
   babel7node12("works when parsing in a worker", async () => {
     const require = createRequire(import.meta.url);
+    // eslint-disable-next-line import/extensions
     const babelESLintWorker = require("@babel/eslint-parser/experimental-worker");
 
     const { ast } = babelESLintWorker.parseForESLint(`27`, {
diff --git a/jest.config.js b/jest.config.js
@@ -1,4 +1,5 @@
 const supportsESM = parseInt(process.versions.node) >= 12;
+const isPublishBundle = process.env.IS_PUBLISH;
 
 module.exports = {
   collectCoverageFrom: [
@@ -23,6 +24,9 @@ module.exports = {
     "<rootDir>/build/",
     "<rootDir>/.history/", // local directory for VSCode Extension - https://marketplace.visualstudio.com/items?itemName=xyz.local-history
     "_browser\\.js",
+    // Some tests require internal files of bundled packages, which are not available
+    // in production builds. They are marked using the .skip-bundled.js extension.
+    ...(isPublishBundle ? ["\\.skip-bundled\\.js$"] : []),
   ],
   testEnvironment: "node",
   setupFilesAfterEnv: ["<rootDir>/test/testSetupFile.js"],
diff --git a/packages/babel-parser/test/unit/tokenizer/types.skip-bundled.js b/packages/babel-parser/test/unit/tokenizer/types.skip-bundled.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.skip-bundled.js b/packages/babel-parser/test/unit/util/identifier.skip-bundled.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.skip-bundled.js b/packages/babel-parser/test/unit/util/location.skip-bundled.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.skip-bundled.js b/packages/babel-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.skip-bundled.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.skip-bundled.js b/packages/babel-plugin-bugfix-v8-spread-parameters-in-optional-chaining/test/util.skip-bundled.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.skip-bundled.js b/packages/babel-plugin-proposal-optional-chaining/test/util.skip-bundled.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.skip-bundled.js b/packages/babel-preset-react/test/normalize-options.skip-bundled.js
@@ -1,4 +1,5 @@
-import normalizeOptions from "../src/normalize-options.js";
+import normalizeOptions from "../lib/normalize-options.js";
+
 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.skip-bundled.js b/packages/babel-preset-typescript/test/normalize-options.skip-bundled.js
@@ -1,4 +1,5 @@
-import normalizeOptions from "../src/normalize-options.js";
+import normalizeOptions from "../lib/normalize-options.js";
+
 describe("normalize options", () => {
   (process.env.BABEL_8_BREAKING ? describe : describe.skip)("Babel 8", () => {
     it("should throw on unknown options", () => {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { tt, tokenOperatorPrecedence } from "../../../src/tokenizer/types.js";`
	`1`	`+import { tt, tokenOperatorPrecedence } from "../../../lib/tokenizer/types.js";`
`2`	`2`
`3`	`3`	`describe("token types", () => {`
`4`	`4`	`it("should check if the binOp for relational === in", () => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { getLineInfo } from "../../../src/util/location.js";`
	`1`	`+import { getLineInfo } from "../../../lib/util/location.js";`
`2`	`2`
`3`	`3`	`describe("getLineInfo", () => {`
`4`	`4`	`const input = "a\nb\nc\nd\ne\nf\ng\nh\ni";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { willPathCastToBoolean } from "../src/util.js";`
	`1`	`+import { willPathCastToBoolean } from "../lib/util.js";`
`2`	`2`	`import { parseSync, traverse } from "@babel/core";`
`3`	`3`
`4`	`4`	`function getPath(input, parserOpts) {`