cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Transform cwd in string literal on win32 (#11297)

Browse Source 
* chore: replace win32 cwd in string literal by <CWD>

* chore: update test fixtures
This commit is contained in:
Huáng Jùnliàng 2020-03-20 18:59:02 -04:00 committed by GitHub
parent ebca5807dc
commit 469e8ed591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/babel-helper-transform-fixture-test-runner/src/index.js
View File

@ -297,19 +297,24 @@ function validateFile(actualCode, expectedLoc, expectedCode) {
} }
function normalizeOutput(code) { function normalizeOutput(code) {
const projectRoot = path.resolve(__dirname, "../../../");
const cwdSymbol = "<CWD>";
let result = code let result = code
.trim() .trim()
.replace( // (non-win32) /foo/babel/packages -> <CWD>/packages
new RegExp(escapeRegExp(path.resolve(__dirname, "../../../")), "g"), // (win32) C:\foo\babel\packages -> <CWD>\packages
"<CWD>", .replace(new RegExp(escapeRegExp(projectRoot), "g"), cwdSymbol);
);
if (process.platform === "win32") { if (process.platform === "win32") {
result = result.replace( result = result
new RegExp( // C:/foo/babel/packages -> <CWD>/packages
escapeRegExp(path.resolve(__dirname, "../../../").replace(/\\/g, "/")), .replace(
"g", new RegExp(escapeRegExp(projectRoot.replace(/\\/g, "/")), "g"),
), cwdSymbol,
"<CWD>", )
// C:\\foo\\babel\\packages -> <CWD>\\packages (in js string literal)
.replace(
new RegExp(escapeRegExp(projectRoot.replace(/\\/g, "\\\\")), "g"),
cwdSymbol,
); );
} }
return result; return result;

2
packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/auto-import-dev-windows/output.mjs vendored
View File

@ -1,7 +1,7 @@
import { createElement as _createElement } from "react"; import { createElement as _createElement } from "react";
import { jsxDEV as _jsxDEV } from "react/jsx-dev-runtime"; import { jsxDEV as _jsxDEV } from "react/jsx-dev-runtime";
import { Fragment as _Fragment } from "react/jsx-dev-runtime"; import { Fragment as _Fragment } from "react/jsx-dev-runtime";
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\auto-import-dev-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\auto-import-dev-windows\\input.js";
var x = /*#__PURE__*/_jsxDEV(_Fragment, { var x = /*#__PURE__*/_jsxDEV(_Fragment, {
children: /*#__PURE__*/_jsxDEV("div", { children: /*#__PURE__*/_jsxDEV("div", {

2
packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/classic-runtime-windows/output.js vendored
View File

@ -1,4 +1,4 @@
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\classic-runtime-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\classic-runtime-windows\\input.js";
var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", { var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
__source: { __source: {
fileName: _jsxFileName, fileName: _jsxFileName,

2
packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/fragments-windows/output.js vendored
View File

@ -1,6 +1,6 @@
var _reactJsxDevRuntime = require("react/jsx-dev-runtime"); var _reactJsxDevRuntime = require("react/jsx-dev-runtime");
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\fragments-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\fragments-windows\\input.js";
var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV(_reactJsxDevRuntime.Fragment, { var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV(_reactJsxDevRuntime.Fragment, {
children: /*#__PURE__*/_reactJsxDevRuntime.jsxDEV("div", {}, void 0, false, { children: /*#__PURE__*/_reactJsxDevRuntime.jsxDEV("div", {}, void 0, false, {

2
packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/handle-fragments-with-key-windows/output.js vendored
View File

@ -1,6 +1,6 @@
var _reactJsxDevRuntime = require("react/jsx-dev-runtime"); var _reactJsxDevRuntime = require("react/jsx-dev-runtime");
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\handle-fragments-with-key-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\handle-fragments-with-key-windows\\input.js";
var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV(React.Fragment, {}, 'foo', false, { var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV(React.Fragment, {}, 'foo', false, {
fileName: _jsxFileName, fileName: _jsxFileName,

2
packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/handle-nonstatic-children-windows/output.js vendored
View File

@ -1,6 +1,6 @@
var _reactJsxDevRuntime = require("react/jsx-dev-runtime"); var _reactJsxDevRuntime = require("react/jsx-dev-runtime");
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\handle-nonstatic-children-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\handle-nonstatic-children-windows\\input.js";
var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV("div", { var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV("div", {
children: [/*#__PURE__*/_reactJsxDevRuntime.jsxDEV("span", {}, '0', false, { children: [/*#__PURE__*/_reactJsxDevRuntime.jsxDEV("span", {}, '0', false, {

2
packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/handle-static-children-windows/output.js vendored
View File

@ -1,6 +1,6 @@
var _reactJsxDevRuntime = require("react/jsx-dev-runtime"); var _reactJsxDevRuntime = require("react/jsx-dev-runtime");
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\handle-static-children-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\handle-static-children-windows\\input.js";
var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV("div", { var x = /*#__PURE__*/_reactJsxDevRuntime.jsxDEV("div", {
children: [/*#__PURE__*/_reactJsxDevRuntime.jsxDEV("span", {}, void 0, false, { children: [/*#__PURE__*/_reactJsxDevRuntime.jsxDEV("span", {}, void 0, false, {

2
packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/self-inside-arrow-windows/output.mjs vendored
View File

@ -1,6 +1,6 @@
import { jsxDEV as _jsxDEV } from "react/jsx-dev-runtime"; import { jsxDEV as _jsxDEV } from "react/jsx-dev-runtime";
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\self-inside-arrow-windows\\input.mjs", var _jsxFileName = "<CWD>\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\self-inside-arrow-windows\\input.mjs",
_this = this; _this = this;
/*#__PURE__*/ /*#__PURE__*/

2
packages/babel-preset-react/test/fixtures/preset-options/development-runtime-automatic-windows/output.js vendored
View File

@ -1,6 +1,6 @@
var _reactJsxDevRuntime = require("react/jsx-dev-runtime"); var _reactJsxDevRuntime = require("react/jsx-dev-runtime");
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-preset-react\\test\\fixtures\\preset-options\\development-runtime-automatic-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-preset-react\\test\\fixtures\\preset-options\\development-runtime-automatic-windows\\input.js";
/*#__PURE__*/ /*#__PURE__*/
_reactJsxDevRuntime.jsxDEV(Foo, { _reactJsxDevRuntime.jsxDEV(Foo, {

2
packages/babel-preset-react/test/fixtures/preset-options/development-windows/output.js vendored
View File

@ -1,4 +1,4 @@
var _jsxFileName = "C:\\Users\\travis\\build\\babel\\babel\\packages\\babel-preset-react\\test\\fixtures\\preset-options\\development-windows\\input.js"; var _jsxFileName = "<CWD>\\packages\\babel-preset-react\\test\\fixtures\\preset-options\\development-windows\\input.js";
/*#__PURE__*/ /*#__PURE__*/
React.createElement(Foo, { React.createElement(Foo, {