From 3a998de2d3776b4682067339c565ea676c7ecdb8 Mon Sep 17 00:00:00 2001 From: Leo Hui Date: Fri, 30 Aug 2019 11:48:01 +0800 Subject: [PATCH] feat: add prettier config (#21) * feat: update prettier config for *.rc file * feat: *rc, *.json file use 'json-stringify' parser * feat: add prettier-config * feat: make prettier parse to json in tsconfig file * feat: lint @mjolnir/prettier-config * feat: change prettier config ext * feat: prettier all files * feat: add jsonc format files to prettier * feat: update prettier override * chore: format tsconfig.json --- .commitlintrc.json | 4 +- .eslintrc.json | 5 +- .lintstagedrc | 5 +- .prettierrc | 7 +- .vscode/settings.json | 3 +- babel.config.js | 10 +- lerna.json | 15 +- package.json | 2 +- packages/babel-preset/index.js | 18 +- packages/eslint-config/babel.js | 2 +- packages/eslint-config/index.js | 8 +- packages/eslint-config/jest.js | 2 +- packages/eslint-config/node.js | 2 +- packages/eslint-config/plugins/babel.js | 2 +- packages/eslint-config/plugins/import.js | 4 +- packages/eslint-config/plugins/jest.js | 2 +- packages/eslint-config/plugins/node.js | 4 +- packages/eslint-config/plugins/react-hooks.js | 4 +- packages/eslint-config/plugins/react.js | 2 +- packages/eslint-config/plugins/typescript.js | 4 +- packages/eslint-config/react.js | 2 +- packages/eslint-config/rules/index.js | 4 +- packages/eslint-config/rules/recommend.js | 2 +- packages/eslint-config/typescript.js | 2 +- packages/mjolnir-cli/.babelrc.js | 8 +- packages/mjolnir-cli/.eslintrc.js | 4 - packages/mjolnir-cli/.eslintrc.json | 7 + packages/mjolnir-cli/tsconfig.json | 6 +- packages/prettier-config/README.md | 21 ++ packages/prettier-config/index.js | 34 +++ packages/prettier-config/package.json | 24 ++ packages/tsconfig/react.json | 5 +- packages/tsconfig/tsconfig.json | 4 +- yarn.lock | 280 +----------------- 34 files changed, 174 insertions(+), 334 deletions(-) delete mode 100644 packages/mjolnir-cli/.eslintrc.js create mode 100644 packages/mjolnir-cli/.eslintrc.json create mode 100644 packages/prettier-config/README.md create mode 100644 packages/prettier-config/index.js create mode 100644 packages/prettier-config/package.json diff --git a/.commitlintrc.json b/.commitlintrc.json index c30e5a9..0df1d25 100644 --- a/.commitlintrc.json +++ b/.commitlintrc.json @@ -1,3 +1,5 @@ { - "extends": ["@commitlint/config-conventional"] + "extends": [ + "@commitlint/config-conventional" + ] } diff --git a/.eslintrc.json b/.eslintrc.json index 533ffec..35747dd 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,4 +1,7 @@ { - "extends": ["@mjolnir/eslint-config/node", "plugin:prettier/recommended"], + "extends": [ + "@mjolnir/eslint-config/node", + "plugin:prettier/recommended" + ], "rules": {} } diff --git a/.lintstagedrc b/.lintstagedrc index 3ef8008..279a08a 100644 --- a/.lintstagedrc +++ b/.lintstagedrc @@ -1,4 +1,7 @@ { "$schema": "http://json.schemastore.org/lintstagedrc.schema", - "**/*.{js, ts}": ["prettier --write", "eslint --fix", "git add"] + "**/*.{js, ts}": [ + "eslint --fix", + "git add" + ] } diff --git a/.prettierrc b/.prettierrc index 438da81..209085e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,6 +1 @@ -{ - "$schema": "http://json.schemastore.org/prettierrc", - "printWidth": 80, - "singleQuote": true, - "arrowParens": "always" -} +"@mjolnir/prettier-config" diff --git a/.vscode/settings.json b/.vscode/settings.json index 84604e0..a608c43 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ { "language": "typescriptreact", "autoFix": true } ], "cSpell.words": [ - "mjolnir" + "mjolnir", + "mjolnirjs" ] } diff --git a/babel.config.js b/babel.config.js index 83cd9ca..a6b526d 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,6 +1,6 @@ 'use strict'; -module.exports = (api) => { +module.exports = api => { api.cache(false); return { @@ -10,9 +10,9 @@ module.exports = (api) => { '@mjolnir/babel-preset', { react: false, - typescript: false - } - ] - ] + typescript: false, + }, + ], + ], }; }; diff --git a/lerna.json b/lerna.json index 4452aa7..6bd4994 100644 --- a/lerna.json +++ b/lerna.json @@ -1,9 +1,14 @@ { - "changelog": { - "repo": "mjolnirjs/mjolnir", - "cacheDir": ".changelog" - }, + "$schema": "http://json.schemastore.org/lerna", "npmClient": "yarn", "version": "independent", - "useWorkspaces": true + "useWorkspaces": true, + "command": { + "version": { + "conventionalCommits": true + }, + "publish": { + "message": "chore(release): publish" + } + } } diff --git a/package.json b/package.json index fda1c45..05b6200 100644 --- a/package.json +++ b/package.json @@ -13,13 +13,13 @@ "@commitlint/config-conventional": "^8.1.0", "@mjolnir/babel-preset": "link:packages/babel-preset", "@mjolnir/eslint-config": "link:packages/eslint-config", + "@mjolnir/prettier-config": "link:packages/prettier-config", "cross-env": "^5.2.0", "eslint": "^6.1.0", "eslint-config-prettier": "^6.0.0", "eslint-plugin-prettier": "^3.1.0", "husky": "^3.0.4", "lerna": "^3.15.0", - "lerna-changelog": "^0.8.2", "lint-staged": "^9.2.4", "prettier": "^1.17.1", "typescript": "^3.5.3" diff --git a/packages/babel-preset/index.js b/packages/babel-preset/index.js index 6c8ecf7..1be0e8b 100644 --- a/packages/babel-preset/index.js +++ b/packages/babel-preset/index.js @@ -31,7 +31,7 @@ module.exports = declare((api, opts) => { require('@babel/plugin-syntax-dynamic-import'), require('@babel/plugin-syntax-import-meta'), [require('@babel/plugin-proposal-class-properties'), { loose: true }], - require('@babel/plugin-proposal-json-strings') + require('@babel/plugin-proposal-json-strings'), ]; const presets = [ @@ -40,9 +40,9 @@ module.exports = declare((api, opts) => { require('@babel/preset-env'), { //TODO: how about other opts - modules // default to false, webpack takes care of modules - } - ] + modules, // default to false, webpack takes care of modules + }, + ], ]; if (typescript) presets.push(require('@babel/preset-typescript')); @@ -51,22 +51,22 @@ module.exports = declare((api, opts) => { presets.push([ require('@babel/preset-react'), { - development: env - } + development: env, + }, ]); if (env === 'production') { // Remove PropTypes from production build plugins.push([ require('babel-plugin-transform-react-remove-prop-types'), { - removeImport: true - } + removeImport: true, + }, ]); } } return { presets, - plugins + plugins, }; }); diff --git a/packages/eslint-config/babel.js b/packages/eslint-config/babel.js index f2f10d6..39ca50e 100644 --- a/packages/eslint-config/babel.js +++ b/packages/eslint-config/babel.js @@ -2,5 +2,5 @@ // for babel env, base on es6 env module.exports = { - extends: ['./index', './plugins/babel'].map(require.resolve) + extends: ['./index', './plugins/babel'].map(require.resolve), }; diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index e4efc61..fe4af8c 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -5,7 +5,7 @@ module.exports = { root: true, // limit ESLint to a specific project env: { browser: true, - es6: true // also enable ecmaVersion: 6 + es6: true, // also enable ecmaVersion: 6 }, parserOptions: { ecmaVersion: 2018, // same as 9 @@ -13,8 +13,8 @@ module.exports = { ecmaFeatures: { globalReturn: false, impliedStrict: true, - jsx: true - } + jsx: true, + }, }, - extends: ['./rules', './plugins/import'].map(require.resolve) + extends: ['./rules', './plugins/import'].map(require.resolve), }; diff --git a/packages/eslint-config/jest.js b/packages/eslint-config/jest.js index 41ab15f..e7c0f05 100644 --- a/packages/eslint-config/jest.js +++ b/packages/eslint-config/jest.js @@ -3,5 +3,5 @@ // for jest env module.exports = { extends: ['./index', './plugins/jest'].map(require.resolve), - rules: {} + rules: {}, }; diff --git a/packages/eslint-config/node.js b/packages/eslint-config/node.js index b72f379..fba42ad 100644 --- a/packages/eslint-config/node.js +++ b/packages/eslint-config/node.js @@ -4,5 +4,5 @@ module.exports = { root: true, // limit ESLint to a specific project extends: ['./rules', './plugins/node'].map(require.resolve), - rules: {} + rules: {}, }; diff --git a/packages/eslint-config/plugins/babel.js b/packages/eslint-config/plugins/babel.js index 7d998f8..2ee2097 100644 --- a/packages/eslint-config/plugins/babel.js +++ b/packages/eslint-config/plugins/babel.js @@ -4,5 +4,5 @@ module.exports = { parser: 'babel-eslint', plugins: ['babel'], - rules: {} + rules: {}, }; diff --git a/packages/eslint-config/plugins/import.js b/packages/eslint-config/plugins/import.js index 842e043..b375619 100644 --- a/packages/eslint-config/plugins/import.js +++ b/packages/eslint-config/plugins/import.js @@ -13,6 +13,6 @@ module.exports = { // red flags (thus, warnings) 'import/no-named-as-default': 'warn', 'import/no-named-as-default-member': 'warn', - 'import/no-duplicates': 'warn' - } + 'import/no-duplicates': 'warn', + }, }; diff --git a/packages/eslint-config/plugins/jest.js b/packages/eslint-config/plugins/jest.js index 1d8b820..077f4c2 100644 --- a/packages/eslint-config/plugins/jest.js +++ b/packages/eslint-config/plugins/jest.js @@ -3,5 +3,5 @@ // plugin:jest/recommended: https://github.com/jest-community/eslint-plugin-jest/blob/master/README.md module.exports = { extends: ['plugin:jest/recommended'], - rules: {} + rules: {}, }; diff --git a/packages/eslint-config/plugins/node.js b/packages/eslint-config/plugins/node.js index 3df8be2..2e627e9 100644 --- a/packages/eslint-config/plugins/node.js +++ b/packages/eslint-config/plugins/node.js @@ -5,6 +5,6 @@ module.exports = { extends: ['plugin:node/recommended'], rules: { // commonjs or node env, should use global strict model - strict: ['error', 'global'] - } + strict: ['error', 'global'], + }, }; diff --git a/packages/eslint-config/plugins/react-hooks.js b/packages/eslint-config/plugins/react-hooks.js index 9cdf437..6183c12 100644 --- a/packages/eslint-config/plugins/react-hooks.js +++ b/packages/eslint-config/plugins/react-hooks.js @@ -4,6 +4,6 @@ module.exports = { plugins: ['react-hooks'], rules: { 'react-hooks/exhaustive-deps': 'warn', - 'react-hooks/rules-of-hooks': 'error' - } + 'react-hooks/rules-of-hooks': 'error', + }, }; diff --git a/packages/eslint-config/plugins/react.js b/packages/eslint-config/plugins/react.js index 97fd4d7..7d395f4 100644 --- a/packages/eslint-config/plugins/react.js +++ b/packages/eslint-config/plugins/react.js @@ -2,5 +2,5 @@ module.exports = { plugins: ['react'], - rules: {} + rules: {}, }; diff --git a/packages/eslint-config/plugins/typescript.js b/packages/eslint-config/plugins/typescript.js index 2e02e87..b08059b 100644 --- a/packages/eslint-config/plugins/typescript.js +++ b/packages/eslint-config/plugins/typescript.js @@ -6,7 +6,7 @@ module.exports = { extends: [ 'plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended', - 'plugin:import/typescript' + 'plugin:import/typescript', ], - rules: {} + rules: {}, }; diff --git a/packages/eslint-config/react.js b/packages/eslint-config/react.js index c40d7e2..b68e48f 100644 --- a/packages/eslint-config/react.js +++ b/packages/eslint-config/react.js @@ -2,5 +2,5 @@ // for react env module.exports = { - extends: ['./plugins/react', './plugins/react-hooks'].map(require.resolve) + extends: ['./plugins/react', './plugins/react-hooks'].map(require.resolve), }; diff --git a/packages/eslint-config/rules/index.js b/packages/eslint-config/rules/index.js index bded8c0..298c943 100644 --- a/packages/eslint-config/rules/index.js +++ b/packages/eslint-config/rules/index.js @@ -8,7 +8,7 @@ module.exports = { './errors', './es6', './style', - './variables' + './variables', ].map(require.resolve), - rules: {} + rules: {}, }; diff --git a/packages/eslint-config/rules/recommend.js b/packages/eslint-config/rules/recommend.js index 106e450..e74d154 100644 --- a/packages/eslint-config/rules/recommend.js +++ b/packages/eslint-config/rules/recommend.js @@ -2,5 +2,5 @@ // eslint:recommended: https://eslint.org/docs/rules module.exports = { - extends: ['eslint:recommended'] + extends: ['eslint:recommended'], }; diff --git a/packages/eslint-config/typescript.js b/packages/eslint-config/typescript.js index 42e5b99..6dc2954 100644 --- a/packages/eslint-config/typescript.js +++ b/packages/eslint-config/typescript.js @@ -2,5 +2,5 @@ // for typescript env, base on es6 env module.exports = { - extends: ['./index', './plugins/typescript'].map(require.resolve) + extends: ['./index', './plugins/typescript'].map(require.resolve), }; diff --git a/packages/mjolnir-cli/.babelrc.js b/packages/mjolnir-cli/.babelrc.js index a49b2e2..0e3deee 100644 --- a/packages/mjolnir-cli/.babelrc.js +++ b/packages/mjolnir-cli/.babelrc.js @@ -6,8 +6,8 @@ module.exports = { { react: false, typescript: true, - modules: "commonjs" - } - ] - ] + modules: 'commonjs', + }, + ], + ], }; diff --git a/packages/mjolnir-cli/.eslintrc.js b/packages/mjolnir-cli/.eslintrc.js deleted file mode 100644 index 275b2df..0000000 --- a/packages/mjolnir-cli/.eslintrc.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - extends: ['@mjolnir/eslint-config/typescript', 'plugin:prettier/recommended'], - rules: {} -}; diff --git a/packages/mjolnir-cli/.eslintrc.json b/packages/mjolnir-cli/.eslintrc.json new file mode 100644 index 0000000..19104d7 --- /dev/null +++ b/packages/mjolnir-cli/.eslintrc.json @@ -0,0 +1,7 @@ +{ + "extends": [ + "@mjolnir/eslint-config/typescript", + "plugin:prettier/recommended" + ], + "rules": {} +} diff --git a/packages/mjolnir-cli/tsconfig.json b/packages/mjolnir-cli/tsconfig.json index fd367f9..76b471d 100644 --- a/packages/mjolnir-cli/tsconfig.json +++ b/packages/mjolnir-cli/tsconfig.json @@ -2,11 +2,13 @@ "compilerOptions": { "module": "es6", "target": "es5", - "lib": ["esnext"], + "lib": [ + "esnext" + ], "declaration": true, "outDir": "dist", "esModuleInterop": true, "moduleResolution": "node", - "strict": true, + "strict": true } } diff --git a/packages/prettier-config/README.md b/packages/prettier-config/README.md new file mode 100644 index 0000000..c096de9 --- /dev/null +++ b/packages/prettier-config/README.md @@ -0,0 +1,21 @@ +# @mjolnir/prettier-config + +## install +`yarn add @mjolnir/prettier-config -D` + +## useage + +add it in your `package.json`: +``` +{ + "prettier": "@mjolnir/prettier-config" +} +``` + +if you want to extends the configuration and overwrite some properties, import the file in a `.prettierrc.js` file and export the modifications: + +```js +module.exports = { + ...require("@mjolnir/prettier-config"); +} +``` diff --git a/packages/prettier-config/index.js b/packages/prettier-config/index.js new file mode 100644 index 0000000..87fd655 --- /dev/null +++ b/packages/prettier-config/index.js @@ -0,0 +1,34 @@ +'use strict'; + +module.exports = { + singleQuote: true, + trailingComma: 'all', + htmlWhitespaceSensitivity: 'ignore', + overrides: [ + { + files: ['.*rc', '*.json'], + options: { + parser: 'json-stringify', + }, + }, + { + // special file use jsonc format + files: [ + '.vscode/*.json', + 'jsconfig.json', + 'tsconfig.json', + 'tsconfig.*.json', + 'tsconfig-*.json', + 'tsconfig.json', + '.babelrc', + '.eslintrc', + '.eslintrc.json', + 'tslint.json', + 'tslint.*.json', + ], + options: { + parser: 'json', + }, + }, + ], +}; diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json new file mode 100644 index 0000000..e2374ef --- /dev/null +++ b/packages/prettier-config/package.json @@ -0,0 +1,24 @@ +{ + "name": "@mjolnir/prettier-config", + "version": "0.0.0", + "description": "", + "homepage": "https://github.com/mjolnirjs/mjolnir/tree/master/packages/prettier-config#readme", + "license": "MIT", + "publishConfig": { + "access": "public" + }, + "main": "index.js", + "repository": { + "type": "git", + "url": "git+https://github.com/mjolnirjs/mjolnir.git" + }, + "scripts": { + "test": "echo \"Error: run tests from root\" && exit 1" + }, + "bugs": { + "url": "https://github.com/mjolnirjs/mjolnir/issues" + }, + "peerDependencies": { + "prettier": "^1.17.1" + } +} diff --git a/packages/tsconfig/react.json b/packages/tsconfig/react.json index 8f5ddb4..e8cecb5 100644 --- a/packages/tsconfig/react.json +++ b/packages/tsconfig/react.json @@ -2,7 +2,10 @@ "compilerOptions": { "module": "es6", "target": "es5", - "lib": ["esnext", "dom"], + "lib": [ + "esnext", + "dom" + ], "esModuleInterop": true, "moduleResolution": "node" } diff --git a/packages/tsconfig/tsconfig.json b/packages/tsconfig/tsconfig.json index b633c50..7b4cd9f 100644 --- a/packages/tsconfig/tsconfig.json +++ b/packages/tsconfig/tsconfig.json @@ -2,9 +2,7 @@ "compilerOptions": { "module": "commonjs", "target": "es2018", - "lib": [ - "esnext" - ], + "lib": ["esnext"], "esModuleInterop": true, "moduleResolution": "node" } diff --git a/yarn.lock b/yarn.lock index 2e131ff..6d8422e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1731,35 +1731,16 @@ rimraf "^2.5.2" "@mjolnir/babel-preset@link:packages/babel-preset": - version "0.0.2" - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-class-properties" "^7.5.5" - "@babel/plugin-proposal-decorators" "^7.4.4" - "@babel/plugin-proposal-export-namespace-from" "^7.5.2" - "@babel/plugin-proposal-function-sent" "^7.5.0" - "@babel/plugin-proposal-json-strings" "^7.2.0" - "@babel/plugin-proposal-numeric-separator" "^7.2.0" - "@babel/plugin-proposal-throw-expressions" "^7.2.0" - "@babel/plugin-syntax-dynamic-import" "^7.2.0" - "@babel/plugin-syntax-import-meta" "^7.2.0" - "@babel/preset-env" "^7.5.5" - "@babel/preset-react" "^7.0.0" - "@babel/preset-typescript" "^7.3.3" - babel-plugin-transform-react-remove-prop-types "^0.4.24" + version "0.0.0" + uid "" "@mjolnir/eslint-config@link:packages/eslint-config": - version "0.1.1" - dependencies: - "@typescript-eslint/eslint-plugin" "^2.0.0" - "@typescript-eslint/parser" "^2.0.0" - babel-eslint "^10.0.2" - eslint-plugin-babel "^5.3.0" - eslint-plugin-import "^2.18.2" - eslint-plugin-jest "^22.15.1" - eslint-plugin-node "^9.1.0" - eslint-plugin-react "^7.14.3" - eslint-plugin-react-hooks "^2.0.0" + version "0.0.0" + uid "" + +"@mjolnir/prettier-config@link:packages/prettier-config": + version "0.0.0" + uid "" "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -2382,26 +2363,6 @@ byte-size@^5.0.1: resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-5.0.1.tgz#4b651039a5ecd96767e71a3d7ed380e48bed4191" integrity sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw== -cacache@^11.3.3: - version "11.3.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" - integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - cacache@^12.0.0: version "12.0.2" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c" @@ -2518,7 +2479,7 @@ chalk@2.3.1: escape-string-regexp "^1.0.5" supports-color "^5.2.0" -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2601,17 +2562,6 @@ cli-cursor@^3.1.0: dependencies: restore-cursor "^3.1.0" -cli-highlight@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-1.2.3.tgz#b200f97ed0e43d24633e89de0f489a48bb87d2bf" - integrity sha512-cmc4Y2kJuEpT2KZd9pgWWskpDMMfJu2roIcY1Ya/aIItufF5FKsV/NtA6vvdhSUllR8KJfvQDNmIcskU+MKLDg== - dependencies: - chalk "^2.3.0" - highlight.js "^9.6.0" - mz "^2.4.0" - parse5 "^3.0.3" - yargs "^10.0.3" - cli-truncate@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" @@ -2904,15 +2854,6 @@ cross-env@^5.2.0: cross-spawn "^6.0.5" is-windows "^1.0.0" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -3001,7 +2942,7 @@ decamelize-keys@^1.0.0: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -3238,7 +3179,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0: +es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== @@ -3504,32 +3445,6 @@ eventemitter3@^3.1.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== -execa@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" - integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw== - dependencies: - cross-spawn "^6.0.0" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -3856,7 +3771,7 @@ fsevents@^1.2.7: nan "^2.12.1" node-pre-gyp "^0.12.0" -function-bind@^1.0.2, function-bind@^1.1.1: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== @@ -3926,11 +3841,6 @@ get-stdin@^6.0.0: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= - get-stream@^4.0.0, get-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -4183,11 +4093,6 @@ has@^1.0.1, has@^1.0.3: dependencies: function-bind "^1.1.1" -highlight.js@^9.6.0: - version "9.15.9" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.9.tgz#865257da1dbb4a58c4552d46c4b3854f77f0e6d5" - integrity sha512-M0zZvfLr5p0keDMCAhNBp03XJbKBxUx5AfyfufMdFMEP4N/Xj6dh0IqC75ys7BAzceR34NgcvXjupRVaHBPPVQ== - hosted-git-info@^2.1.4, hosted-git-info@^2.6.0: version "2.8.2" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.2.tgz#a35c3f355ac1249f1093c0c2a542ace8818c171a" @@ -4382,11 +4287,6 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - invert-kv@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" @@ -4811,13 +4711,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - lcid@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" @@ -4825,21 +4718,6 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" -lerna-changelog@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/lerna-changelog/-/lerna-changelog-0.8.2.tgz#05dc24add91741a4c198a79f82a1a4ac3fbb4754" - integrity sha512-GrWs8K3DrPpO1sUrcloYp9ioj+PNAX27U6tM0+10fhbNzBB7h4HS+4N5DWKhEQRDoJjZh1QA+wWwTpDNJdJHyA== - dependencies: - chalk "^2.4.1" - cli-highlight "^1.2.3" - execa "^0.10.0" - make-fetch-happen "^4.0.1" - normalize-git-url "^3.0.2" - p-map "^1.2.0" - progress "^2.0.0" - string.prototype.padend "^3.0.0" - yargs "^11.0.0" - lerna@^3.15.0: version "3.16.4" resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.16.4.tgz#158cb4f478b680f46f871d5891f531f3a2cb31ec" @@ -5108,14 +4986,6 @@ loud-rejection@^1.0.0: currently-unhandled "^0.4.1" signal-exit "^3.0.0" -lru-cache@^4.0.1: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -5143,23 +5013,6 @@ make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -make-fetch-happen@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz#2d156b11696fb32bffbafe1ac1bc085dd6c78a79" - integrity sha512-YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA== - dependencies: - agentkeepalive "^3.4.1" - cacache "^11.3.3" - http-cache-semantics "^3.8.1" - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.1" - lru-cache "^5.1.1" - mississippi "^3.0.0" - node-fetch-npm "^2.0.2" - promise-retry "^1.1.1" - socks-proxy-agent "^4.0.0" - ssri "^6.0.0" - make-fetch-happen@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz#a8e3fe41d3415dd656fe7b8e8172e1fb4458b38d" @@ -5206,13 +5059,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= - dependencies: - mimic-fn "^1.0.0" - mem@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" @@ -5452,7 +5298,7 @@ mute-stream@0.0.8, mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mz@^2.4.0, mz@^2.5.0: +mz@^2.5.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== @@ -5576,11 +5422,6 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-git-url@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/normalize-git-url/-/normalize-git-url-3.0.2.tgz#8e5f14be0bdaedb73e07200310aa416c27350fc4" - integrity sha1-jl8Uvgva7bc+ByADEKpBbCc1D8Q= - normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -5825,15 +5666,6 @@ os-homedir@^1.0.0: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-locale@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" @@ -5942,11 +5774,6 @@ p-map-series@^1.0.0: dependencies: p-reduce "^1.0.0" -p-map@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" - integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== - p-map@^2.0.0, p-map@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" @@ -6057,13 +5884,6 @@ parse-url@^5.0.0: parse-path "^4.0.0" protocols "^1.4.0" -parse5@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" - integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA== - dependencies: - "@types/node" "*" - pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" @@ -6287,11 +6107,6 @@ protoduck@^5.0.1: dependencies: genfun "^5.0.0" -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - psl@^1.1.24: version "1.3.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.3.0.tgz#e1ebf6a3b5564fa8376f3da2275da76d875ca1bd" @@ -7115,15 +6930,6 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^5.2.0" -string.prototype.padend@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" - integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.4.3" - function-bind "^1.0.2" - string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -7751,21 +7557,11 @@ xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= - "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" @@ -7786,56 +7582,6 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ== - dependencies: - camelcase "^4.1.0" - -yargs-parser@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" - integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc= - dependencies: - camelcase "^4.1.0" - -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" - integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig== - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^8.1.0" - -yargs@^11.0.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" - integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A== - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^9.0.2" - yargs@^12.0.1: version "12.0.5" resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"