Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"arrowParens": "avoid",
"trailingComma": "es5",
"singleQuote": true,
"semi": true
Expand Down
2 changes: 1 addition & 1 deletion docusaurus/docs/adding-css-reset.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To start using it, add `@import-normalize;` anywhere in your CSS file(s). You on
/* rest of app styles */
```

> **Tip**: If you see an "_Unknown at rule @import-normalize css(unknownAtRules)_" warning in VSCode, change the `css.lint.unknownAtRules` setting to `ignore`.
> **Tip**: If you see an "_Unknown at rule @import-normalize css(unknownAtRules)_" warning in VSCode, change the `css.lint.unknownAtRules` setting to `ignore`.

You can control which parts of [normalize.css] to use via your project's [browserslist].

Expand Down
27 changes: 10 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,38 +26,31 @@
"alex": "^8.0.0",
"eslint": "^6.1.0",
"execa": "1.0.0",
"fs-extra": "^7.0.1",
"get-port": "^4.2.0",
"globby": "^9.1.0",
"husky": "^1.3.1",
"fs-extra": "^9.0.0",
"get-port": "^5.1.1",
"globby": "^11.0.0",
"husky": "^4.2.5",
"jest": "25.5.4",
"lerna": "3.20.2",
"lerna-changelog": "~0.8.2",
"lint-staged": "^8.0.4",
"meow": "^5.0.0",
"multimatch": "^3.0.0",
"prettier": "1.19.1",
"lint-staged": "^10.2.2",
"meow": "^6.1.1",
"multimatch": "^4.0.0",
"prettier": "2.0.5",
"puppeteer": "^3.0.2",
"strip-ansi": "^5.1.0",
"strip-ansi": "^6.0.0",
"svg-term-cli": "^2.1.1",
"tempy": "^0.2.1",
"wait-for-localhost": "^3.1.0"
},
"resolutions": {
"mkdirp": "0.5.1"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,md,css,html}": [
"prettier --trailing-comma es5 --single-quote --write",
"git add"
],
"yarn.lock": [
"git rm --cached"
"prettier --trailing-comma es5 --single-quote --write"
]
}
}
14 changes: 2 additions & 12 deletions packages/babel-plugin-named-asset-import/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ function namedAssetImportPlugin({ types: t }) {

return {
visitor: {
ExportNamedDeclaration(
path,
{
opts: { loaderMap },
}
) {
ExportNamedDeclaration(path, { opts: { loaderMap } }) {
if (!path.node.source) {
return;
}
Expand All @@ -67,12 +62,7 @@ function namedAssetImportPlugin({ types: t }) {
);
});
},
ImportDeclaration(
path,
{
opts: { loaderMap },
}
) {
ImportDeclaration(path, { opts: { loaderMap } }) {
replaceMatchingSpecifiers(path, loaderMap, (specifier, sourcePath) => {
if (t.isImportDefaultSpecifier(specifier)) {
return t.importDeclaration(
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-preset-react-app/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const validateBoolOption = (name, value, defaultValue) => {
return value;
};

module.exports = function(api, opts, env) {
module.exports = function (api, opts, env) {
if (!opts) {
opts = {};
}
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-preset-react-app/dependencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const validateBoolOption = (name, value, defaultValue) => {
return value;
};

module.exports = function(api, opts) {
module.exports = function (api, opts) {
if (!opts) {
opts = {};
}
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-preset-react-app/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

const create = require('./create');

module.exports = function(api, opts) {
module.exports = function (api, opts) {
return create(api, Object.assign({ helpers: false }, opts), 'development');
};
2 changes: 1 addition & 1 deletion packages/babel-preset-react-app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

const create = require('./create');

module.exports = function(api, opts) {
module.exports = function (api, opts) {
// This is similar to how `env` works in Babel:
// https://babeljs.io/docs/usage/babelrc/#env-option
// We are not using `env` because it’s ignored in versions > babel-core@6.10.4:
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-preset-react-app/prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

const create = require('./create');

module.exports = function(api, opts) {
module.exports = function (api, opts) {
return create(api, Object.assign({ helpers: false }, opts), 'production');
};
2 changes: 1 addition & 1 deletion packages/babel-preset-react-app/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@

const create = require('./create');

module.exports = function(api, opts) {
module.exports = function (api, opts) {
return create(api, Object.assign({ helpers: false }, opts), 'test');
};
2 changes: 1 addition & 1 deletion packages/babel-preset-react-app/webpack-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const crypto = require('crypto');

const macroCheck = new RegExp('[./]macro');

module.exports = function() {
module.exports = function () {
return {
// This function transforms the Babel configuration on a per-file basis
config(config, { source }) {
Expand Down
17 changes: 5 additions & 12 deletions packages/create-react-app/createReactApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,8 @@ function createApp(
let yarnUsesDefaultRegistry = true;
try {
yarnUsesDefaultRegistry =
execSync('yarnpkg config get registry')
.toString()
.trim() === 'https://registry.yarnpkg.com';
execSync('yarnpkg config get registry').toString().trim() ===
'https://registry.yarnpkg.com';
} catch (e) {
// ignore
}
Expand Down Expand Up @@ -769,9 +768,7 @@ function checkNpmVersion() {
let hasMinNpm = false;
let npmVersion = null;
try {
npmVersion = execSync('npm --version')
.toString()
.trim();
npmVersion = execSync('npm --version').toString().trim();
hasMinNpm = semver.gte(npmVersion, '6.0.0');
} catch (err) {
// ignore
Expand All @@ -789,9 +786,7 @@ function checkYarnVersion() {
let hasMaxYarnPnp = false;
let yarnVersion = null;
try {
yarnVersion = execSync('yarnpkg --version')
.toString()
.trim();
yarnVersion = execSync('yarnpkg --version').toString().trim();
if (semver.valid(yarnVersion)) {
hasMinYarnPnp = semver.gte(yarnVersion, minYarnPnp);
hasMaxYarnPnp = semver.lt(yarnVersion, maxYarnPnp);
Expand Down Expand Up @@ -1010,9 +1005,7 @@ function getProxy() {
} else {
try {
// Trying to read https-proxy from .npmrc
let httpsProxy = execSync('npm config get https-proxy')
.toString()
.trim();
let httpsProxy = execSync('npm config get https-proxy').toString().trim();
return httpsProxy !== 'null' ? httpsProxy : undefined;
} catch (e) {
return;
Expand Down
8 changes: 4 additions & 4 deletions packages/create-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
"create-react-app": "./index.js"
},
"dependencies": {
"chalk": "3.0.0",
"chalk": "4.0.0",
"commander": "4.1.0",
"cross-spawn": "7.0.2",
"envinfo": "7.5.1",
"fs-extra": "8.1.0",
"fs-extra": "9.0.0",
"hyperquest": "2.1.3",
"inquirer": "7.1.0",
"semver": "6.3.0",
"semver": "7.3.2",
"tar-pack": "3.4.1",
"tmp": "0.1.0",
"tmp": "0.2.1",
"validate-npm-package-name": "3.0.0"
}
}
Loading