Only bundle in production

babel · Nov 18, 2021 · 6b1e33d · 6b1e33d
1 parent 1684596
commit 6b1e33d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 25 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -75,6 +75,7 @@ module.exports = {
           { json: "always", js: "always", cjs: "always", mjs: "always" },
         ],
         "import/no-extraneous-dependencies": "off",
+        "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,8 @@ build-bundle: clean clean-lib
 	$(MAKE) build-flow-typings
 	$(MAKE) build-dist
 
-build-bundle-ci: bootstrap-only
-	$(MAKE) build-bundle
+build-ci: bootstrap-only
+	$(MAKE) build-no-bundle
 
 generate-tsconfig:
 	$(NODE) scripts/generators/tsconfig.js
@@ -46,7 +46,7 @@ build-typescript-legacy-typings:
 
 build-standalone: build-babel-standalone
 
-build-standalone-ci: build-bundle-ci
+build-standalone-ci: build-ci
 	$(MAKE) build-standalone
 
 build-babel-standalone:

diff --git 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 = {
     "<rootDir>/build/",
     "<rootDir>/.history/", // local directory for VSCode Extension - https://marketplace.visualstudio.com/items?itemName=xyz.local-history
     "_browser\\.js",
-    ...(supportsESM ? importsSrc : []),
   ],
   testEnvironment: "node",
   setupFilesAfterEnv: ["<rootDir>/test/testSetupFile.js"],

diff --git 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
@@ -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
@@ -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/...-plugin-bugfix-safari-id-destructuring-collision-in-function-expression/test/util.test.js b/...-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
@@ -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
@@ -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
@@ -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
@@ -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", () => {