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

Replace lodash 'defaults' usage with ES6 Spread initializer (#11797)

Browse Source 
Co-authored-by: Corey Farrell <git@cfware.com>
This commit is contained in:
James Addison 2020-10-14 19:10:44 +01:00 committed by GitHub
parent 136e6301cb
commit 94b5f92e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/babel-cli/src/babel/dir.js
View File

@ -1,6 +1,5 @@
// @flow
import defaults from "lodash/defaults";
import debounce from "lodash/debounce";
import { sync as makeDirSync } from "make-dir";
import slash from "slash";
@ -48,15 +47,10 @@ export default async function ({
const dest = getDest(relative, base);
try {
const res = await util.compile(
src,
defaults(
{
sourceFileName: slash(path.relative(dest + "/..", src)),
},
babelOptions,
),
);
const res = await util.compile(src, {
...babelOptions,
sourceFileName: slash(path.relative(dest + "/..", src)),
});
if (!res) return FILE_TYPE.IGNORED;

42
packages/babel-cli/src/babel/file.js
View File

@ -1,7 +1,6 @@
// @flow
import convertSourceMap from "convert-source-map";
import defaults from "lodash/defaults";
import sourceMap from "source-map";
import slash from "slash";
import { sync as makeDirSync } from "make-dir";
@ -127,16 +126,10 @@ export default async function ({
async function stdin(): Promise<void> {
const code = await readStdin();
const res = await util.transform(
cliOptions.filename,
code,
defaults(
{
sourceFileName: "stdin",
},
babelOptions,
),
);
const res = await util.transform(cliOptions.filename, code, {
...babelOptions,
sourceFileName: "stdin",
});
output([res]);
}
@ -177,22 +170,17 @@ export default async function ({
sourceFilename = slash(sourceFilename);
try {
return await util.compile(
filename,
defaults(
{
sourceFileName: sourceFilename,
// Since we're compiling everything to be merged together,
// "inline" applies to the final output file, but not to the individual
// files being concatenated.
sourceMaps:
babelOptions.sourceMaps === "inline"
? true
: babelOptions.sourceMaps,
},
babelOptions,
),
);
return await util.compile(filename, {
...babelOptions,
sourceFileName: sourceFilename,
// Since we're compiling everything to be merged together,
// "inline" applies to the final output file, but not to the individual
// files being concatenated.
sourceMaps:
babelOptions.sourceMaps === "inline"
? true
: babelOptions.sourceMaps,
});
} catch (err) {
if (!cliOptions.watch) {
throw err;

2
packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files-windows/stdout.txt vendored
View File

@ -15,7 +15,6 @@ config <CWD>/.babelrc
programmatic options from @babel/cli
{
"sourceFileName": "src/foo.js",
"presets": [
"<ROOTDIR>//packages//babel-preset-react"
],
@ -24,6 +23,7 @@ programmatic options from @babel/cli
"<ROOTDIR>//packages//babel-plugin-transform-strict-mode",
"<ROOTDIR>//packages//babel-plugin-transform-modules-commonjs"
],
"sourceFileName": "src/foo.js",
"caller": {
"name": "@babel/cli"
},

2
packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR with multiple files/stdout.txt vendored
View File

@ -15,7 +15,6 @@ config <CWD>/.babelrc
programmatic options from @babel/cli
{
"sourceFileName": "src/foo.js",
"presets": [
"<ROOTDIR>/packages/babel-preset-react"
],
@ -24,6 +23,7 @@ programmatic options from @babel/cli
"<ROOTDIR>/packages/babel-plugin-transform-strict-mode",
"<ROOTDIR>/packages/babel-plugin-transform-modules-commonjs"
],
"sourceFileName": "src/foo.js",
"caller": {
"name": "@babel/cli"
},

2
packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR-windows/stdout.txt vendored
View File

@ -15,7 +15,6 @@ config <CWD>/.babelrc
programmatic options from @babel/cli
{
"sourceFileName": "../src/foo.js",
"presets": [
"<ROOTDIR>//packages//babel-preset-react"
],
@ -24,6 +23,7 @@ programmatic options from @babel/cli
"<ROOTDIR>//packages//babel-plugin-transform-strict-mode",
"<ROOTDIR>//packages//babel-plugin-transform-modules-commonjs"
],
"sourceFileName": "../src/foo.js",
"caller": {
"name": "@babel/cli"
},

2
packages/babel-cli/test/fixtures/babel/env - SHOW_CONFIG_FOR/stdout.txt vendored
View File

@ -110,7 +110,6 @@ config <CWD>/.babelrc
programmatic options from @babel/cli
{
"sourceFileName": "./src/index.js",
"presets": [
"<ROOTDIR>/packages/babel-preset-react"
],
@ -120,6 +119,7 @@ programmatic options from @babel/cli
"<ROOTDIR>/packages/babel-plugin-transform-modules-commonjs"
],
"configFile": "./my-config.js",
"sourceFileName": "./src/index.js",
"caller": {
"name": "@babel/cli"
},

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

@ -4,7 +4,6 @@ import { buildExternalHelpers } from "@babel/core";
import getFixtures from "@babel/helper-fixtures";
import sourceMap from "source-map";
import { codeFrameColumns } from "@babel/code-frame";
import defaults from "lodash/defaults";
import escapeRegExp from "lodash/escapeRegExp";
import * as helpers from "./helpers";
import merge from "lodash/merge";
@ -442,9 +441,11 @@ export default function (
run(task);
}
defaults(task.options, {
sourceMap: !!(task.sourceMappings || task.sourceMap),
});
if ("sourceMap" in task.options === false) {
task.options.sourceMap = !!(
task.sourceMappings || task.sourceMap
);
}
Object.assign(task.options, taskOpts);

7
packages/babel-traverse/src/scope/index.js
View File

@ -1,7 +1,6 @@
import Renamer from "./lib/renamer";
import type NodePath from "../path";
import traverse from "../index";
import defaults from "lodash/defaults";
import Binding from "./binding";
import globals from "globals";
import * as t from "@babel/types";
@ -956,7 +955,11 @@ export default class Scope {
let scope = this;
do {
defaults(ids, scope.bindings);
for (const key of Object.keys(scope.bindings)) {
if (key in ids === false) {
ids[key] = scope.bindings[key];
}
}
scope = scope.parent;
} while (scope);