From 135fa6a35e2d282a6239552e77b0703cd77a73a4 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Wed, 19 Dec 2018 20:48:52 -0200 Subject: [PATCH 1/5] feat(babel-plugin-function-filemeta): add first version of plugin --- core/babel-preset-docz/package.json | 42 + core/babel-preset-docz/src/config.ts | 74 ++ core/docz-core/src/config/babel.ts | 2 +- .../babel-plugin-function-filemeta/.babelrc | 12 + .../jest.config.js | 4 + .../package.json | 53 + .../src/index.ts | 59 + .../src/types.d.ts | 1 + .../tests/__snapshots__/index.test.ts.snap | 109 ++ .../tests/fixtures/example.js | 55 + .../tests/index.test.ts | 17 + .../tests/types.d.ts | 1 + .../tsconfig.json | 12 + .../tslint.json | 3 + yarn.lock | 1183 ++++++++++++++++- 15 files changed, 1570 insertions(+), 57 deletions(-) create mode 100644 core/babel-preset-docz/package.json create mode 100644 core/babel-preset-docz/src/config.ts create mode 100644 packages/babel-plugin-function-filemeta/.babelrc create mode 100644 packages/babel-plugin-function-filemeta/jest.config.js create mode 100644 packages/babel-plugin-function-filemeta/package.json create mode 100644 packages/babel-plugin-function-filemeta/src/index.ts create mode 100644 packages/babel-plugin-function-filemeta/src/types.d.ts create mode 100644 packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap create mode 100644 packages/babel-plugin-function-filemeta/tests/fixtures/example.js create mode 100644 packages/babel-plugin-function-filemeta/tests/index.test.ts create mode 100644 packages/babel-plugin-function-filemeta/tests/types.d.ts create mode 100644 packages/babel-plugin-function-filemeta/tsconfig.json create mode 100644 packages/babel-plugin-function-filemeta/tslint.json diff --git a/core/babel-preset-docz/package.json b/core/babel-preset-docz/package.json new file mode 100644 index 000000000..6ac7e2bc9 --- /dev/null +++ b/core/babel-preset-docz/package.json @@ -0,0 +1,42 @@ +{ + "name": "babel-preset-docz", + "version": "0.13.5", + "description": "Babel preset used on docz", + "license": "MIT", + "main": "dist/index.js", + "umd:main": "dist/index.umd.js", + "module": "dist/index.m.js", + "typings": "dist/index.d.ts", + "source": "src/index.ts", + "files": [ + "dist/", + "package.json", + "README.md" + ], + "scripts": { + "dev": "libundler watch --ts -e all", + "build": "libundler build --ts -e all --c", + "fix": "run-s fix:*", + "fix:prettier": "prettier \"src/**/*.{ts,tsx,md,mdx,js,jsx,json}\" --write", + "fix:tslint": "tslint --fix --project .", + "tslint": "tslint --project ." + }, + "dependencies": { + "@babel/core": "7.2.2", + "@babel/plugin-proposal-class-properties": "7.2.1", + "@babel/plugin-proposal-object-rest-spread": "7.2.0", + "@babel/plugin-syntax-dynamic-import": "7.2.0", + "@babel/plugin-transform-destructuring": "7.2.0", + "@babel/plugin-transform-regenerator": "7.0.0", + "@babel/plugin-transform-runtime": "7.2.0", + "@babel/preset-env": "7.2.0", + "@babel/preset-flow": "7.0.0", + "@babel/preset-react": "7.0.0", + "@babel/preset-typescript": "7.1.0", + "babel-plugin-function-filemeta": "^0.13.4", + "babel-plugin-macros": "^2.4.3", + "babel-plugin-react-docgen": "^2.0.0", + "babel-plugin-transform-dynamic-import": "^2.0.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.21" + } +} diff --git a/core/babel-preset-docz/src/config.ts b/core/babel-preset-docz/src/config.ts new file mode 100644 index 000000000..a27e353ca --- /dev/null +++ b/core/babel-preset-docz/src/config.ts @@ -0,0 +1,74 @@ +interface ConfigParams { + flow: boolean + typescript: boolean + parseProps: boolean + env: { + dev: boolean + prod: boolean + test: boolean + } +} + +export const config = (opts: ConfigParams) => { + const presets: any[] = [ + opts.env.test && [ + require('@babel/preset-env').default, + { + targets: { node: '6.12' }, + }, + ], + (opts.env.prod || opts.env.dev) && [ + require('@babel/preset-env').default, + { + useBuiltIns: 'entry', + modules: false, + }, + ], + [ + require('@babel/preset-react').default, + { + development: opts.env.dev, + useBuiltIns: true, + }, + ], + opts.flow && [require('@babel/preset-flow').default], + opts.typescript && [require('@babel/preset-typescript').default], + ].filter(Boolean) + + const plugins: any[] = [ + require('babel-plugin-macros'), + require('@babel/plugin-transform-destructuring').default, + [ + require('@babel/plugin-proposal-class-properties').default, + { loose: true }, + ], + [ + require('@babel/plugin-proposal-object-rest-spread').default, + { useBuiltIns: true }, + ], + [ + require('@babel/plugin-transform-runtime').default, + { helpers: false, regenerator: true }, + ], + opts.parseProps && [ + require('babel-plugin-react-docgen').default, + { resolver: 'findAllExportedComponentDefinitions' }, + ], + require('babel-plugin-function-filemeta').default, + opts.env.prod && [ + require('babel-plugin-transform-react-remove-prop-types').default, + { removeImport: true }, + ], + !opts.env.test && [ + require('@babel/plugin-transform-regenerator').default, + { async: false }, + ], + require('@babel/plugin-syntax-dynamic-import').default, + opts.env.test && [require('babel-plugin-transform-dynamic-import').default], + ].filter(Boolean) + + return { + presets, + plugins, + } +} diff --git a/core/docz-core/src/config/babel.ts b/core/docz-core/src/config/babel.ts index 5cb7d65b7..4b7992c2d 100644 --- a/core/docz-core/src/config/babel.ts +++ b/core/docz-core/src/config/babel.ts @@ -32,7 +32,7 @@ export const getBabelConfig = async ( const config = merge(localBabelRc, { presets, babelrc: false, - ...(args.debug && { + ...(!args.debug && { cacheDirectory: true, cacheIdentifier: getCacheIdentifier( isProd ? 'production' : isDev && 'development', diff --git a/packages/babel-plugin-function-filemeta/.babelrc b/packages/babel-plugin-function-filemeta/.babelrc new file mode 100644 index 000000000..3f764c461 --- /dev/null +++ b/packages/babel-plugin-function-filemeta/.babelrc @@ -0,0 +1,12 @@ +{ + "presets": [ + [ + "@babel/preset-env", + { + "targets": { + "node": 9 + } + } + ] + ] +} \ No newline at end of file diff --git a/packages/babel-plugin-function-filemeta/jest.config.js b/packages/babel-plugin-function-filemeta/jest.config.js new file mode 100644 index 000000000..91a2d2c0d --- /dev/null +++ b/packages/babel-plugin-function-filemeta/jest.config.js @@ -0,0 +1,4 @@ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', +}; \ No newline at end of file diff --git a/packages/babel-plugin-function-filemeta/package.json b/packages/babel-plugin-function-filemeta/package.json new file mode 100644 index 000000000..1bf1e9736 --- /dev/null +++ b/packages/babel-plugin-function-filemeta/package.json @@ -0,0 +1,53 @@ +{ + "name": "babel-plugin-function-filemeta", + "version": "0.13.4", + "description": "Add file metadata for function declarations", + "license": "MIT", + "author": { + "name": "Marcelo Piva", + "email": "m.pivaa@gmail.com" + }, + "contributors": [ + { + "name": "Pedro Nauck", + "email": "pedronauck@gmail.com" + } + ], + "main": "dist/index.js", + "umd:main": "dist/index.umd.js", + "module": "dist/index.m.js", + "typings": "dist/index.d.ts", + "source": "src/index.ts", + "files": [ + "dist/", + "package.json", + "README.md" + ], + "scripts": { + "dev": "libundler watch --ts -e all", + "build": "libundler build --ts -e all --c", + "fix": "run-s fix:*", + "fix:prettier": "prettier \"src/**/*.{ts,tsx}\" --write", + "fix:tslint": "tslint --fix --project .", + "tslint": "tslint --project .", + "test": "jest" + }, + "dependencies": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.0", + "@babel/preset-env": "^7.1.0", + "@babel/template": "^7.1.2", + "lodash": "^4.17.11", + "babel-core": "7.0.0-bridge.0", + "babel-literal-to-ast": "^2.0.0", + "jsdoc": "^3.5.5", + "ts-jest": "^23.10.3" + }, + "devDependencies": { + "babel-jest": "^23.6.0", + "jest": "^23.6.0", + "@types/babel__template": "^7.0.0", + "@types/jest": "^23.3.2", + "@types/mocha": "^5.2.5" + } +} diff --git a/packages/babel-plugin-function-filemeta/src/index.ts b/packages/babel-plugin-function-filemeta/src/index.ts new file mode 100644 index 000000000..fe83511d2 --- /dev/null +++ b/packages/babel-plugin-function-filemeta/src/index.ts @@ -0,0 +1,59 @@ +import template from '@babel/template' +import { get } from 'lodash' + +const buildFileMeta = template(` + if (typeof ID !== 'undefined') { + ID.__filemeta = { + name: NAME, + filename: FILENAME + }; + } +`) + +const getFilename = (state: any) => get(state, 'file.opts.filename') + +const getPathName = (path: any) => + get(path, 'node.id.name') || get(path, 'parent.id.name') + +const findPathToInsert = (path: any): any => + path.parent.type === 'Program' && path.insertAfter + ? path + : findPathToInsert(path.parentPath) + +const checkIfIsInsideAnObject = (path: any, is?: boolean): boolean => { + const parentType = path.parent.type + if (parentType === 'Program') return Boolean(is) + if (parentType === 'ObjectProperty' || parentType === 'ClassProperty') { + return true + } + return checkIfIsInsideAnObject(path.parentPath, false) +} + +const insertNode = (t: any) => (path: any, state: any) => { + const filename = getFilename(state) + const name = getPathName(path) + const isInsideObject = checkIfIsInsideAnObject(path) + + if (filename && name && !isInsideObject) { + const pathToInsert = findPathToInsert(path) + const newNode = buildFileMeta({ + ID: t.identifier(name), + NAME: t.stringLiteral(name), + FILENAME: t.stringLiteral(filename), + }) + + pathToInsert.insertAfter(newNode) + } +} + +export default function({ types: t }: any): any { + const insert = insertNode(t) + + return { + visitor: { + FunctionDeclaration: insert, + ClassDeclaration: insert, + ArrowFunctionExpression: insert, + }, + } +} diff --git a/packages/babel-plugin-function-filemeta/src/types.d.ts b/packages/babel-plugin-function-filemeta/src/types.d.ts new file mode 100644 index 000000000..16e932c3b --- /dev/null +++ b/packages/babel-plugin-function-filemeta/src/types.d.ts @@ -0,0 +1 @@ +declare module 'babel-template' diff --git a/packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap b/packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap new file mode 100644 index 000000000..e9110f576 --- /dev/null +++ b/packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap @@ -0,0 +1,109 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`works 1`] = ` +"\\"use strict\\"; + +Object.defineProperty(exports, \\"__esModule\\", { + value: true +}); +exports.getOther = getOther; +exports.default = exports.Abcd = exports.bar = void 0; + +const foo = () => 'foo'; + +foo.__filemeta = { + name: \\"foo\\", + filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" +}; + +const bar = () => 'bar'; + +exports.bar = bar; +bar.__filemeta = { + name: \\"bar\\", + filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" +}; +const obj = { + foo: () => 'foo' + /** + * Some description + */ + +}; + +function get(object, path) { + return object[path]; +} + +get.__filemeta = { + name: \\"get\\", + filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" +}; + +function getOther(object, path) { + return object[path]; +} + +getOther.__filemeta = { + name: \\"getOther\\", + filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" +}; +const obj2 = { + get: () => null + /** + * Some description + */ + +}; + +class Abc { + /** + * Some description + */ + method() { + return null; + } + +} + +Abc.__filemeta = { + name: \\"Abc\\", + filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" +}; + +class Abcd { + /** + * Some description + */ + method() { + return null; + } + +} + +exports.Abcd = Abcd; +Abcd.__filemeta = { + name: \\"Abcd\\", + filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" +}; +const obj3 = { + method: class Abcd { + method() { + return null; + } + + } +}; + +const log = fn => fn(1); + +log.__filemeta = { + name: \\"log\\", + filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" +}; +log(id => console.log(id)); + +var _default = () => 'other'; + +exports.default = _default;" +`; diff --git a/packages/babel-plugin-function-filemeta/tests/fixtures/example.js b/packages/babel-plugin-function-filemeta/tests/fixtures/example.js new file mode 100644 index 000000000..07ccdb376 --- /dev/null +++ b/packages/babel-plugin-function-filemeta/tests/fixtures/example.js @@ -0,0 +1,55 @@ +const foo = () => 'foo' +export const bar = () => 'bar' + +const obj = { + foo: () => 'foo', +} + +/** + * Some description + */ +function get(object, path) { + return object[path] +} + +export function getOther(object, path) { + return object[path] +} + +const obj2 = { + get: () => null, +} + +/** + * Some description + */ +class Abc { + /** + * Some description + */ + method() { + return null + } +} + +export class Abcd { + /** + * Some description + */ + method() { + return null + } +} + +const obj3 = { + method: class Abcd { + method() { + return null + } + }, +} + +const log = fn => fn(1) +log(id => console.log(id)) + +export default () => 'other' diff --git a/packages/babel-plugin-function-filemeta/tests/index.test.ts b/packages/babel-plugin-function-filemeta/tests/index.test.ts new file mode 100644 index 000000000..6582c3eca --- /dev/null +++ b/packages/babel-plugin-function-filemeta/tests/index.test.ts @@ -0,0 +1,17 @@ +import { transformSync } from '@babel/core' +import * as fs from 'fs' +import * as path from 'path' +import plugin from '../src' + +const fixture = path.resolve('./tests/fixtures/example.js') + +const code = fs.readFileSync(fixture).toString() + +it('works', () => { + const result = transformSync(code, { + plugins: [plugin], + filename: fixture, + }) + + expect(result!.code).toMatchSnapshot() +}) diff --git a/packages/babel-plugin-function-filemeta/tests/types.d.ts b/packages/babel-plugin-function-filemeta/tests/types.d.ts new file mode 100644 index 000000000..a2f9ab1bb --- /dev/null +++ b/packages/babel-plugin-function-filemeta/tests/types.d.ts @@ -0,0 +1 @@ +declare module '@babel/core' diff --git a/packages/babel-plugin-function-filemeta/tsconfig.json b/packages/babel-plugin-function-filemeta/tsconfig.json new file mode 100644 index 000000000..a12e53955 --- /dev/null +++ b/packages/babel-plugin-function-filemeta/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "./", + "declaration": true, + "types": ["node", "mocha", "jest"], + "typeRoots": ["node_modules/@types", "src/types"] + }, + "include": ["src/**/*", "tests/**/*"], + "exclude": ["node_modules/**"] +} diff --git a/packages/babel-plugin-function-filemeta/tslint.json b/packages/babel-plugin-function-filemeta/tslint.json new file mode 100644 index 000000000..0946f2096 --- /dev/null +++ b/packages/babel-plugin-function-filemeta/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "../../tslint.json" +} diff --git a/yarn.lock b/yarn.lock index bee6f8fb3..37a59192b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,24 @@ # yarn lockfile v1 -"@babel/code-frame@7.0.0", "@babel/code-frame@^7.0.0": +"@babel/cli@^7.1.2": + version "7.2.0" + resolved "https://registry.npmjs.org/@babel/cli/-/cli-7.2.0.tgz#505ed8d351daee6a88918da02c046c18c8c5a24f" + integrity sha512-FLteTkEoony0DX8NbnT51CmwmLBzINdlXmiJCSqCLmqWCDA/xk8EITPWqwDnVLbuK0bsZONt/grqHnQzQ15j0Q== + dependencies: + commander "^2.8.1" + convert-source-map "^1.1.0" + fs-readdir-recursive "^1.1.0" + glob "^7.0.0" + lodash "^4.17.10" + mkdirp "^0.5.1" + output-file-sync "^2.0.0" + slash "^2.0.0" + source-map "^0.5.0" + optionalDependencies: + chokidar "^2.0.3" + +"@babel/code-frame@7.0.0", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35": version "7.0.0" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== @@ -29,7 +46,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@7.2.2", "@babel/core@^7.2.0": +"@babel/core@7.2.2", "@babel/core@^7.1.0", "@babel/core@^7.2.0": version "7.2.2" resolved "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687" integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw== @@ -284,11 +301,17 @@ esutils "^2.0.2" js-tokens "^4.0.0" +"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.2.2": + version "7.2.2" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.2.tgz#37ebdbc88a2e1ebc6c8dd3d35ea9436e3e39e477" + integrity sha512-UNTmQ5cSLDeBGBl+s7JeowkqIHgmFAGBnLDdIzFmUNSuS5JF0XBcN59jsh/vJO/YjfsBqMxhMjoFGmNExmf0FA== + "@babel/parser@^7.1.3", "@babel/parser@^7.2.0": version "7.2.0" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz#02d01dbc330b6cbf36b76ac93c50752c69027065" integrity sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg== +<<<<<<< HEAD "@babel/parser@^7.1.6", "@babel/parser@^7.2.2": version "7.2.2" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.2.tgz#37ebdbc88a2e1ebc6c8dd3d35ea9436e3e39e477" @@ -299,6 +322,8 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489" integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA== +======= +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" @@ -710,7 +735,7 @@ core-js "^2.5.7" regenerator-runtime "^0.11.1" -"@babel/preset-env@7.2.0", "@babel/preset-env@^7.1.6": +"@babel/preset-env@7.2.0", "@babel/preset-env@^7.1.0", "@babel/preset-env@^7.1.6": version "7.2.0" resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.2.0.tgz#a5030e7e4306af5a295dd5d7c78dc5464af3fee2" integrity sha512-haGR38j5vOGVeBatrQPr3l0xHbs14505DcM57cbJy48kgMFvvHHoYEhHuRV+7vi559yyAUAVbTWzbK/B/pzJng== @@ -800,36 +825,37 @@ "@babel/parser" "^7.2.2" "@babel/types" "^7.2.2" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6": - version "7.1.6" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz#c8db9963ab4ce5b894222435482bd8ea854b7b5c" - integrity sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ== +"@babel/traverse@^7.0.0-beta.37", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2": + version "7.2.2" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.2.tgz#961039de1f9bcb946d807efe2dba9c92e859d188" + integrity sha512-E5Bn9FSwHpSkUhthw/XEuvFZxIgrqb9M8cX8j5EUQtrUG5DQUy6bFyl7G7iQ1D1Czudor+xkmp81JbLVVM0Sjg== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.1.6" + "@babel/generator" "^7.2.2" "@babel/helper-function-name" "^7.1.0" "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.1.6" - "@babel/types" "^7.1.6" + "@babel/parser" "^7.2.2" + "@babel/types" "^7.2.2" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.10" -"@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2": - version "7.2.2" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.2.tgz#961039de1f9bcb946d807efe2dba9c92e859d188" - integrity sha512-E5Bn9FSwHpSkUhthw/XEuvFZxIgrqb9M8cX8j5EUQtrUG5DQUy6bFyl7G7iQ1D1Czudor+xkmp81JbLVVM0Sjg== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.6": + version "7.1.6" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.6.tgz#c8db9963ab4ce5b894222435482bd8ea854b7b5c" + integrity sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.2.2" + "@babel/generator" "^7.1.6" "@babel/helper-function-name" "^7.1.0" "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.2.2" - "@babel/types" "^7.2.2" + "@babel/parser" "^7.1.6" + "@babel/types" "^7.1.6" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.10" +<<<<<<< HEAD "@babel/traverse@^7.2.3": version "7.2.3" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" @@ -846,6 +872,9 @@ lodash "^4.17.10" "@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.2.0", "@babel/types@^7.2.2": +======= +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.37", "@babel/types@^7.1.6", "@babel/types@^7.2.0", "@babel/types@^7.2.2": +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin version "7.2.2" resolved "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e" integrity sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg== @@ -1940,6 +1969,14 @@ resolved "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.0.tgz#d1d55958d1fccc5527d4aba29fc9c4b942f563ff" integrity sha512-7WcbyctkE8GTzogDb0ulRAEw7v8oIS54ft9mQTU7PfM0hp5e+8kpa+HeQ7IQrFbKtJXBKcZ4bh+Em9dTw5L6AQ== +"@types/babel__template@^7.0.0": + version "7.0.1" + resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.1.tgz#8de6effa729bf0b0f65eb72399b629a3998a7f10" + integrity sha512-LT1zwkpL0/2oBP+npLaOCYSWv47cxbdAvONutjalMdCIBfjtfzVNnT8rgllBmsr15QAdAZDOmYw1CPhLB2JCtA== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/body-parser@*": version "1.17.0" resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c" @@ -2064,6 +2101,11 @@ "@types/events" "*" "@types/node" "*" +"@types/jest@^23.3.2": + version "23.3.10" + resolved "https://registry.npmjs.org/@types/jest/-/jest-23.3.10.tgz#4897974cc317bf99d4fe6af1efa15957fa9c94de" + integrity sha512-DC8xTuW/6TYgvEg3HEXS7cu9OijFqprVDXXiOcdOKZCU/5PJNLZU37VVvmZHdtMiGOa8wAA/We+JzbdxFzQTRQ== + "@types/lodash.flatten@^4.4.4": version "4.4.4" resolved "https://registry.npmjs.org/@types/lodash.flatten/-/lodash.flatten-4.4.4.tgz#7f28009ef57c8d2b1d8463c3e53fdccf780120a5" @@ -2105,6 +2147,11 @@ resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== +"@types/mocha@^5.2.5": + version "5.2.5" + resolved "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.5.tgz#8a4accfc403c124a0bafe8a9fc61a05ec1032073" + integrity sha512-lAVp+Kj54ui/vLUFxsJTMtWvZraZxum3w3Nwkble2dNuV5VnPA+Mi2oGX9XYJAaIvZi3tn3cbjS/qcJXRb6Bww== + "@types/node@*": version "10.12.12" resolved "https://registry.npmjs.org/@types/node/-/node-10.12.12.tgz#e15a9d034d9210f00320ef718a50c4a799417c47" @@ -2476,6 +2523,11 @@ JSONStream@^1.0.4, JSONStream@^1.3.4: jsonparse "^1.2.0" through ">=2.2.7 <3" +abab@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" + integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w== + abbrev@1: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -2496,17 +2548,30 @@ acorn-dynamic-import@^3.0.0: dependencies: acorn "^5.0.0" +acorn-globals@^4.1.0: + version "4.3.0" + resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103" + integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw== + dependencies: + acorn "^6.0.1" + acorn-walk "^6.0.1" + acorn-jsx@^5.0.0: version "5.0.1" resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg== -acorn@^5.0.0, acorn@^5.0.3, acorn@^5.6.2, acorn@^5.7.3: +acorn-walk@^6.0.1: + version "6.1.1" + resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913" + integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw== + +acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3: version "5.7.3" resolved "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.2: +acorn@^6.0.1, acorn@^6.0.2: version "6.0.4" resolved "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754" integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg== @@ -2637,6 +2702,13 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +append-transform@^0.4.0: + version "0.4.0" + resolved "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991" + integrity sha1-126/jKlNJ24keja61EpLdKthGZE= + dependencies: + default-require-extensions "^1.0.0" + aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2: version "1.2.0" resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -2689,6 +2761,11 @@ array-differ@^1.0.0: resolved "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= +array-equal@^1.0.0: + version "1.0.0" + resolved "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" + integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= + array-filter@~0.0.0: version "0.0.1" resolved "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" @@ -2891,7 +2968,12 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@^6.26.0, babel-core@^6.26.3: +babel-core@7.0.0-bridge.0: + version "7.0.0-bridge.0" + resolved "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" + integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== + +babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3: version "6.26.3" resolved "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== @@ -2916,7 +2998,7 @@ babel-core@^6.26.0, babel-core@^6.26.3: slash "^1.0.0" source-map "^0.5.7" -babel-generator@^6.26.0: +babel-generator@^6.18.0, babel-generator@^6.26.0: version "6.26.1" resolved "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== @@ -2943,7 +3025,28 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" +<<<<<<< HEAD babel-loader@^8.0.2, babel-loader@^8.0.4: +======= +babel-jest@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1" + integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew== + dependencies: + babel-plugin-istanbul "^4.1.6" + babel-preset-jest "^23.2.0" + +babel-literal-to-ast@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/babel-literal-to-ast/-/babel-literal-to-ast-2.0.0.tgz#d39460e7e8aa7d24c0c0817e09fb9931e8cee940" + integrity sha512-kMpWsqO3Yt9bOj8wlw2+EtNbmjOiIDMa68vDIfM2MSCp0njCt5jMnJ04U/klGuHVI3MEw550m7nPX3ZXuZoLbg== + dependencies: + "@babel/traverse" "^7.0.0-beta.37" + "@babel/types" "^7.0.0-beta.37" + babylon "^7.0.0-beta.37" + +babel-loader@^8.0.2: +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin version "8.0.4" resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.4.tgz#7bbf20cbe4560629e2e41534147692d3fecbdce6" integrity sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw== @@ -2981,6 +3084,21 @@ babel-plugin-emotion@^10.0.5: find-root "^1.1.0" source-map "^0.5.7" +babel-plugin-istanbul@^4.1.6: + version "4.1.6" + resolved "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" + integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ== + dependencies: + babel-plugin-syntax-object-rest-spread "^6.13.0" + find-up "^2.1.0" + istanbul-lib-instrument "^1.10.1" + test-exclude "^4.2.1" + +babel-plugin-jest-hoist@^23.2.0: + version "23.2.0" + resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167" + integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc= + babel-plugin-jsx-pragmatic@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-1.0.2.tgz#41e2beb8642235f34b2a7ab12ca39e07201b8e59" @@ -3037,6 +3155,11 @@ babel-plugin-syntax-jsx@^6.0.0, babel-plugin-syntax-jsx@^6.18.0: resolved "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= +babel-plugin-syntax-object-rest-spread@^6.13.0: + version "6.13.0" + resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" + integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U= + babel-plugin-transform-dynamic-import@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/babel-plugin-transform-dynamic-import/-/babel-plugin-transform-dynamic-import-2.1.0.tgz#3ce618dd983c072b6e2135f527d46092fb45d80e" @@ -3065,6 +3188,14 @@ babel-polyfill@6.26.0, babel-polyfill@^6.23.0, babel-polyfill@^6.26.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" +babel-preset-jest@^23.2.0: + version "23.2.0" + resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46" + integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY= + dependencies: + babel-plugin-jest-hoist "^23.2.0" + babel-plugin-syntax-object-rest-spread "^6.13.0" + babel-register@^6.26.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" @@ -3086,7 +3217,7 @@ babel-runtime@6.26.0, babel-runtime@6.x, babel-runtime@^6.22.0, babel-runtime@^6 core-js "^2.4.0" regenerator-runtime "^0.11.0" -babel-template@^6.24.1, babel-template@^6.26.0: +babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= @@ -3097,7 +3228,7 @@ babel-template@^6.24.1, babel-template@^6.26.0: babylon "^6.18.0" lodash "^4.17.4" -babel-traverse@^6.26.0: +babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= @@ -3112,7 +3243,7 @@ babel-traverse@^6.26.0: invariant "^2.2.2" lodash "^4.17.4" -babel-types@^6.26.0: +babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0: version "6.26.0" resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= @@ -3122,11 +3253,21 @@ babel-types@^6.26.0: lodash "^4.17.4" to-fast-properties "^1.0.3" +babylon@7.0.0-beta.19: + version "7.0.0-beta.19" + resolved "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz#e928c7e807e970e0536b078ab3e0c48f9e052503" + integrity sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A== + babylon@^6.18.0: version "6.18.0" resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== +babylon@^7.0.0-beta.37: + version "7.0.0-beta.47" + resolved "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80" + integrity sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ== + bail@^1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3" @@ -3228,7 +3369,11 @@ bluebird-co@^2.2.0: resolved "https://registry.npmjs.org/bluebird-co/-/bluebird-co-2.2.0.tgz#e0a49e63b6b17e34c91f48b3934b769a377fbed7" integrity sha1-4KSeY7axfjTJH0izk0t2mjd/vtc= +<<<<<<< HEAD bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3: +======= +bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@~3.5.0: +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin version "3.5.3" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== @@ -3334,6 +3479,18 @@ brorand@^1.0.1: resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +browser-process-hrtime@^0.1.2: + version "0.1.3" + resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" + integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw== + +browser-resolve@^1.11.3: + version "1.11.3" + resolved "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" + integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ== + dependencies: + resolve "1.1.7" + browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" @@ -3420,6 +3577,20 @@ browserslist@^4.3.4: electron-to-chromium "^1.3.86" node-releases "^1.0.5" +bs-logger@0.x: + version "0.2.6" + resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" + integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== + dependencies: + fast-json-stable-stringify "2.x" + +bser@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" + integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= + dependencies: + node-int64 "^0.4.0" + btoa-lite@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337" @@ -3437,7 +3608,7 @@ buble@^0.19.3: regexpu-core "^4.2.0" vlq "^1.0.0" -buffer-from@^1.0.0: +buffer-from@1.x, buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== @@ -3701,6 +3872,13 @@ capitalize@^2.0.0: resolved "https://registry.npmjs.org/capitalize/-/capitalize-2.0.0.tgz#61859dd952aba244f03541b23e11470ada097f4b" integrity sha512-HwGrAbSn44Tm5Nz+m02oQHf+9y771rmb/cTbXFcoADy29LFRCj4PhWBT54qxfY2HJBWBplwx17Pd4ek6OFbr/Q== +capture-exit@^1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" + integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28= + dependencies: + rsvp "^3.3.3" + capture-stack-trace@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" @@ -3716,6 +3894,13 @@ caseless@~0.12.0: resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= +catharsis@~0.8.9: + version "0.8.9" + resolved "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz#98cc890ca652dd2ef0e70b37925310ff9e90fc8b" + integrity sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is= + dependencies: + underscore-contrib "~0.3.0" + ccount@^1.0.0, ccount@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff" @@ -3821,7 +4006,7 @@ check-types@^7.3.0: resolved "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4" integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg== -chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4: +chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ== @@ -3989,6 +4174,11 @@ cmd-shim@^2.0.2: graceful-fs "^4.1.2" mkdirp "~0.5.0" +co@^4.6.0: + version "4.6.0" + resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + coa@~2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz#f3f8b0b15073e35d70263fb1042cb2c023db38af" @@ -4110,7 +4300,7 @@ commander@2.17.x, commander@~2.17.1: resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.12.1, commander@^2.14.1, commander@^2.18.0, commander@^2.19.0, commander@^2.9.0: +commander@^2.12.1, commander@^2.14.1, commander@^2.18.0, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0: version "2.19.0" resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== @@ -4404,7 +4594,7 @@ conventional-recommended-bump@^4.0.4: meow "^4.0.0" q "^1.5.1" -convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: version "1.6.0" resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== @@ -4854,6 +5044,18 @@ csso@^3.5.0: dependencies: css-tree "1.0.0-alpha.29" +cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": + version "0.3.4" + resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797" + integrity sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog== + +cssstyle@^1.0.0: + version "1.1.1" + resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb" + integrity sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog== + dependencies: + cssom "0.3.x" + csstype@^2.2.0, csstype@^2.5.7: version "2.5.8" resolved "https://registry.npmjs.org/csstype/-/csstype-2.5.8.tgz#4ce5aa16ea0d562ef9105fa3ae2676f199586a35" @@ -4903,6 +5105,15 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +data-urls@^1.0.0: + version "1.1.0" + resolved "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" + integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ== + dependencies: + abab "^2.0.0" + whatwg-mimetype "^2.2.0" + whatwg-url "^7.0.0" + date-fns@^1.27.2: version "1.29.0" resolved "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6" @@ -5045,6 +5256,13 @@ default-gateway@^2.6.0: execa "^0.10.0" ip-regex "^2.1.0" +default-require-extensions@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8" + integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg= + dependencies: + strip-bom "^2.0.0" + defaults@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -5157,6 +5375,11 @@ detect-libc@^1.0.2: resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +detect-newline@^2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" + integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= + detect-node@^2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -5288,6 +5511,13 @@ domelementtype@~1.1.1: resolved "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b" integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs= +domexception@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" + integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug== + dependencies: + webidl-conversions "^4.0.2" + domhandler@2.1: version "2.1.0" resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594" @@ -5576,12 +5806,12 @@ escape-string-applescript@^2.0.0: resolved "https://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-2.0.0.tgz#760bca838668e408fe5ee52ce42caf7cb46c5273" integrity sha1-dgvKg4Zo5Aj+XuUs5CyvfLRsUnM= -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5: +escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.8.1: +escodegen@^1.8.1, escodegen@^1.9.1: version "1.11.0" resolved "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589" integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw== @@ -5744,6 +5974,13 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" +exec-sh@^0.2.0: + version "0.2.2" + resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36" + integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw== + dependencies: + merge "^1.2.0" + execa@^0.10.0: version "0.10.0" resolved "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" @@ -5799,6 +6036,11 @@ exit-on-epipe@~1.0.1: resolved "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + expand-brackets@^0.1.4: version "0.1.5" resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" @@ -5840,7 +6082,23 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" +<<<<<<< Updated upstream express@^4.16.2, express@^4.16.3, express@^4.16.4: +======= +expect@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98" + integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w== + dependencies: + ansi-styles "^3.2.0" + jest-diff "^23.6.0" + jest-get-type "^22.1.0" + jest-matcher-utils "^23.6.0" + jest-message-util "^23.4.0" + jest-regex-util "^23.3.0" + +express@^4.16.2, express@^4.16.3: +>>>>>>> Stashed changes version "4.16.4" resolved "https://registry.npmjs.org/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg== @@ -5967,7 +6225,7 @@ fast-glob@^2.0.2, fast-glob@^2.2.4: merge2 "^1.2.3" micromatch "^3.1.10" -fast-json-stable-stringify@^2.0.0: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= @@ -6003,6 +6261,13 @@ faye-websocket@~0.11.0, faye-websocket@~0.11.1: dependencies: websocket-driver ">=0.5.1" +fb-watchman@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" + integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= + dependencies: + bser "^2.0.0" + fbjs@^0.8.0, fbjs@^0.8.16, fbjs@^0.8.5, fbjs@^0.8.9: version "0.8.17" resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" @@ -6057,6 +6322,14 @@ filename-regex@^2.0.0: resolved "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= +fileset@^2.0.2: + version "2.0.3" + resolved "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0" + integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA= + dependencies: + glob "^7.0.3" + minimatch "^3.0.3" + filesize@3.6.1, filesize@^3.5.11, filesize@^3.6.1: version "3.6.1" resolved "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -6352,6 +6625,11 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.2.1" +fs-readdir-recursive@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" + integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== + fs-vacuum@^1.2.10: version "1.2.10" resolved "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36" @@ -6376,7 +6654,7 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.2.2: +fsevents@^1.2.2, fsevents@^1.2.3: version "1.2.4" resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg== @@ -6770,6 +7048,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== +growly@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" + integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + gud@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" @@ -6788,7 +7071,7 @@ handle-thing@^1.2.5: resolved "http://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ= -handlebars@^4.0.2: +handlebars@^4.0.2, handlebars@^4.0.3: version "4.0.12" resolved "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5" integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA== @@ -6829,6 +7112,11 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" + integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -7046,6 +7334,7 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" +<<<<<<< HEAD hsl-regex@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" @@ -7060,6 +7349,14 @@ html-comment-regex@^1.1.0: version "1.1.2" resolved "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== +======= +html-encoding-sniffer@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" + integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw== + dependencies: + whatwg-encoding "^1.0.1" +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin html-entities@^1.2.0: version "1.2.1" @@ -7222,7 +7519,7 @@ iconv-lite@0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -7681,6 +7978,11 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-generator-fn@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a" + integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go= + is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -7964,6 +8266,76 @@ isstream@~0.1.2: resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +istanbul-api@^1.3.1: + version "1.3.7" + resolved "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa" + integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA== + dependencies: + async "^2.1.4" + fileset "^2.0.2" + istanbul-lib-coverage "^1.2.1" + istanbul-lib-hook "^1.2.2" + istanbul-lib-instrument "^1.10.2" + istanbul-lib-report "^1.1.5" + istanbul-lib-source-maps "^1.2.6" + istanbul-reports "^1.5.1" + js-yaml "^3.7.0" + mkdirp "^0.5.1" + once "^1.4.0" + +istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1: + version "1.2.1" + resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0" + integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ== + +istanbul-lib-hook@^1.2.2: + version "1.2.2" + resolved "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86" + integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw== + dependencies: + append-transform "^0.4.0" + +istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2: + version "1.10.2" + resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca" + integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A== + dependencies: + babel-generator "^6.18.0" + babel-template "^6.16.0" + babel-traverse "^6.18.0" + babel-types "^6.18.0" + babylon "^6.18.0" + istanbul-lib-coverage "^1.2.1" + semver "^5.3.0" + +istanbul-lib-report@^1.1.5: + version "1.1.5" + resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c" + integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw== + dependencies: + istanbul-lib-coverage "^1.2.1" + mkdirp "^0.5.1" + path-parse "^1.0.5" + supports-color "^3.1.2" + +istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6: + version "1.2.6" + resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f" + integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg== + dependencies: + debug "^3.1.0" + istanbul-lib-coverage "^1.2.1" + mkdirp "^0.5.1" + rimraf "^2.6.1" + source-map "^0.5.3" + +istanbul-reports@^1.5.1: + version "1.5.1" + resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a" + integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw== + dependencies: + handlebars "^4.0.3" + isurl@^1.0.0-alpha5: version "1.0.0" resolved "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" @@ -7977,12 +8349,290 @@ javascript-stringify@^1.6.0: resolved "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3" integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM= +jest-changed-files@^23.4.2: + version "23.4.2" + resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83" + integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA== + dependencies: + throat "^4.0.0" + +jest-cli@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4" + integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ== + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.1" + exit "^0.1.2" + glob "^7.1.2" + graceful-fs "^4.1.11" + import-local "^1.0.0" + is-ci "^1.0.10" + istanbul-api "^1.3.1" + istanbul-lib-coverage "^1.2.0" + istanbul-lib-instrument "^1.10.1" + istanbul-lib-source-maps "^1.2.4" + jest-changed-files "^23.4.2" + jest-config "^23.6.0" + jest-environment-jsdom "^23.4.0" + jest-get-type "^22.1.0" + jest-haste-map "^23.6.0" + jest-message-util "^23.4.0" + jest-regex-util "^23.3.0" + jest-resolve-dependencies "^23.6.0" + jest-runner "^23.6.0" + jest-runtime "^23.6.0" + jest-snapshot "^23.6.0" + jest-util "^23.4.0" + jest-validate "^23.6.0" + jest-watcher "^23.4.0" + jest-worker "^23.2.0" + micromatch "^2.3.11" + node-notifier "^5.2.1" + prompts "^0.1.9" + realpath-native "^1.0.0" + rimraf "^2.5.4" + slash "^1.0.0" + string-length "^2.0.0" + strip-ansi "^4.0.0" + which "^1.2.12" + yargs "^11.0.0" + +jest-config@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d" + integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ== + dependencies: + babel-core "^6.0.0" + babel-jest "^23.6.0" + chalk "^2.0.1" + glob "^7.1.1" + jest-environment-jsdom "^23.4.0" + jest-environment-node "^23.4.0" + jest-get-type "^22.1.0" + jest-jasmine2 "^23.6.0" + jest-regex-util "^23.3.0" + jest-resolve "^23.6.0" + jest-util "^23.4.0" + jest-validate "^23.6.0" + micromatch "^2.3.11" + pretty-format "^23.6.0" + +jest-diff@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d" + integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g== + dependencies: + chalk "^2.0.1" + diff "^3.2.0" + jest-get-type "^22.1.0" + pretty-format "^23.6.0" + +jest-docblock@^23.2.0: + version "23.2.0" + resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7" + integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c= + dependencies: + detect-newline "^2.1.0" + +jest-each@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575" + integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg== + dependencies: + chalk "^2.0.1" + pretty-format "^23.6.0" + +jest-environment-jsdom@^23.4.0: + version "23.4.0" + resolved "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023" + integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM= + dependencies: + jest-mock "^23.2.0" + jest-util "^23.4.0" + jsdom "^11.5.1" + +jest-environment-node@^23.4.0: + version "23.4.0" + resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10" + integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA= + dependencies: + jest-mock "^23.2.0" + jest-util "^23.4.0" + jest-get-type@^22.1.0: version "22.4.3" resolved "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w== -jest-validate@^23.5.0: +jest-haste-map@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16" + integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg== + dependencies: + fb-watchman "^2.0.0" + graceful-fs "^4.1.11" + invariant "^2.2.4" + jest-docblock "^23.2.0" + jest-serializer "^23.0.1" + jest-worker "^23.2.0" + micromatch "^2.3.11" + sane "^2.0.0" + +jest-jasmine2@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0" + integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ== + dependencies: + babel-traverse "^6.0.0" + chalk "^2.0.1" + co "^4.6.0" + expect "^23.6.0" + is-generator-fn "^1.0.0" + jest-diff "^23.6.0" + jest-each "^23.6.0" + jest-matcher-utils "^23.6.0" + jest-message-util "^23.4.0" + jest-snapshot "^23.6.0" + jest-util "^23.4.0" + pretty-format "^23.6.0" + +jest-leak-detector@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de" + integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg== + dependencies: + pretty-format "^23.6.0" + +jest-matcher-utils@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80" + integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog== + dependencies: + chalk "^2.0.1" + jest-get-type "^22.1.0" + pretty-format "^23.6.0" + +jest-message-util@^23.4.0: + version "23.4.0" + resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f" + integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8= + dependencies: + "@babel/code-frame" "^7.0.0-beta.35" + chalk "^2.0.1" + micromatch "^2.3.11" + slash "^1.0.0" + stack-utils "^1.0.1" + +jest-mock@^23.2.0: + version "23.2.0" + resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134" + integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ= + +jest-regex-util@^23.3.0: + version "23.3.0" + resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5" + integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U= + +jest-resolve-dependencies@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d" + integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA== + dependencies: + jest-regex-util "^23.3.0" + jest-snapshot "^23.6.0" + +jest-resolve@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae" + integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA== + dependencies: + browser-resolve "^1.11.3" + chalk "^2.0.1" + realpath-native "^1.0.0" + +jest-runner@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38" + integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA== + dependencies: + exit "^0.1.2" + graceful-fs "^4.1.11" + jest-config "^23.6.0" + jest-docblock "^23.2.0" + jest-haste-map "^23.6.0" + jest-jasmine2 "^23.6.0" + jest-leak-detector "^23.6.0" + jest-message-util "^23.4.0" + jest-runtime "^23.6.0" + jest-util "^23.4.0" + jest-worker "^23.2.0" + source-map-support "^0.5.6" + throat "^4.0.0" + +jest-runtime@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082" + integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw== + dependencies: + babel-core "^6.0.0" + babel-plugin-istanbul "^4.1.6" + chalk "^2.0.1" + convert-source-map "^1.4.0" + exit "^0.1.2" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.1.11" + jest-config "^23.6.0" + jest-haste-map "^23.6.0" + jest-message-util "^23.4.0" + jest-regex-util "^23.3.0" + jest-resolve "^23.6.0" + jest-snapshot "^23.6.0" + jest-util "^23.4.0" + jest-validate "^23.6.0" + micromatch "^2.3.11" + realpath-native "^1.0.0" + slash "^1.0.0" + strip-bom "3.0.0" + write-file-atomic "^2.1.0" + yargs "^11.0.0" + +jest-serializer@^23.0.1: + version "23.0.1" + resolved "https://registry.npmjs.org/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165" + integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU= + +jest-snapshot@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a" + integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg== + dependencies: + babel-types "^6.0.0" + chalk "^2.0.1" + jest-diff "^23.6.0" + jest-matcher-utils "^23.6.0" + jest-message-util "^23.4.0" + jest-resolve "^23.6.0" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + pretty-format "^23.6.0" + semver "^5.5.0" + +jest-util@^23.4.0: + version "23.4.0" + resolved "https://registry.npmjs.org/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561" + integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE= + dependencies: + callsites "^2.0.0" + chalk "^2.0.1" + graceful-fs "^4.1.11" + is-ci "^1.0.10" + jest-message-util "^23.4.0" + mkdirp "^0.5.1" + slash "^1.0.0" + source-map "^0.6.0" + +jest-validate@^23.5.0, jest-validate@^23.6.0: version "23.6.0" resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474" integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A== @@ -7992,6 +8642,15 @@ jest-validate@^23.5.0: leven "^2.1.0" pretty-format "^23.6.0" +jest-watcher@^23.4.0: + version "23.4.0" + resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c" + integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw= + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.1" + string-length "^2.0.0" + jest-worker@^23.2.0: version "23.2.0" resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9" @@ -7999,10 +8658,20 @@ jest-worker@^23.2.0: dependencies: merge-stream "^1.0.1" +<<<<<<< HEAD joycon@^2.2.1: version "2.2.3" resolved "https://registry.npmjs.org/joycon/-/joycon-2.2.3.tgz#eeb1169850710c39ab60d8d4a00e50b0b61be581" integrity sha512-4gHuFIQJPickKKT4sQ0B3IyQJ1uwIATwMPXWXiq/+NAUWSzhRotwV3bNocahOsqpzI6cTZErLtCvKzZFthZ6eQ== +======= +jest@^23.6.0: + version "23.6.0" + resolved "https://registry.npmjs.org/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d" + integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw== + dependencies: + import-local "^1.0.0" + jest-cli "^23.6.0" +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin js-levenshtein@^1.1.3: version "1.1.4" @@ -8032,11 +8701,68 @@ js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0: argparse "^1.0.7" esprima "^4.0.0" +js2xmlparser@~3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz#3fb60eaa089c5440f9319f51760ccd07e2499733" + integrity sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM= + dependencies: + xmlcreate "^1.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= +jsdoc@^3.5.5: + version "3.5.5" + resolved "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz#484521b126e81904d632ff83ec9aaa096708fa4d" + integrity sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg== + dependencies: + babylon "7.0.0-beta.19" + bluebird "~3.5.0" + catharsis "~0.8.9" + escape-string-regexp "~1.0.5" + js2xmlparser "~3.0.0" + klaw "~2.0.0" + marked "~0.3.6" + mkdirp "~0.5.1" + requizzle "~0.2.1" + strip-json-comments "~2.0.1" + taffydb "2.6.2" + underscore "~1.8.3" + +jsdom@^11.5.1: + version "11.12.0" + resolved "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8" + integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw== + dependencies: + abab "^2.0.0" + acorn "^5.5.3" + acorn-globals "^4.1.0" + array-equal "^1.0.0" + cssom ">= 0.3.2 < 0.4.0" + cssstyle "^1.0.0" + data-urls "^1.0.0" + domexception "^1.0.1" + escodegen "^1.9.1" + html-encoding-sniffer "^1.0.2" + left-pad "^1.3.0" + nwsapi "^2.0.7" + parse5 "4.0.0" + pn "^1.1.0" + request "^2.87.0" + request-promise-native "^1.0.5" + sax "^1.2.4" + symbol-tree "^3.2.2" + tough-cookie "^2.3.4" + w3c-hr-time "^1.0.1" + webidl-conversions "^4.0.2" + whatwg-encoding "^1.0.3" + whatwg-mimetype "^2.1.0" + whatwg-url "^6.4.1" + ws "^5.2.0" + xml-name-validator "^3.0.0" + jsesc@^1.3.0: version "1.3.0" resolved "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" @@ -8082,18 +8808,18 @@ json3@^3.3.2: resolved "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE= -json5@^0.5.0, json5@^0.5.1: - version "0.5.1" - resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -json5@^2.1.0: +json5@2.x, json5@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== dependencies: minimist "^1.2.0" +json5@^0.5.0, json5@^0.5.1: + version "0.5.1" + resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + jsonfile@^2.1.0: version "2.4.0" resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" @@ -8178,6 +8904,18 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" +klaw@~2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz#59c128e0dc5ce410201151194eeb9cbf858650f6" + integrity sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY= + dependencies: + graceful-fs "^4.1.9" + +kleur@^2.0.1: + version "2.0.2" + resolved "https://registry.npmjs.org/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300" + integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ== + koa-range@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/koa-range/-/koa-range-0.3.0.tgz#3588e3496473a839a1bd264d2a42b1d85bd7feac" @@ -8236,6 +8974,11 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" +left-pad@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" + integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== + lerna@3.6.0: version "3.6.0" resolved "https://registry.npmjs.org/lerna/-/lerna-3.6.0.tgz#b6616873fa038ee1dae514e04322c191ff71a369" @@ -8723,7 +9466,7 @@ lodash.upperfirst@4.3.1: resolved "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984= -lodash@4.17.11, "lodash@>=3.5 <5", lodash@^4.11.2, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0: +lodash@4.17.11, "lodash@>=3.5 <5", lodash@^4.11.2, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0: version "4.17.11" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== @@ -8838,6 +9581,11 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" +make-error@1.x: + version "1.3.5" + resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8" + integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g== + make-fetch-happen@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083" @@ -8855,6 +9603,13 @@ make-fetch-happen@^4.0.1: socks-proxy-agent "^4.0.0" ssri "^6.0.0" +makeerror@1.0.x: + version "1.0.11" + resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" + integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= + dependencies: + tmpl "1.0.x" + map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -8894,6 +9649,11 @@ markdown-table@^0.4.0: resolved "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz#890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1" integrity sha1-iQwsGzv+g/sA5BKbjkz+ZFJw+dE= +marked@~0.3.6: + version "0.3.19" + resolved "http://registry.npmjs.org/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" + integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg== + match-sorter@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/match-sorter/-/match-sorter-2.3.0.tgz#99eaf386689f75bf976f6bbf7f49afb9a7ffecc8" @@ -9223,7 +9983,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -9243,7 +10003,7 @@ minimist@0.0.8: resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0: +minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= @@ -9316,7 +10076,7 @@ mixin-object@^2.0.1: for-in "^0.1.3" is-extendable "^0.1.1" -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.x, mkdirp@0.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -9519,6 +10279,11 @@ node-gyp@^3.8.0: tar "^2.0.0" which "1" +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + node-libs-browser@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" @@ -9548,6 +10313,16 @@ node-libs-browser@^2.0.0: util "^0.10.3" vm-browserify "0.0.4" +node-notifier@^5.2.1: + version "5.3.0" + resolved "https://registry.npmjs.org/node-notifier/-/node-notifier-5.3.0.tgz#c77a4a7b84038733d5fb351aafd8a268bfe19a01" + integrity sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q== + dependencies: + growly "^1.3.0" + semver "^5.5.0" + shellwords "^0.1.1" + which "^1.3.0" + node-pre-gyp@^0.10.0: version "0.10.3" resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" @@ -9764,6 +10539,11 @@ number-is-nan@^1.0.0: resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= +nwsapi@^2.0.7: + version "2.0.9" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016" + integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ== + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -9976,6 +10756,15 @@ osenv@0, osenv@^0.1.0, osenv@^0.1.4, osenv@^0.1.5: os-homedir "^1.0.0" os-tmpdir "^1.0.0" +output-file-sync@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz#f53118282f5f553c2799541792b723a4c71430c0" + integrity sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ== + dependencies: + graceful-fs "^4.1.11" + is-plain-obj "^1.1.0" + mkdirp "^0.5.1" + p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -10197,6 +10986,11 @@ parse-passwd@^1.0.0: resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= +parse5@4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" + integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA== + parse5@^5.0.0: version "5.1.0" resolved "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" @@ -10396,6 +11190,7 @@ pluralize@^7.0.0: resolved "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== +<<<<<<< HEAD poi@^12.2.4: version "12.2.4" resolved "https://registry.npmjs.org/poi/-/poi-12.2.4.tgz#0fe86790427b16867574709f19f334fe09505cd5" @@ -10454,6 +11249,12 @@ poi@^12.2.4: webpack-chain "^5.0.1" webpack-dev-server "^3.1.10" webpack-merge "^4.1.4" +======= +pn@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" + integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin polished@^2.3.1: version "2.3.1" @@ -10932,6 +11733,14 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +prompts@^0.1.9: + version "0.1.14" + resolved "https://registry.npmjs.org/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2" + integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w== + dependencies: + kleur "^2.0.1" + sisteransi "^0.1.1" + promzard@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee" @@ -10989,6 +11798,11 @@ psl@^1.1.24: resolved "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ== +psl@^1.1.28: + version "1.1.31" + resolved "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" + integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw== + public-encrypt@^4.0.0: version "4.0.3" resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" @@ -11036,7 +11850,7 @@ punycode@^1.2.4, punycode@^1.4.1: resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -punycode@^2.1.0: +punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== @@ -11561,6 +12375,13 @@ readdirp@^2.0.0: micromatch "^3.1.10" readable-stream "^2.0.2" +realpath-native@^1.0.0: + version "1.0.2" + resolved "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560" + integrity sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g== + dependencies: + util.promisify "^1.0.0" + recast@^0.16.0: version "0.16.1" resolved "https://registry.npmjs.org/recast/-/recast-0.16.1.tgz#865f1800ef76e42e5d0375763b80f4d6a05f2069" @@ -11870,6 +12691,22 @@ replace-ext@1.0.0: resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= +request-promise-core@1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" + integrity sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY= + dependencies: + lodash "^4.13.1" + +request-promise-native@^1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5" + integrity sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU= + dependencies: + request-promise-core "1.1.1" + stealthy-require "^1.1.0" + tough-cookie ">=2.3.3" + request@^2.72.0, request@^2.87.0: version "2.88.0" resolved "https://registry.npmjs.org/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" @@ -11929,6 +12766,13 @@ requires-port@^1.0.0: resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= +requizzle@~0.2.1: + version "0.2.1" + resolved "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz#6943c3530c4d9a7e46f1cddd51c158fc670cdbde" + integrity sha1-aUPDUwxNmn5G8c3dUcFY/GcM294= + dependencies: + underscore "~1.6.0" + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -11996,6 +12840,11 @@ resolve-url@^0.2.1: resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= +resolve@1.1.7: + version "1.1.7" + resolved "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= + resolve@1.8.1, resolve@^1.1.6, resolve@^1.3.2, resolve@^1.7.1, resolve@^1.8.1: version "1.8.1" resolved "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" @@ -12003,7 +12852,7 @@ resolve@1.8.1, resolve@^1.1.6, resolve@^1.3.2, resolve@^1.7.1, resolve@^1.8.1: dependencies: path-parse "^1.0.5" -resolve@^1.9.0: +resolve@1.x, resolve@^1.9.0: version "1.9.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== @@ -12156,6 +13005,11 @@ rollup@^0.67.4: "@types/estree" "0.0.39" "@types/node" "*" +rsvp@^3.3.3: + version "3.6.2" + resolved "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" + integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw== + run-applescript@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/run-applescript/-/run-applescript-3.2.0.tgz#73fb34ce85d3de8076d511ea767c30d4fdfc918b" @@ -12218,6 +13072,22 @@ safe-regex@^1.1.0: resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sane@^2.0.0: + version "2.5.2" + resolved "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa" + integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o= + dependencies: + anymatch "^2.0.0" + capture-exit "^1.2.0" + exec-sh "^0.2.0" + fb-watchman "^2.0.0" + micromatch "^3.1.4" + minimist "^1.1.1" + walker "~1.0.5" + watch "~0.18.0" + optionalDependencies: + fsevents "^1.2.3" + sax@^1.2.4, sax@~1.2.4: version "1.2.4" resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -12282,7 +13152,7 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@5.6.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@5.6.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.6.0" resolved "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== @@ -12466,6 +13336,11 @@ shelljs@^0.8.3: interpret "^1.0.0" rechoir "^0.6.2" +shellwords@^0.1.1: + version "0.1.1" + resolved "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -12487,12 +13362,19 @@ simple-git@^1.85.0: dependencies: debug "^4.0.1" +<<<<<<< HEAD simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= dependencies: is-arrayish "^0.3.1" +======= +sisteransi@^0.1.1: + version "0.1.1" + resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce" + integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g== +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin slash@^1.0.0: version "1.0.0" @@ -12658,7 +13540,7 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@~0.5.6: +source-map-support@^0.5.6, source-map-support@~0.5.6: version "0.5.9" resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA== @@ -12809,6 +13691,11 @@ stable@~0.1.6: resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== +stack-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" + integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== + stackframe@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b" @@ -12849,6 +13736,11 @@ std-env@^2.2.1: dependencies: ci-info "^1.6.0" +stealthy-require@^1.1.0: + version "1.1.1" + resolved "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= + stream-browserify@^2.0.1: version "2.0.1" resolved "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" @@ -12891,6 +13783,14 @@ string-argv@^0.0.2: resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736" integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY= +string-length@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed" + integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0= + dependencies: + astral-regex "^1.0.0" + strip-ansi "^4.0.0" + string-width@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -12986,6 +13886,11 @@ strip-ansi@^5.0.0: dependencies: ansi-regex "^4.0.0" +strip-bom@3.0.0, strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -12993,11 +13898,6 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - strip-eof@^1.0.0: version "1.0.0" resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -13079,7 +13979,18 @@ supports-color@^2.0.0: resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= +<<<<<<< HEAD supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: +======= +supports-color@^3.1.2: + version "3.2.3" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= + dependencies: + has-flag "^1.0.0" + +supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.5.0: +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -13119,6 +14030,11 @@ symbol-observable@^1.1.0: resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== +symbol-tree@^3.2.2: + version "3.2.2" + resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" + integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY= + table@^4.0.2: version "4.0.3" resolved "http://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc" @@ -13141,6 +14057,11 @@ table@^5.0.2: slice-ansi "2.0.0" string-width "^2.1.1" +taffydb@2.6.2: + version "2.6.2" + resolved "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" + integrity sha1-fLy2S1oUG2ou/CxdLGe04VCyomg= + tapable@^1.0.0, tapable@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" @@ -13208,6 +14129,17 @@ terser@^3.8.1, terser@^3.8.2: source-map "~0.6.1" source-map-support "~0.5.6" +test-exclude@^4.2.1: + version "4.2.3" + resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20" + integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA== + dependencies: + arrify "^1.0.1" + micromatch "^2.3.11" + object-assign "^4.1.0" + read-pkg-up "^1.0.1" + require-main-filename "^1.0.1" + text-extensions@^1.0.0: version "1.9.0" resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" @@ -13218,6 +14150,7 @@ text-table@0.2.0, text-table@^0.2.0: resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +<<<<<<< HEAD thread-loader@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/thread-loader/-/thread-loader-1.2.0.tgz#35dedb23cf294afbbce6c45c1339b950ed17e7a4" @@ -13226,6 +14159,12 @@ thread-loader@^1.2.0: async "^2.3.0" loader-runner "^2.3.0" loader-utils "^1.1.0" +======= +throat@^4.0.0: + version "4.1.0" + resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" + integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin through2@^2.0.0, through2@^2.0.2: version "2.0.5" @@ -13292,6 +14231,11 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" +tmpl@1.0.x: + version "1.0.4" + resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" + integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + to-arraybuffer@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" @@ -13345,6 +14289,14 @@ to-vfile@^5.0.2: is-buffer "^2.0.0" vfile "^3.0.0" +tough-cookie@>=2.3.3, tough-cookie@^2.3.4: + version "2.5.0" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" @@ -13434,6 +14386,21 @@ tryer@^1.0.0: resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +ts-jest@^23.10.3: + version "23.10.5" + resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-23.10.5.tgz#cdb550df4466a30489bf70ba867615799f388dd5" + integrity sha512-MRCs9qnGoyKgFc8adDEntAOP64fWK1vZKnOYU1o2HxaqjdJvGqmkLCPCnVq1/If4zkUmEjKPnCiUisTrlX2p2A== + dependencies: + bs-logger "0.x" + buffer-from "1.x" + fast-json-stable-stringify "2.x" + json5 "2.x" + make-error "1.x" + mkdirp "0.x" + resolve "1.x" + semver "^5.5" + yargs-parser "10.x" + tslib@1.9.3, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: version "1.9.3" resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" @@ -13557,6 +14524,23 @@ umask@^1.1.0: resolved "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0= +underscore-contrib@~0.3.0: + version "0.3.0" + resolved "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz#665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7" + integrity sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc= + dependencies: + underscore "1.6.0" + +underscore@1.6.0, underscore@~1.6.0: + version "1.6.0" + resolved "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" + integrity sha1-izixDKze9jM3uLJOT/htRa6lKag= + +underscore@~1.8.3: + version "1.8.3" + resolved "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= + unescape-js@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/unescape-js/-/unescape-js-1.1.1.tgz#a4345e654b857c29fa66469e311ccaf2e93063bd" @@ -14025,6 +15009,7 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" +<<<<<<< HEAD vue-hot-reload-api@^2.3.0: version "2.3.1" resolved "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2" @@ -14053,6 +15038,21 @@ vue-template-es2015-compiler@^1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18" integrity sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg== +======= +w3c-hr-time@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" + integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU= + dependencies: + browser-process-hrtime "^0.1.2" + +walker@~1.0.5: + version "1.0.7" + resolved "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" + integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + dependencies: + makeerror "1.0.x" +>>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin warning@^3.0.0: version "3.0.0" @@ -14068,6 +15068,14 @@ warning@^4.0.1: dependencies: loose-envify "^1.0.0" +watch@~0.18.0: + version "0.18.0" + resolved "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986" + integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY= + dependencies: + exec-sh "^0.2.0" + minimist "^1.2.0" + watchpack@^1.5.0: version "1.6.0" resolved "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" @@ -14319,11 +15327,32 @@ websocket-extensions@>=0.1.1: resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== +whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: + version "1.0.5" + resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + whatwg-fetch@>=0.10.0: version "3.0.0" resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== +whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0: + version "2.3.0" + resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^6.4.1: + version "6.5.0" + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" + integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^1.0.1" + webidl-conversions "^4.0.2" + whatwg-url@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd" @@ -14437,7 +15466,7 @@ write-file-atomic@^1.1.2: imurmurhash "^0.1.4" slide "^1.1.5" -write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: +write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA== @@ -14481,6 +15510,13 @@ ws@^4.0.0: async-limiter "~1.0.0" safe-buffer "~5.1.0" +ws@^5.2.0: + version "5.2.2" + resolved "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" + integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA== + dependencies: + async-limiter "~1.0.0" + ws@^6.0.0, ws@^6.1.2: version "6.1.2" resolved "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8" @@ -14511,6 +15547,16 @@ xdg-trashdir@^2.1.1: user-home "^2.0.0" xdg-basedir "^2.0.0" +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xmlcreate@^1.0.1: + version "1.0.2" + resolved "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz#fa6bf762a60a413fb3dd8f4b03c5b269238d308f" + integrity sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8= + xregexp@4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" @@ -14541,7 +15587,7 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yargs-parser@^10.0.0, yargs-parser@^10.1.0: +yargs-parser@10.x, yargs-parser@^10.0.0, yargs-parser@^10.1.0: version "10.1.0" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== @@ -14571,6 +15617,13 @@ yargs-parser@^8.1.0: dependencies: camelcase "^4.1.0" +yargs-parser@^9.0.2: + version "9.0.2" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" + integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc= + dependencies: + camelcase "^4.1.0" + yargs@12.0.2: version "12.0.2" resolved "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc" @@ -14607,6 +15660,24 @@ yargs@^10.0.3: y18n "^3.2.1" yargs-parser "^8.1.0" +yargs@^11.0.0: + version "11.1.0" + resolved "http://registry.npmjs.org/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, yargs@^12.0.5: version "12.0.5" resolved "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" From 1552ffc9ffb2cfd781e4d1b2ba5d26bc2eeb20c1 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Fri, 21 Dec 2018 17:38:20 -0200 Subject: [PATCH 2/5] feat(react-docgen-actual-name-handler): add new package --- .../package.json | 27 ++++++++++ .../src/index.ts | 53 +++++++++++++++++++ .../src/types.d.ts | 2 + .../tsconfig.json | 11 ++++ .../tslint.json | 3 ++ 5 files changed, 96 insertions(+) create mode 100644 packages/react-docgen-actual-name-handler/package.json create mode 100644 packages/react-docgen-actual-name-handler/src/index.ts create mode 100644 packages/react-docgen-actual-name-handler/src/types.d.ts create mode 100644 packages/react-docgen-actual-name-handler/tsconfig.json create mode 100644 packages/react-docgen-actual-name-handler/tslint.json diff --git a/packages/react-docgen-actual-name-handler/package.json b/packages/react-docgen-actual-name-handler/package.json new file mode 100644 index 000000000..bf689ee75 --- /dev/null +++ b/packages/react-docgen-actual-name-handler/package.json @@ -0,0 +1,27 @@ +{ + "name": "react-docgen-actual-name-handler", + "version": "0.13.5", + "license": "MIT", + "main": "dist/index.js", + "umd:main": "dist/index.umd.js", + "module": "dist/index.m.js", + "typings": "dist/index.d.ts", + "source": "src/index.ts", + "files": [ + "dist/", + "package.json", + "README.md" + ], + "scripts": { + "dev": "libundler watch --ts -e all", + "build": "libundler build --ts -e all --c", + "fix": "run-s fix:*", + "fix:prettier": "prettier \"src/**/*.{ts,tsx}\" --write", + "fix:tslint": "tslint --fix --project .", + "tslint": "tslint --project ." + }, + "dependencies": { + "react-docgen": "^2.21.0", + "recast": "^0.16.1" + } +} diff --git a/packages/react-docgen-actual-name-handler/src/index.ts b/packages/react-docgen-actual-name-handler/src/index.ts new file mode 100644 index 000000000..bac0fabd8 --- /dev/null +++ b/packages/react-docgen-actual-name-handler/src/index.ts @@ -0,0 +1,53 @@ +import { utils } from 'react-docgen' +import recast from 'recast' + +const { getNameOrValue, resolveFunctionDefinitionToReturnValue } = utils +const { + types: { namedTypes: types }, +} = recast + +export default function actualNameHandler(documentation: any, path: any): any { + // Function and class declarations need special treatment. The name of the + // function / class is the displayName + if ( + types.ClassDeclaration.check(path.node) || + types.FunctionDeclaration.check(path.node) + ) { + documentation.set('actualName', getNameOrValue(path.get('id'))) + } else if ( + types.ArrowFunctionExpression.check(path.node) || + types.FunctionExpression.check(path.node) + ) { + if (types.VariableDeclarator.check(path.parentPath.node)) { + documentation.set('actualName', getNameOrValue(path.parentPath.get('id'))) + } else if (types.AssignmentExpression.check(path.parentPath.node)) { + documentation.set( + 'actualName', + getNameOrValue(path.parentPath.get('left')) + ) + } + } else if ( + // React.createClass() or createReactClass() + types.CallExpression.check(path.parentPath.node) && + types.VariableDeclarator.check(path.parentPath.parentPath.parentPath.node) + ) { + documentation.set( + 'actualName', + getNameOrValue(path.parentPath.parentPath.parentPath.get('id')) + ) + } else { + // Could not find an actual name + documentation.set('actualName', '') + } + return + + // If display name is defined as a getter we get a function expression as + // value. In that case we try to determine the value from the return + // statement. + let displayNamePath + if (types.FunctionExpression.check(displayNamePath.node)) { + displayNamePath = resolveFunctionDefinitionToReturnValue(displayNamePath) + } + if (!displayNamePath || !types.Literal.check(displayNamePath.node)) return + documentation.set('actualName', displayNamePath.node.value) +} diff --git a/packages/react-docgen-actual-name-handler/src/types.d.ts b/packages/react-docgen-actual-name-handler/src/types.d.ts new file mode 100644 index 000000000..8b21abfa2 --- /dev/null +++ b/packages/react-docgen-actual-name-handler/src/types.d.ts @@ -0,0 +1,2 @@ +declare module 'recast' +declare module 'react-docgen' diff --git a/packages/react-docgen-actual-name-handler/tsconfig.json b/packages/react-docgen-actual-name-handler/tsconfig.json new file mode 100644 index 000000000..82bc70beb --- /dev/null +++ b/packages/react-docgen-actual-name-handler/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + "declaration": true, + "typeRoots": ["../../node_modules/@types", "node_modules/@types", "src/types"] + }, + "include": ["src/**/*"], + "exclude": ["node_modules/**"] +} diff --git a/packages/react-docgen-actual-name-handler/tslint.json b/packages/react-docgen-actual-name-handler/tslint.json new file mode 100644 index 000000000..0946f2096 --- /dev/null +++ b/packages/react-docgen-actual-name-handler/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "../../tslint.json" +} From b4437c6ea94d2a07e94ab4ad4281e62357201758 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Fri, 21 Dec 2018 17:40:58 -0200 Subject: [PATCH 3/5] chore(babel-plugin-export-metadata): change package --- core/babel-preset-docz/package.json | 4 +- core/babel-preset-docz/src/config.ts | 7 +- .../.babelrc | 0 .../jest.config.js | 0 .../package.json | 2 +- .../src/index.ts | 30 ++++- .../src/types.d.ts | 0 .../tests/fixtures/example.js | 4 + .../tests/index.test.ts | 0 .../tests/types.d.ts | 0 .../tsconfig.json | 0 .../tslint.json | 0 .../tests/__snapshots__/index.test.ts.snap | 109 ------------------ 13 files changed, 31 insertions(+), 125 deletions(-) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/.babelrc (100%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/jest.config.js (100%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/package.json (96%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/src/index.ts (58%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/src/types.d.ts (100%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/tests/fixtures/example.js (91%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/tests/index.test.ts (100%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/tests/types.d.ts (100%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/tsconfig.json (100%) rename packages/{babel-plugin-function-filemeta => babel-plugin-export-metadata}/tslint.json (100%) delete mode 100644 packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap diff --git a/core/babel-preset-docz/package.json b/core/babel-preset-docz/package.json index 6ac7e2bc9..fd2aaeb64 100644 --- a/core/babel-preset-docz/package.json +++ b/core/babel-preset-docz/package.json @@ -4,7 +4,6 @@ "description": "Babel preset used on docz", "license": "MIT", "main": "dist/index.js", - "umd:main": "dist/index.umd.js", "module": "dist/index.m.js", "typings": "dist/index.d.ts", "source": "src/index.ts", @@ -33,9 +32,8 @@ "@babel/preset-flow": "7.0.0", "@babel/preset-react": "7.0.0", "@babel/preset-typescript": "7.1.0", - "babel-plugin-function-filemeta": "^0.13.4", + "babel-plugin-export-metadata": "^0.13.4", "babel-plugin-macros": "^2.4.3", - "babel-plugin-react-docgen": "^2.0.0", "babel-plugin-transform-dynamic-import": "^2.0.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.21" } diff --git a/core/babel-preset-docz/src/config.ts b/core/babel-preset-docz/src/config.ts index a27e353ca..b1d2b478b 100644 --- a/core/babel-preset-docz/src/config.ts +++ b/core/babel-preset-docz/src/config.ts @@ -1,7 +1,6 @@ interface ConfigParams { flow: boolean typescript: boolean - parseProps: boolean env: { dev: boolean prod: boolean @@ -50,11 +49,7 @@ export const config = (opts: ConfigParams) => { require('@babel/plugin-transform-runtime').default, { helpers: false, regenerator: true }, ], - opts.parseProps && [ - require('babel-plugin-react-docgen').default, - { resolver: 'findAllExportedComponentDefinitions' }, - ], - require('babel-plugin-function-filemeta').default, + require('babel-plugin-export-metadata').default, opts.env.prod && [ require('babel-plugin-transform-react-remove-prop-types').default, { removeImport: true }, diff --git a/packages/babel-plugin-function-filemeta/.babelrc b/packages/babel-plugin-export-metadata/.babelrc similarity index 100% rename from packages/babel-plugin-function-filemeta/.babelrc rename to packages/babel-plugin-export-metadata/.babelrc diff --git a/packages/babel-plugin-function-filemeta/jest.config.js b/packages/babel-plugin-export-metadata/jest.config.js similarity index 100% rename from packages/babel-plugin-function-filemeta/jest.config.js rename to packages/babel-plugin-export-metadata/jest.config.js diff --git a/packages/babel-plugin-function-filemeta/package.json b/packages/babel-plugin-export-metadata/package.json similarity index 96% rename from packages/babel-plugin-function-filemeta/package.json rename to packages/babel-plugin-export-metadata/package.json index 1bf1e9736..ee2127d59 100644 --- a/packages/babel-plugin-function-filemeta/package.json +++ b/packages/babel-plugin-export-metadata/package.json @@ -1,5 +1,5 @@ { - "name": "babel-plugin-function-filemeta", + "name": "babel-plugin-export-metadata", "version": "0.13.4", "description": "Add file metadata for function declarations", "license": "MIT", diff --git a/packages/babel-plugin-function-filemeta/src/index.ts b/packages/babel-plugin-export-metadata/src/index.ts similarity index 58% rename from packages/babel-plugin-function-filemeta/src/index.ts rename to packages/babel-plugin-export-metadata/src/index.ts index fe83511d2..61e572379 100644 --- a/packages/babel-plugin-function-filemeta/src/index.ts +++ b/packages/babel-plugin-export-metadata/src/index.ts @@ -20,21 +20,32 @@ const findPathToInsert = (path: any): any => ? path : findPathToInsert(path.parentPath) -const checkIfIsInsideAnObject = (path: any, is?: boolean): boolean => { +const checkReverseOnThree = (pred: (type: string) => boolean = () => false) => ( + path: any, + is?: boolean +): boolean => { const parentType = path.parent.type if (parentType === 'Program') return Boolean(is) - if (parentType === 'ObjectProperty' || parentType === 'ClassProperty') { - return true - } - return checkIfIsInsideAnObject(path.parentPath, false) + if (pred(parentType)) return true + return checkReverseOnThree(pred)(path.parentPath, false) } +const checkIfIsInsideAnObject = checkReverseOnThree( + (type: string) => type === 'ObjectProperty' || type === 'ClassProperty' +) + +const checkIfIsExported = checkReverseOnThree( + type => + type === 'ExportNamedDeclaration' || type === 'ExportDefaultDeclaration' +) + const insertNode = (t: any) => (path: any, state: any) => { const filename = getFilename(state) const name = getPathName(path) const isInsideObject = checkIfIsInsideAnObject(path) + const isExported = checkIfIsExported(path) - if (filename && name && !isInsideObject) { + if (filename && name && !isInsideObject && isExported) { const pathToInsert = findPathToInsert(path) const newNode = buildFileMeta({ ID: t.identifier(name), @@ -54,6 +65,13 @@ export default function({ types: t }: any): any { FunctionDeclaration: insert, ClassDeclaration: insert, ArrowFunctionExpression: insert, + VariableDeclarator: insert, + // CallExpression(path: any, state: any): void { + // const callee = get(path, 'node.callee') + // const name = get(callee, 'name') || get(callee, 'object.name') + // console.log(name) + // if (name === 'styled') return insert(path, state) + // }, }, } } diff --git a/packages/babel-plugin-function-filemeta/src/types.d.ts b/packages/babel-plugin-export-metadata/src/types.d.ts similarity index 100% rename from packages/babel-plugin-function-filemeta/src/types.d.ts rename to packages/babel-plugin-export-metadata/src/types.d.ts diff --git a/packages/babel-plugin-function-filemeta/tests/fixtures/example.js b/packages/babel-plugin-export-metadata/tests/fixtures/example.js similarity index 91% rename from packages/babel-plugin-function-filemeta/tests/fixtures/example.js rename to packages/babel-plugin-export-metadata/tests/fixtures/example.js index 07ccdb376..f4d1c7b1e 100644 --- a/packages/babel-plugin-function-filemeta/tests/fixtures/example.js +++ b/packages/babel-plugin-export-metadata/tests/fixtures/example.js @@ -32,6 +32,10 @@ class Abc { } } +export const component = styled.div` + background: red; +` + export class Abcd { /** * Some description diff --git a/packages/babel-plugin-function-filemeta/tests/index.test.ts b/packages/babel-plugin-export-metadata/tests/index.test.ts similarity index 100% rename from packages/babel-plugin-function-filemeta/tests/index.test.ts rename to packages/babel-plugin-export-metadata/tests/index.test.ts diff --git a/packages/babel-plugin-function-filemeta/tests/types.d.ts b/packages/babel-plugin-export-metadata/tests/types.d.ts similarity index 100% rename from packages/babel-plugin-function-filemeta/tests/types.d.ts rename to packages/babel-plugin-export-metadata/tests/types.d.ts diff --git a/packages/babel-plugin-function-filemeta/tsconfig.json b/packages/babel-plugin-export-metadata/tsconfig.json similarity index 100% rename from packages/babel-plugin-function-filemeta/tsconfig.json rename to packages/babel-plugin-export-metadata/tsconfig.json diff --git a/packages/babel-plugin-function-filemeta/tslint.json b/packages/babel-plugin-export-metadata/tslint.json similarity index 100% rename from packages/babel-plugin-function-filemeta/tslint.json rename to packages/babel-plugin-export-metadata/tslint.json diff --git a/packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap b/packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap deleted file mode 100644 index e9110f576..000000000 --- a/packages/babel-plugin-function-filemeta/tests/__snapshots__/index.test.ts.snap +++ /dev/null @@ -1,109 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`works 1`] = ` -"\\"use strict\\"; - -Object.defineProperty(exports, \\"__esModule\\", { - value: true -}); -exports.getOther = getOther; -exports.default = exports.Abcd = exports.bar = void 0; - -const foo = () => 'foo'; - -foo.__filemeta = { - name: \\"foo\\", - filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" -}; - -const bar = () => 'bar'; - -exports.bar = bar; -bar.__filemeta = { - name: \\"bar\\", - filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" -}; -const obj = { - foo: () => 'foo' - /** - * Some description - */ - -}; - -function get(object, path) { - return object[path]; -} - -get.__filemeta = { - name: \\"get\\", - filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" -}; - -function getOther(object, path) { - return object[path]; -} - -getOther.__filemeta = { - name: \\"getOther\\", - filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" -}; -const obj2 = { - get: () => null - /** - * Some description - */ - -}; - -class Abc { - /** - * Some description - */ - method() { - return null; - } - -} - -Abc.__filemeta = { - name: \\"Abc\\", - filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" -}; - -class Abcd { - /** - * Some description - */ - method() { - return null; - } - -} - -exports.Abcd = Abcd; -Abcd.__filemeta = { - name: \\"Abcd\\", - filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" -}; -const obj3 = { - method: class Abcd { - method() { - return null; - } - - } -}; - -const log = fn => fn(1); - -log.__filemeta = { - name: \\"log\\", - filename: \\"/Volumes/Projects/dev/docz/docz/packages/babel-plugin-function-filemeta/tests/fixtures/example.js\\" -}; -log(id => console.log(id)); - -var _default = () => 'other'; - -exports.default = _default;" -`; From c32f4168e736e0d10625053a7dc10d1788c3c995 Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Fri, 21 Dec 2018 17:43:16 -0200 Subject: [PATCH 4/5] feat(docz-core): add react docgen on data server --- core/babel-preset-docz/src/index.ts | 57 +++++++ core/docz-core/package.json | 10 +- core/docz-core/src/DataServer.ts | 20 ++- core/docz-core/src/commands/args.ts | 7 + core/docz-core/src/commands/build.ts | 3 +- core/docz-core/src/commands/dev.ts | 3 +- core/docz-core/src/config/babel.ts | 15 +- core/docz-core/src/states/config.ts | 3 +- core/docz-core/src/states/entries.ts | 1 + core/docz-core/src/states/index.ts | 1 + core/docz-core/src/types.d.ts | 3 + core/docz-core/src/utils/load-config.ts | 1 + core/docz-core/src/webpack/loaders.ts | 26 +-- core/docz-core/src/webpack/plugins.ts | 1 + core/docz-core/src/webpack/server.ts | 3 +- core/docz/src/components/DataServer.tsx | 21 +-- core/docz/src/components/PropsTable.tsx | 148 +++++++++--------- core/docz/src/state.tsx | 1 + .../babel-plugin-export-metadata/src/index.ts | 6 - packages/docz-core/.babelrc | 3 + packages/docz-core/src/states/props.ts | 64 ++++++++ packages/docz-core/src/utils/docgen.ts | 75 +++++++++ yarn.lock | 78 +++++---- 23 files changed, 378 insertions(+), 172 deletions(-) create mode 100644 core/babel-preset-docz/src/index.ts create mode 100644 packages/docz-core/.babelrc create mode 100644 packages/docz-core/src/states/props.ts create mode 100644 packages/docz-core/src/utils/docgen.ts diff --git a/core/babel-preset-docz/src/index.ts b/core/babel-preset-docz/src/index.ts new file mode 100644 index 000000000..9406adbe1 --- /dev/null +++ b/core/babel-preset-docz/src/index.ts @@ -0,0 +1,57 @@ +import { config } from './config' + +const validateBool = (name: string, value: any, defaultValue: any) => { + if (typeof value === 'undefined') { + value = defaultValue + } + + if (typeof value !== 'boolean') { + throw new Error(`Preset react-app: '${name}' option must be a boolean.`) + } + + return value +} + +export interface PresetOptions { + flow?: boolean + typescript?: false +} + +const DEFAULT_OPTS: PresetOptions = { + flow: false, + typescript: false, +} + +const preset = (api: any, opts: PresetOptions = DEFAULT_OPTS) => { + const env = process.env.BABEL_ENV || process.env.NODE_ENV + const isDev = env === 'development' + const isProd = env === 'production' + const isTest = env === 'test' + + if (!isDev && !isProd && !isTest) { + throw new Error( + 'Using `babel-preset-docz` requires that you specify `NODE_ENV` or ' + + '`BABEL_ENV` environment variables. Valid values are "development", ' + + '"test", and "production". Instead, received: ' + + JSON.stringify(env) + + '.' + ) + } + + const isFlowEnabled = validateBool('flow', opts.flow, false) + const isTSEnabled = validateBool('typescript', opts.typescript, false) + + const parsedOpts = { + typescript: isTSEnabled, + flow: isFlowEnabled, + env: { + dev: isDev, + prod: isProd, + test: isTest, + }, + } + + return config(parsedOpts) +} + +export default preset diff --git a/core/docz-core/package.json b/core/docz-core/package.json index 76e48b4ef..db9454dea 100644 --- a/core/docz-core/package.json +++ b/core/docz-core/package.json @@ -4,7 +4,6 @@ "description": "All docz core logic of bundle and parsing is included on this package", "license": "MIT", "main": "dist/index.js", - "umd:main": "dist/index.umd.js", "module": "dist/index.m.js", "typings": "dist/index.d.ts", "source": "src/index.ts", @@ -64,7 +63,11 @@ "poi": "^12.2.4", "progress-estimator": "^0.2.2", "react-dev-utils": "^6.1.1", - "react-docgen-typescript-loader": "^3.0.0-rc.0", + "react-docgen": "^2.21.0", + "react-docgen-actual-name-handler": "0.13.5", + "react-docgen-external-proptypes-handler": "^1.0.2", + "react-docgen-imported-proptype-handler": "^1.0.4", + "react-docgen-typescript": "^1.12.2", "react-hot-loader": "^4.6.3", "rehype-docz": "^0.13.5", "rehype-slug": "^2.0.2", @@ -86,5 +89,6 @@ "webpackbar": "^3.1.4", "ws": "^6.1.2", "yargs": "^12.0.5" - } + }, + "devDependencies": {} } diff --git a/core/docz-core/src/DataServer.ts b/core/docz-core/src/DataServer.ts index 8e9456901..9bee6c5b0 100644 --- a/core/docz-core/src/DataServer.ts +++ b/core/docz-core/src/DataServer.ts @@ -4,6 +4,7 @@ import { isFunction } from 'lodash/fp' import { touch } from './utils/fs' import * as paths from './config/paths' import { onSignal } from './utils/on-signal' +import { promiseLogger } from './utils/promise-logger' export type Send = (type: string, payload: any) => void export type On = (type: string) => Promise @@ -26,6 +27,7 @@ export interface Params { } export interface State { + id: string init: (params: Params) => Promise update: (params: Params) => any close: (params: Params) => any @@ -56,14 +58,16 @@ export class DataServer { public async init(): Promise { await Promise.all( - Array.from(this.states).map( - async state => - isFunction(state.init) && - state.init({ - state: { ...this.state }, - setState: this.setState(), - }) - ) + Array.from(this.states).map(async state => { + if (!isFunction(state.init)) return + + const promise = state.init({ + state: { ...this.state }, + setState: this.setState(), + }) + + return promiseLogger(promise, `Initial data for ${state.id}`) + }) ) this.updateStateFile() diff --git a/core/docz-core/src/commands/args.ts b/core/docz-core/src/commands/args.ts index b653c70e6..43164e1d0 100644 --- a/core/docz-core/src/commands/args.ts +++ b/core/docz-core/src/commands/args.ts @@ -24,6 +24,12 @@ const getInitialDescription = (pkg: any): string => export type Env = 'production' | 'development' export type ThemeConfig = Record +export interface DocgenConfig { + handlers?: any[] + resolver?: (ast: any, recast: any) => any + propFilter?: (prop: any) => boolean +} + export interface Menu { name: string route?: string @@ -89,6 +95,7 @@ export interface Config extends Argv { menu: Menu[] htmlContext: HtmlContext themeConfig: ThemeConfig + docgenConfig: DocgenConfig modifyBundlerConfig(config: C, dev: boolean, args: Config): C modifyBabelRc(babelrc: BabelRC, args: Config): BabelRC onCreateWebpackChain(c: C, dev: boolean, args: Config): void diff --git a/core/docz-core/src/commands/build.ts b/core/docz-core/src/commands/build.ts index 44f254245..7f0b7a13e 100644 --- a/core/docz-core/src/commands/build.ts +++ b/core/docz-core/src/commands/build.ts @@ -20,11 +20,12 @@ export const build = async (args: Config) => { const run = Plugin.runPluginsMethod(config.plugins) const dataServer = new DataServer() + if (args.propsParser) dataServer.register([states.props(config)]) dataServer.register([states.config(config), states.entries(entries, config)]) try { await promiseLogger(Entries.writeApp(config, true), 'Parsing mdx files') - await promiseLogger(dataServer.init(), 'Initializing data server') + await promiseLogger(dataServer.init(), 'Running data server') await promiseLogger(run('onPreBuild', config), 'Running onPreBuild()') await bundler.build(bundlerConfig) diff --git a/core/docz-core/src/commands/dev.ts b/core/docz-core/src/commands/dev.ts index 4e92d6c1d..26c055a41 100644 --- a/core/docz-core/src/commands/dev.ts +++ b/core/docz-core/src/commands/dev.ts @@ -42,13 +42,14 @@ export const dev = async (args: Config) => { config.websocketHost ) + if (args.propsParser) dataServer.register([states.props(newConfig)]) dataServer.register([ states.config(newConfig), states.entries(entries, newConfig), ]) try { - await promiseLogger(dataServer.init(), 'Initializing data server') + await promiseLogger(dataServer.init(), 'Running data server') await dataServer.listen() } catch (err) { logger.fatal('Failed to process your server:', err) diff --git a/core/docz-core/src/config/babel.ts b/core/docz-core/src/config/babel.ts index 4b7992c2d..051454e8a 100644 --- a/core/docz-core/src/config/babel.ts +++ b/core/docz-core/src/config/babel.ts @@ -32,20 +32,17 @@ export const getBabelConfig = async ( const config = merge(localBabelRc, { presets, babelrc: false, - ...(!args.debug && { - cacheDirectory: true, - cacheIdentifier: getCacheIdentifier( - isProd ? 'production' : isDev && 'development', - [ + cacheCompression: args.debug ? false : isProd, + cacheDirectory: !args.debug, + cacheIdentifier: args.debug + ? null + : getCacheIdentifier(isProd ? 'production' : isDev && 'development', [ 'docz', 'docz-theme-default', 'docz-utils', 'docz-core', 'babel-preset-docz', - ] - ), - }), - cacheCompression: isProd, + ]), compact: isProd, plugins: !isProd ? [require.resolve('react-hot-loader/babel')] : [], }) diff --git a/core/docz-core/src/states/config.ts b/core/docz-core/src/states/config.ts index 121205244..ef95a005c 100644 --- a/core/docz-core/src/states/config.ts +++ b/core/docz-core/src/states/config.ts @@ -3,10 +3,10 @@ import { load, finds } from 'load-cfg' import chokidar from 'chokidar' import get from 'lodash/get' +import * as paths from '../config/paths' import { Params, State } from '../DataServer' import { Config, Menu, ThemeConfig } from '../commands/args' import { getRepoUrl } from '../utils/repo-info' -import * as paths from '../config/paths' interface Payload { title: string @@ -50,6 +50,7 @@ export const state = (config: Config): State => { watcher.setMaxListeners(Infinity) return { + id: 'config', init: updateConfig(config), close: () => watcher.close(), update: async params => { diff --git a/core/docz-core/src/states/entries.ts b/core/docz-core/src/states/entries.ts index fb7b6d5a4..e463aa08b 100644 --- a/core/docz-core/src/states/entries.ts +++ b/core/docz-core/src/states/entries.ts @@ -37,6 +37,7 @@ export const state = (entries: Entries, config: Config): State => { watcher.setMaxListeners(Infinity) return { + id: 'entries', init: updateEntries(entries), close: () => watcher.close(), update: async params => { diff --git a/core/docz-core/src/states/index.ts b/core/docz-core/src/states/index.ts index affced420..25199268a 100644 --- a/core/docz-core/src/states/index.ts +++ b/core/docz-core/src/states/index.ts @@ -1,2 +1,3 @@ export { state as entries } from './entries' export { state as config } from './config' +export { state as props } from './props' diff --git a/core/docz-core/src/types.d.ts b/core/docz-core/src/types.d.ts index bca0977a0..ab91e7c63 100644 --- a/core/docz-core/src/types.d.ts +++ b/core/docz-core/src/types.d.ts @@ -17,6 +17,9 @@ declare module 'humanize-string' declare module 'mini-html-webpack-plugin' declare module 'p-reduce' declare module 'progress-estimator' +declare module 'react-docgen' +declare module 'react-docgen-external-proptypes-handler' +declare module 'react-docgen-imported-proptype-handler' declare module 'react-dev-utils/errorOverlayMiddleware' declare module 'react-dev-utils/evalSourceMapMiddleware' declare module 'react-dev-utils/FileSizeReporter' diff --git a/core/docz-core/src/utils/load-config.ts b/core/docz-core/src/utils/load-config.ts index 845470306..22f3b597f 100644 --- a/core/docz-core/src/utils/load-config.ts +++ b/core/docz-core/src/utils/load-config.ts @@ -30,6 +30,7 @@ export const loadConfig = async (args: Config): Promise => { 'license.md', ], themeConfig: {}, + docgenConfig: {}, modifyBundlerConfig: (config: any) => config, modifyBabelRc: (babelrc: BabelRC) => babelrc, onCreateWebpackChain: () => null, diff --git a/core/docz-core/src/webpack/loaders.ts b/core/docz-core/src/webpack/loaders.ts index 7452bd5dd..6e8a52ff3 100644 --- a/core/docz-core/src/webpack/loaders.ts +++ b/core/docz-core/src/webpack/loaders.ts @@ -54,8 +54,8 @@ export const mdx = (config: Config, args: Args) => { .end() .exclude.add(excludeNodeModules) .end() - .use('happypack-mdx') - .loader('happypack/loader?id=mdx') + .use('happypack-jsx') + .loader('happypack/loader?id=jsx') .end() .use('mdx-loader') .loader(require.resolve('@mdx-js/loader')) @@ -81,33 +81,11 @@ export const setupHappypack = (config: Config, args: Args, babelrc: any) => { }, ] - const loaderWithDocgen = [ - args.propsParser && - args.typescript && { - loader: require.resolve('react-docgen-typescript-loader'), - options: { - propFilter: (prop: any) => { - if (prop.parent == null) return true - return !prop.parent.fileName.includes('node_modules') - }, - }, - }, - ] - config.plugin('happypack-jsx').use(HappyPack, [ { id: 'jsx', verbose: args.debug, threadPool: happyThreadPool, - loaders: loaders.concat(loaderWithDocgen).filter(Boolean), - }, - ]) - - config.plugin('happypack-mdx').use(HappyPack, [ - { - id: 'mdx', - verbose: args.debug, - threadPool: happyThreadPool, loaders: loaders.filter(Boolean), }, ]) diff --git a/core/docz-core/src/webpack/plugins.ts b/core/docz-core/src/webpack/plugins.ts index a91ee3261..96ad68ac8 100644 --- a/core/docz-core/src/webpack/plugins.ts +++ b/core/docz-core/src/webpack/plugins.ts @@ -30,6 +30,7 @@ export const analyzer = (config: Config) => { { generateStatsFile: true, openAnalyzer: false, + analyzerMode: 'static', }, ]) } diff --git a/core/docz-core/src/webpack/server.ts b/core/docz-core/src/webpack/server.ts index d7d631ef2..d97cad165 100644 --- a/core/docz-core/src/webpack/server.ts +++ b/core/docz-core/src/webpack/server.ts @@ -1,4 +1,5 @@ import * as fs from 'fs' +import logger from 'signale' import { Configuration as Config } from 'webpack' import WebpackDevServer from 'webpack-dev-server' @@ -27,7 +28,7 @@ export const server = (args: Args) => async (config: Config, hooks: Hooks) => { start: async () => { const devServer = new WebpackDevServer(compiler, serverConfig) devServer.listen(args.port, args.host, err => { - if (err) return console.log(err) + if (err) return logger.fatal(err) hooks.onServerListening(devServer) }) diff --git a/core/docz/src/components/DataServer.tsx b/core/docz/src/components/DataServer.tsx index 12801952d..d8652612e 100644 --- a/core/docz/src/components/DataServer.tsx +++ b/core/docz/src/components/DataServer.tsx @@ -19,26 +19,21 @@ export class DataServer extends Component { if (this.socket) this.setupWebsockets(this.socket) } + public componentWillUnmount(): void { + if (this.socket) this.socket.close() + } + public render(): ReactNode { return this.props.children } private setupWebsockets(socket: WebSocket): void { socket.onmessage = (ev: any) => { - const message = JSON.parse(ev.data) - - if (message.type === 'state.entries') { - state.set(state => ({ - ...state, - entries: message.payload, - })) - } + const { type, payload } = JSON.parse(ev.data) + const prop = type.startsWith('state.') && type.split('.')[1] - if (message.type === 'state.config') { - state.set(state => ({ - ...state, - config: message.payload, - })) + if (prop) { + state.set(state => ({ ...state, [prop]: payload })) } } } diff --git a/core/docz/src/components/PropsTable.tsx b/core/docz/src/components/PropsTable.tsx index 473e49327..361e3f1de 100644 --- a/core/docz/src/components/PropsTable.tsx +++ b/core/docz/src/components/PropsTable.tsx @@ -1,9 +1,10 @@ import * as React from 'react' import { CSSProperties, Fragment, SFC, ComponentType } from 'react' import { withMDXComponents } from '@mdx-js/tag/dist/mdx-provider' -import { get } from 'lodash/fp' +import { last, get } from 'lodash/fp' import capitalize from 'capitalize' +import { state } from '../state' import { humanize } from '../utils/humanize-prop' export interface StylesMap { @@ -108,78 +109,81 @@ export const getPropType = (prop: Prop, Tooltip?: TooltipComponent) => { ) } -const BasePropsTable: SFC = ({ of: component, components }) => { - const info = component.__docgenInfo - const props = info && info.props - - if (!info || !props) { - return null - } - - const hasDescription = Object.keys(props).some((name: string) => { - const description = get(`${name}.description`, props) - return Boolean(description) && Boolean(get('length', description)) - }) - - const Table = components.table || 'table' - const Thead = components.thead || 'thead' - const Tr = components.tr || 'tr' - const Th = components.th || 'th' - const Tbody = components.tbody || 'tbody' - const Td = components.td || 'td' - const Tooltip = components.tooltip - - return ( - - - - - - - - - {hasDescription && ( - - )} - - - - {props && - Object.keys(props).map((name: string) => { - const prop = props[name] - - if (!prop.flowType && !prop.type) return null - return ( - - - - - {!prop.defaultValue ? ( - - ) : ( - + )} + + ) + })} + +
PropertyTypeRequiredDefault - Description -
{name}{getPropType(prop, Tooltip)}{String(prop.required)} - - - - {prop.defaultValue.value === "''" ? ( - [Empty String] +const BasePropsTable: SFC = ({ of: component, components }) => ( + + {state.get(s => { + const filename = get('__filemeta.filename', component) + const definition: any = last(s.props[filename] || []) + const props = get('props', definition) + + if (!props) return null + + const hasDescription = Object.keys(props).some((name: string) => { + const description = get(`${name}.description`, props) + return Boolean(description) && Boolean(get('length', description)) + }) + + const Table = components.table || 'table' + const Thead = components.thead || 'thead' + const Tr = components.tr || 'tr' + const Th = components.th || 'th' + const Tbody = components.tbody || 'tbody' + const Td = components.td || 'td' + const Tooltip = components.tooltip + + return ( + + + + + + + + + {hasDescription && ( + + )} + + + + {props && + Object.keys(props).map((name: string) => { + const prop = props[name] + + if (!prop.flowType && !prop.type) return null + return ( + + + + + {!prop.defaultValue ? ( + ) : ( - prop.defaultValue && - prop.defaultValue.value.replace(/\'/g, '') + )} - - )} - {hasDescription && ( - - )} - - ) - })} - -
PropertyTypeRequiredDefault + Description +
{name}{getPropType(prop, Tooltip)}{String(prop.required)} + - + + {prop.defaultValue.value === "''" ? ( + [Empty String] + ) : ( + prop.defaultValue && + prop.defaultValue.value.replace(/\'/g, '') + )} + {prop.description && prop.description}
-
- ) -} + {hasDescription && ( +
{prop.description && prop.description}
+
+ ) + })} + +) export const PropsTable = withMDXComponents(BasePropsTable) diff --git a/core/docz/src/state.tsx b/core/docz/src/state.tsx index 1d2bdc45f..81d3bb0f2 100644 --- a/core/docz/src/state.tsx +++ b/core/docz/src/state.tsx @@ -48,6 +48,7 @@ export type TransformFn = (config: ThemeConfig) => ThemeConfig export interface State { config?: Config entries?: EntryMap + props?: any themeConfig?: ThemeConfig transform?: TransformFn } diff --git a/packages/babel-plugin-export-metadata/src/index.ts b/packages/babel-plugin-export-metadata/src/index.ts index 61e572379..1074ff456 100644 --- a/packages/babel-plugin-export-metadata/src/index.ts +++ b/packages/babel-plugin-export-metadata/src/index.ts @@ -66,12 +66,6 @@ export default function({ types: t }: any): any { ClassDeclaration: insert, ArrowFunctionExpression: insert, VariableDeclarator: insert, - // CallExpression(path: any, state: any): void { - // const callee = get(path, 'node.callee') - // const name = get(callee, 'name') || get(callee, 'object.name') - // console.log(name) - // if (name === 'styled') return insert(path, state) - // }, }, } } diff --git a/packages/docz-core/.babelrc b/packages/docz-core/.babelrc new file mode 100644 index 000000000..c8a00e571 --- /dev/null +++ b/packages/docz-core/.babelrc @@ -0,0 +1,3 @@ +{ + "plugins": ["lodash"] +} diff --git a/packages/docz-core/src/states/props.ts b/packages/docz-core/src/states/props.ts new file mode 100644 index 000000000..2e975b8d7 --- /dev/null +++ b/packages/docz-core/src/states/props.ts @@ -0,0 +1,64 @@ +import chokidar from 'chokidar' +import equal from 'fast-deep-equal' +import fastglob from 'fast-glob' +import { State, Params } from '../DataServer' +import { get, omit } from 'lodash/fp' + +import * as paths from '../config/paths' +import { Config } from '../commands/args' +import { docgen } from '../utils/docgen' + +const getPattern = (ts: boolean) => { + const tsPattern = '**/*.{ts,tsx}' + const jsPattern = '**/*.{js,jsx,mjs}' + return [ts ? tsPattern : jsPattern, '!**/node_modules'] +} + +const initial = (config: Config) => async (p: Params) => { + const pattern = getPattern(config.typescript) + const files = await fastglob(pattern, { cwd: paths.root }) + const metadata = await docgen(files, config) + p.setState('props', metadata) +} + +const add = (config: Config) => (p: Params) => async (filepath: string) => { + const old = get('state.props', p) + const metadata = await docgen([filepath], config) + + if (metadata && !equal(old, metadata)) { + p.setState('props', { + ...old, + ...metadata, + }) + } +} + +const remove = (config: Config) => (p: Params) => async (filepath: string) => + p.setState('props', omit(filepath, get('state.props', p))) + +export const state = (config: Config): State => { + const pattern = getPattern(config.typescript) + const watcher = chokidar.watch(pattern, { + cwd: paths.root, + ignored: /(((^|[\/\\])\..+)|(node_modules))/, + persistent: true, + }) + + watcher.setMaxListeners(Infinity) + + return { + id: 'props', + init: initial(config), + close: () => watcher.close(), + update: async params => { + const addFilepath = add(config) + const removeFilepath = remove(config) + + watcher.on('add', addFilepath(params)) + watcher.on('change', addFilepath(params)) + watcher.on('unlink', removeFilepath(params)) + + return () => watcher.close() + }, + } +} diff --git a/packages/docz-core/src/utils/docgen.ts b/packages/docz-core/src/utils/docgen.ts new file mode 100644 index 000000000..9c83cf051 --- /dev/null +++ b/packages/docz-core/src/utils/docgen.ts @@ -0,0 +1,75 @@ +import * as path from 'path' +import * as fs from 'fs-extra' +import logger from 'signale' +import findUp from 'find-up' +import externalProptypesHandler from 'react-docgen-external-proptypes-handler' +import importedProptypesHandler from 'react-docgen-imported-proptype-handler' +import actualNameHandler from 'react-docgen-actual-name-handler' +import reactDocgenTs from 'react-docgen-typescript' +import reactDocgen from 'react-docgen' + +import * as paths from '../config/paths' +import { Config } from '../commands/args' +import { isFn } from './helpers' + +// const stringRegex = /^"(.*)"$/ +// const parsePropTypeName = (propTypeName: string) => +// propTypeName +// .split(' | ') +// .filter(x => stringRegex.test(x)) +// .map(x => x.replace(stringRegex, '$1')) + +const fileFullPath = (filepath: string) => path.join(paths.root, filepath) + +const tsParser = async (files: string[], config: Config) => { + const tsConfigPath = await findUp('tsconfig.json', { cwd: paths.root }) + if (!tsConfigPath) return {} + + try { + const { parse } = reactDocgenTs.withCustomConfig(tsConfigPath, { + propFilter(prop: any, component: any): any { + if (prop.parent == null) return true + const propFilter = config.docgenConfig.propFilter + const val = propFilter && isFn(propFilter) && propFilter(prop) + return !prop.parent.fileName.includes('node_modules') || Boolean(val) + }, + }) + + return files + .map(filepath => ({ [fileFullPath(filepath)]: parse(filepath) })) + .reduce((obj, val) => ({ ...obj, ...val }), {}) + } catch (err) { + logger.fatal('Error parsing static types.', err) + return {} + } +} + +const jsParser = (files: string[], config: Config) => { + const resolver = + config.docgenConfig.resolver || + reactDocgen.resolver.findAllExportedComponentDefinitions + + return files.reduce((memo: any, filepath) => { + const handlers = reactDocgen.defaultHandlers.concat([ + externalProptypesHandler(filepath), + importedProptypesHandler(filepath), + actualNameHandler, + ]) + + const code = fs.readFileSync(filepath, 'utf-8') + + try { + const data = reactDocgen.parse(code, resolver, handlers) + memo[fileFullPath(filepath)] = data + } catch (err) { + if (err.message !== 'No suitable component definition found.') { + logger.fatal('Error:', filepath, err) + } + } + + return memo + }, {}) +} + +export const docgen = async (files: string[], config: Config) => + config.typescript ? tsParser(files, config) : jsParser(files, config) diff --git a/yarn.lock b/yarn.lock index 37a59192b..7f6e0e8b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -306,7 +306,7 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.2.tgz#37ebdbc88a2e1ebc6c8dd3d35ea9436e3e39e477" integrity sha512-UNTmQ5cSLDeBGBl+s7JeowkqIHgmFAGBnLDdIzFmUNSuS5JF0XBcN59jsh/vJO/YjfsBqMxhMjoFGmNExmf0FA== -"@babel/parser@^7.1.3", "@babel/parser@^7.2.0": +"@babel/parser@^7.2.0": version "7.2.0" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz#02d01dbc330b6cbf36b76ac93c50752c69027065" integrity sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg== @@ -2902,6 +2902,11 @@ assign-symbols@^1.0.0: resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= +ast-types@0.10.1: + version "0.10.1" + resolved "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz#f52fca9715579a14f841d67d7f8d25432ab6a3dd" + integrity sha512-UY7+9DPzlJ9VM8eY0b2TUZcZvF+1pO0hzMtAyjBYKhOmnvRlqYNYnWdtsMj0V16CGaMlpL0G1jnLbLo4AyotuQ== + ast-types@0.11.6: version "0.11.6" resolved "https://registry.npmjs.org/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef" @@ -3133,14 +3138,6 @@ babel-plugin-macros@^2.4.2, babel-plugin-macros@^2.4.3: cosmiconfig "^5.0.5" resolve "^1.8.1" -babel-plugin-react-docgen@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/babel-plugin-react-docgen/-/babel-plugin-react-docgen-2.0.0.tgz#039d90f5a1a37131c8cc3015017eecafa8d78882" - integrity sha512-AaA6IPxCF1EkzpFG41GkVh/VGdoBejPF6oIub2K8E6AD3kwnTZ0DIKG7f20a7zmqBEeO8GkFWdM7tYd9Owkc+Q== - dependencies: - lodash "^4.17.10" - react-docgen "^3.0.0-rc.1" - "babel-plugin-styled-components@>= 1": version "1.9.2" resolved "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.9.2.tgz#0e6a6587454dcb1c9a362a8fd31fc0b075ccd260" @@ -3209,7 +3206,7 @@ babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@6.26.0, babel-runtime@6.x, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0: +babel-runtime@6.26.0, babel-runtime@6.x, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2: version "6.26.0" resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -3268,6 +3265,11 @@ babylon@^7.0.0-beta.37: resolved "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80" integrity sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ== +babylon@~5.8.3: + version "5.8.38" + resolved "http://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd" + integrity sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0= + bail@^1.0.0: version "1.0.3" resolved "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3" @@ -4300,7 +4302,7 @@ commander@2.17.x, commander@~2.17.1: resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg== -commander@^2.12.1, commander@^2.14.1, commander@^2.18.0, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0: +commander@^2.12.1, commander@^2.14.1, commander@^2.18.0, commander@^2.8.1, commander@^2.9.0: version "2.19.0" resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== @@ -6082,9 +6084,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -<<<<<<< Updated upstream -express@^4.16.2, express@^4.16.3, express@^4.16.4: -======= expect@^23.6.0: version "23.6.0" resolved "https://registry.npmjs.org/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98" @@ -6097,8 +6096,7 @@ expect@^23.6.0: jest-message-util "^23.4.0" jest-regex-util "^23.3.0" -express@^4.16.2, express@^4.16.3: ->>>>>>> Stashed changes +express@^4.16.2, express@^4.16.3, express@^4.16.4: version "4.16.4" resolved "https://registry.npmjs.org/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg== @@ -12046,32 +12044,35 @@ react-dev-utils@^6.1.1: strip-ansi "4.0.0" text-table "0.2.0" -react-docgen-typescript-loader@^3.0.0-rc.0: - version "3.0.0" - resolved "https://registry.npmjs.org/react-docgen-typescript-loader/-/react-docgen-typescript-loader-3.0.0.tgz#4042e2854d29380e4d01e479d438c03ec00de8e8" - integrity sha512-xtE4bZrU9+7grFFzs8v6gWc+Wl2FCCL59hldHoX2DuQAXOmJIilUm2uPmDmRNA8RpxU1Ax+9Gl0JfUcWgx2QPA== +react-docgen-external-proptypes-handler@^1.0.2: + version "1.0.2" + resolved "https://registry.npmjs.org/react-docgen-external-proptypes-handler/-/react-docgen-external-proptypes-handler-1.0.2.tgz#457d3e82a6899695482f4912036cc940577ab0aa" + integrity sha512-vr8sXRp5hBmaEP0kdBED9p7mdnVX6LTRODNcGhUXUh1hBbGW2rgjm24e0eA4zVJs4cqCcA2pS0dEHujJ9rg3rw== + +react-docgen-imported-proptype-handler@^1.0.4: + version "1.0.4" + resolved "https://registry.npmjs.org/react-docgen-imported-proptype-handler/-/react-docgen-imported-proptype-handler-1.0.4.tgz#a7c73df8ad516b633068e0e22cad474d17dac7d9" + integrity sha512-BlLV7+JCyfsR6c7fBqeGSlZDJBNkEgny5hvw2+CRI/aeSU2rCxpLb8YORLEO2Ky5ZnbmlXr1MY2aCquRd/6Pzg== dependencies: - "@webpack-contrib/schema-utils" "^1.0.0-beta.0" - loader-utils "^1.1.0" - react-docgen-typescript "^1.9.0" + "@babel/runtime" "^7.2.0" -react-docgen-typescript@^1.9.0: +react-docgen-typescript@^1.12.2: version "1.12.2" resolved "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-1.12.2.tgz#d5fb578d12f6876efdde69176f4ea658e75a9a29" integrity sha512-pcot0jGiMIyhmwNeSU83GvClNwk9NbcnYHcGf4pKMmw5J43d5OzYRcTzrZTGlIOWjYfYazYhvTxjujE625P3Mw== -react-docgen@^3.0.0-rc.1: - version "3.0.0-rc.2" - resolved "https://registry.npmjs.org/react-docgen/-/react-docgen-3.0.0-rc.2.tgz#5939c64699fd9959da6d97d890f7b648e542dbcc" - integrity sha512-tXbIvq7Hxdc92jW570rztqsz0adtWEM5FX8bShJYozT2Y6L/LeHvBMQcED6mSqJ72niiNMPV8fi3S37OHrGMEw== +react-docgen@^2.21.0: + version "2.21.0" + resolved "https://registry.npmjs.org/react-docgen/-/react-docgen-2.21.0.tgz#e8f9caf50e15510096616850771f243fadbb9d7d" + integrity sha512-8xNPTrmvHLGNfqlsCYPdXmSkagP1njI5unP3t8WrjTJ4/5hHuP5nb3XH69CnF67HPV5zTkPoafcRBDGSQO6S6A== dependencies: - "@babel/parser" "^7.1.3" - "@babel/runtime" "^7.0.0" async "^2.1.4" - commander "^2.19.0" + babel-runtime "^6.9.2" + babylon "~5.8.3" + commander "^2.9.0" doctrine "^2.0.0" node-dir "^0.1.10" - recast "^0.16.0" + recast "^0.12.6" react-dom@^16.6.3: version "16.6.3" @@ -12382,7 +12383,18 @@ realpath-native@^1.0.0: dependencies: util.promisify "^1.0.0" -recast@^0.16.0: +recast@^0.12.6: + version "0.12.9" + resolved "https://registry.npmjs.org/recast/-/recast-0.12.9.tgz#e8e52bdb9691af462ccbd7c15d5a5113647a15f1" + integrity sha512-y7ANxCWmMW8xLOaiopiRDlyjQ9ajKRENBH+2wjntIbk3A6ZR1+BLQttkmSHMY7Arl+AAZFwJ10grg2T6f1WI8A== + dependencies: + ast-types "0.10.1" + core-js "^2.4.1" + esprima "~4.0.0" + private "~0.1.5" + source-map "~0.6.1" + +recast@^0.16.1: version "0.16.1" resolved "https://registry.npmjs.org/recast/-/recast-0.16.1.tgz#865f1800ef76e42e5d0375763b80f4d6a05f2069" integrity sha512-ZUQm94F3AHozRaTo4Vz6yIgkSEZIL7p+BsWeGZ23rx+ZVRoqX+bvBA8br0xmCOU0DSR4qYGtV7Y5HxTsC4V78A== From ba251978793ec307c1fc1a2afaa7d746d46bff8c Mon Sep 17 00:00:00 2001 From: Pedro Nauck Date: Fri, 21 Dec 2018 19:35:20 -0200 Subject: [PATCH 5/5] chore: a lot of improvements --- core/babel-preset-docz/package.json | 40 ----------- core/babel-preset-docz/src/config.ts | 69 ------------------ core/babel-preset-docz/src/index.ts | 57 --------------- {packages => core}/docz-core/.babelrc | 0 core/docz-core/package.json | 2 +- core/docz-core/src/config/babel.ts | 4 +- .../docz-core/src/states/props.ts | 0 .../docz-core/src/utils/docgen.ts | 11 +-- core/docz-utils/src/index.ts | 1 - .../babel-plugin-export-metadata/.babelrc | 0 .../jest.config.js | 0 .../babel-plugin-export-metadata/package.json | 0 .../babel-plugin-export-metadata/src/index.ts | 0 .../src/types.d.ts | 0 .../tests/fixtures/example.js | 0 .../tests/index.test.ts | 0 .../tests/types.d.ts | 0 .../tsconfig.json | 0 .../babel-plugin-export-metadata/tslint.json | 0 .../package.json | 0 .../src/index.ts | 0 .../src/types.d.ts | 0 .../tsconfig.json | 0 .../tslint.json | 0 yarn.lock | 70 +++++-------------- 25 files changed, 23 insertions(+), 231 deletions(-) delete mode 100644 core/babel-preset-docz/package.json delete mode 100644 core/babel-preset-docz/src/config.ts delete mode 100644 core/babel-preset-docz/src/index.ts rename {packages => core}/docz-core/.babelrc (100%) rename {packages => core}/docz-core/src/states/props.ts (100%) rename {packages => core}/docz-core/src/utils/docgen.ts (87%) rename {packages => other-packages}/babel-plugin-export-metadata/.babelrc (100%) rename {packages => other-packages}/babel-plugin-export-metadata/jest.config.js (100%) rename {packages => other-packages}/babel-plugin-export-metadata/package.json (100%) rename {packages => other-packages}/babel-plugin-export-metadata/src/index.ts (100%) rename {packages => other-packages}/babel-plugin-export-metadata/src/types.d.ts (100%) rename {packages => other-packages}/babel-plugin-export-metadata/tests/fixtures/example.js (100%) rename {packages => other-packages}/babel-plugin-export-metadata/tests/index.test.ts (100%) rename {packages => other-packages}/babel-plugin-export-metadata/tests/types.d.ts (100%) rename {packages => other-packages}/babel-plugin-export-metadata/tsconfig.json (100%) rename {packages => other-packages}/babel-plugin-export-metadata/tslint.json (100%) rename {packages => other-packages}/react-docgen-actual-name-handler/package.json (100%) rename {packages => other-packages}/react-docgen-actual-name-handler/src/index.ts (100%) rename {packages => other-packages}/react-docgen-actual-name-handler/src/types.d.ts (100%) rename {packages => other-packages}/react-docgen-actual-name-handler/tsconfig.json (100%) rename {packages => other-packages}/react-docgen-actual-name-handler/tslint.json (100%) diff --git a/core/babel-preset-docz/package.json b/core/babel-preset-docz/package.json deleted file mode 100644 index fd2aaeb64..000000000 --- a/core/babel-preset-docz/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "babel-preset-docz", - "version": "0.13.5", - "description": "Babel preset used on docz", - "license": "MIT", - "main": "dist/index.js", - "module": "dist/index.m.js", - "typings": "dist/index.d.ts", - "source": "src/index.ts", - "files": [ - "dist/", - "package.json", - "README.md" - ], - "scripts": { - "dev": "libundler watch --ts -e all", - "build": "libundler build --ts -e all --c", - "fix": "run-s fix:*", - "fix:prettier": "prettier \"src/**/*.{ts,tsx,md,mdx,js,jsx,json}\" --write", - "fix:tslint": "tslint --fix --project .", - "tslint": "tslint --project ." - }, - "dependencies": { - "@babel/core": "7.2.2", - "@babel/plugin-proposal-class-properties": "7.2.1", - "@babel/plugin-proposal-object-rest-spread": "7.2.0", - "@babel/plugin-syntax-dynamic-import": "7.2.0", - "@babel/plugin-transform-destructuring": "7.2.0", - "@babel/plugin-transform-regenerator": "7.0.0", - "@babel/plugin-transform-runtime": "7.2.0", - "@babel/preset-env": "7.2.0", - "@babel/preset-flow": "7.0.0", - "@babel/preset-react": "7.0.0", - "@babel/preset-typescript": "7.1.0", - "babel-plugin-export-metadata": "^0.13.4", - "babel-plugin-macros": "^2.4.3", - "babel-plugin-transform-dynamic-import": "^2.0.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.21" - } -} diff --git a/core/babel-preset-docz/src/config.ts b/core/babel-preset-docz/src/config.ts deleted file mode 100644 index b1d2b478b..000000000 --- a/core/babel-preset-docz/src/config.ts +++ /dev/null @@ -1,69 +0,0 @@ -interface ConfigParams { - flow: boolean - typescript: boolean - env: { - dev: boolean - prod: boolean - test: boolean - } -} - -export const config = (opts: ConfigParams) => { - const presets: any[] = [ - opts.env.test && [ - require('@babel/preset-env').default, - { - targets: { node: '6.12' }, - }, - ], - (opts.env.prod || opts.env.dev) && [ - require('@babel/preset-env').default, - { - useBuiltIns: 'entry', - modules: false, - }, - ], - [ - require('@babel/preset-react').default, - { - development: opts.env.dev, - useBuiltIns: true, - }, - ], - opts.flow && [require('@babel/preset-flow').default], - opts.typescript && [require('@babel/preset-typescript').default], - ].filter(Boolean) - - const plugins: any[] = [ - require('babel-plugin-macros'), - require('@babel/plugin-transform-destructuring').default, - [ - require('@babel/plugin-proposal-class-properties').default, - { loose: true }, - ], - [ - require('@babel/plugin-proposal-object-rest-spread').default, - { useBuiltIns: true }, - ], - [ - require('@babel/plugin-transform-runtime').default, - { helpers: false, regenerator: true }, - ], - require('babel-plugin-export-metadata').default, - opts.env.prod && [ - require('babel-plugin-transform-react-remove-prop-types').default, - { removeImport: true }, - ], - !opts.env.test && [ - require('@babel/plugin-transform-regenerator').default, - { async: false }, - ], - require('@babel/plugin-syntax-dynamic-import').default, - opts.env.test && [require('babel-plugin-transform-dynamic-import').default], - ].filter(Boolean) - - return { - presets, - plugins, - } -} diff --git a/core/babel-preset-docz/src/index.ts b/core/babel-preset-docz/src/index.ts deleted file mode 100644 index 9406adbe1..000000000 --- a/core/babel-preset-docz/src/index.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { config } from './config' - -const validateBool = (name: string, value: any, defaultValue: any) => { - if (typeof value === 'undefined') { - value = defaultValue - } - - if (typeof value !== 'boolean') { - throw new Error(`Preset react-app: '${name}' option must be a boolean.`) - } - - return value -} - -export interface PresetOptions { - flow?: boolean - typescript?: false -} - -const DEFAULT_OPTS: PresetOptions = { - flow: false, - typescript: false, -} - -const preset = (api: any, opts: PresetOptions = DEFAULT_OPTS) => { - const env = process.env.BABEL_ENV || process.env.NODE_ENV - const isDev = env === 'development' - const isProd = env === 'production' - const isTest = env === 'test' - - if (!isDev && !isProd && !isTest) { - throw new Error( - 'Using `babel-preset-docz` requires that you specify `NODE_ENV` or ' + - '`BABEL_ENV` environment variables. Valid values are "development", ' + - '"test", and "production". Instead, received: ' + - JSON.stringify(env) + - '.' - ) - } - - const isFlowEnabled = validateBool('flow', opts.flow, false) - const isTSEnabled = validateBool('typescript', opts.typescript, false) - - const parsedOpts = { - typescript: isTSEnabled, - flow: isFlowEnabled, - env: { - dev: isDev, - prod: isProd, - test: isTest, - }, - } - - return config(parsedOpts) -} - -export default preset diff --git a/packages/docz-core/.babelrc b/core/docz-core/.babelrc similarity index 100% rename from packages/docz-core/.babelrc rename to core/docz-core/.babelrc diff --git a/core/docz-core/package.json b/core/docz-core/package.json index db9454dea..422842a96 100644 --- a/core/docz-core/package.json +++ b/core/docz-core/package.json @@ -32,7 +32,7 @@ "art-template": "^4.13.2", "babel-loader": "^8.0.2", "babel-preset-docz": "^0.13.5", - "babel-plugin-export-metadata": "^0.13.5", + "babel-plugin-export-metadata": "^0.13.4", "babylon": "^6.18.0", "cache-loader": "^1.2.5", "chalk": "^2.4.1", diff --git a/core/docz-core/src/config/babel.ts b/core/docz-core/src/config/babel.ts index 051454e8a..dbc4d208b 100644 --- a/core/docz-core/src/config/babel.ts +++ b/core/docz-core/src/config/babel.ts @@ -44,7 +44,9 @@ export const getBabelConfig = async ( 'babel-preset-docz', ]), compact: isProd, - plugins: !isProd ? [require.resolve('react-hot-loader/babel')] : [], + plugins: [require.resolve('babel-plugin-export-metadata')].concat( + !isProd ? [require.resolve('react-hot-loader/babel')] : [] + ), }) const reduce = Plugin.reduceFromPlugins(args.plugins) diff --git a/packages/docz-core/src/states/props.ts b/core/docz-core/src/states/props.ts similarity index 100% rename from packages/docz-core/src/states/props.ts rename to core/docz-core/src/states/props.ts diff --git a/packages/docz-core/src/utils/docgen.ts b/core/docz-core/src/utils/docgen.ts similarity index 87% rename from packages/docz-core/src/utils/docgen.ts rename to core/docz-core/src/utils/docgen.ts index 9c83cf051..9085b33dc 100644 --- a/packages/docz-core/src/utils/docgen.ts +++ b/core/docz-core/src/utils/docgen.ts @@ -1,5 +1,6 @@ import * as path from 'path' import * as fs from 'fs-extra' +import { isFunction } from 'lodash/fp' import logger from 'signale' import findUp from 'find-up' import externalProptypesHandler from 'react-docgen-external-proptypes-handler' @@ -10,14 +11,6 @@ import reactDocgen from 'react-docgen' import * as paths from '../config/paths' import { Config } from '../commands/args' -import { isFn } from './helpers' - -// const stringRegex = /^"(.*)"$/ -// const parsePropTypeName = (propTypeName: string) => -// propTypeName -// .split(' | ') -// .filter(x => stringRegex.test(x)) -// .map(x => x.replace(stringRegex, '$1')) const fileFullPath = (filepath: string) => path.join(paths.root, filepath) @@ -30,7 +23,7 @@ const tsParser = async (files: string[], config: Config) => { propFilter(prop: any, component: any): any { if (prop.parent == null) return true const propFilter = config.docgenConfig.propFilter - const val = propFilter && isFn(propFilter) && propFilter(prop) + const val = propFilter && isFunction(propFilter) && propFilter(prop) return !prop.parent.fileName.includes('node_modules') || Boolean(val) }, }) diff --git a/core/docz-utils/src/index.ts b/core/docz-utils/src/index.ts index 4755a06f4..440105e2a 100644 --- a/core/docz-utils/src/index.ts +++ b/core/docz-utils/src/index.ts @@ -5,5 +5,4 @@ import * as imports from './imports' import * as codesandbox from './codesandbox' import { format } from './format' -export { default as namedAssetImport } from './named-asset-import' export { ast, mdast, format, imports, jsx, codesandbox } diff --git a/packages/babel-plugin-export-metadata/.babelrc b/other-packages/babel-plugin-export-metadata/.babelrc similarity index 100% rename from packages/babel-plugin-export-metadata/.babelrc rename to other-packages/babel-plugin-export-metadata/.babelrc diff --git a/packages/babel-plugin-export-metadata/jest.config.js b/other-packages/babel-plugin-export-metadata/jest.config.js similarity index 100% rename from packages/babel-plugin-export-metadata/jest.config.js rename to other-packages/babel-plugin-export-metadata/jest.config.js diff --git a/packages/babel-plugin-export-metadata/package.json b/other-packages/babel-plugin-export-metadata/package.json similarity index 100% rename from packages/babel-plugin-export-metadata/package.json rename to other-packages/babel-plugin-export-metadata/package.json diff --git a/packages/babel-plugin-export-metadata/src/index.ts b/other-packages/babel-plugin-export-metadata/src/index.ts similarity index 100% rename from packages/babel-plugin-export-metadata/src/index.ts rename to other-packages/babel-plugin-export-metadata/src/index.ts diff --git a/packages/babel-plugin-export-metadata/src/types.d.ts b/other-packages/babel-plugin-export-metadata/src/types.d.ts similarity index 100% rename from packages/babel-plugin-export-metadata/src/types.d.ts rename to other-packages/babel-plugin-export-metadata/src/types.d.ts diff --git a/packages/babel-plugin-export-metadata/tests/fixtures/example.js b/other-packages/babel-plugin-export-metadata/tests/fixtures/example.js similarity index 100% rename from packages/babel-plugin-export-metadata/tests/fixtures/example.js rename to other-packages/babel-plugin-export-metadata/tests/fixtures/example.js diff --git a/packages/babel-plugin-export-metadata/tests/index.test.ts b/other-packages/babel-plugin-export-metadata/tests/index.test.ts similarity index 100% rename from packages/babel-plugin-export-metadata/tests/index.test.ts rename to other-packages/babel-plugin-export-metadata/tests/index.test.ts diff --git a/packages/babel-plugin-export-metadata/tests/types.d.ts b/other-packages/babel-plugin-export-metadata/tests/types.d.ts similarity index 100% rename from packages/babel-plugin-export-metadata/tests/types.d.ts rename to other-packages/babel-plugin-export-metadata/tests/types.d.ts diff --git a/packages/babel-plugin-export-metadata/tsconfig.json b/other-packages/babel-plugin-export-metadata/tsconfig.json similarity index 100% rename from packages/babel-plugin-export-metadata/tsconfig.json rename to other-packages/babel-plugin-export-metadata/tsconfig.json diff --git a/packages/babel-plugin-export-metadata/tslint.json b/other-packages/babel-plugin-export-metadata/tslint.json similarity index 100% rename from packages/babel-plugin-export-metadata/tslint.json rename to other-packages/babel-plugin-export-metadata/tslint.json diff --git a/packages/react-docgen-actual-name-handler/package.json b/other-packages/react-docgen-actual-name-handler/package.json similarity index 100% rename from packages/react-docgen-actual-name-handler/package.json rename to other-packages/react-docgen-actual-name-handler/package.json diff --git a/packages/react-docgen-actual-name-handler/src/index.ts b/other-packages/react-docgen-actual-name-handler/src/index.ts similarity index 100% rename from packages/react-docgen-actual-name-handler/src/index.ts rename to other-packages/react-docgen-actual-name-handler/src/index.ts diff --git a/packages/react-docgen-actual-name-handler/src/types.d.ts b/other-packages/react-docgen-actual-name-handler/src/types.d.ts similarity index 100% rename from packages/react-docgen-actual-name-handler/src/types.d.ts rename to other-packages/react-docgen-actual-name-handler/src/types.d.ts diff --git a/packages/react-docgen-actual-name-handler/tsconfig.json b/other-packages/react-docgen-actual-name-handler/tsconfig.json similarity index 100% rename from packages/react-docgen-actual-name-handler/tsconfig.json rename to other-packages/react-docgen-actual-name-handler/tsconfig.json diff --git a/packages/react-docgen-actual-name-handler/tslint.json b/other-packages/react-docgen-actual-name-handler/tslint.json similarity index 100% rename from packages/react-docgen-actual-name-handler/tslint.json rename to other-packages/react-docgen-actual-name-handler/tslint.json diff --git a/yarn.lock b/yarn.lock index 7f6e0e8b1..da10109d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -311,19 +311,11 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.0.tgz#02d01dbc330b6cbf36b76ac93c50752c69027065" integrity sha512-M74+GvK4hn1eejD9lZ7967qAwvqTZayQa3g10ag4s9uewgR7TKjeaT0YMyoq+gVfKYABiWZ4MQD701/t5e1Jhg== -<<<<<<< HEAD -"@babel/parser@^7.1.6", "@babel/parser@^7.2.2": - version "7.2.2" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.2.tgz#37ebdbc88a2e1ebc6c8dd3d35ea9436e3e39e477" - integrity sha512-UNTmQ5cSLDeBGBl+s7JeowkqIHgmFAGBnLDdIzFmUNSuS5JF0XBcN59jsh/vJO/YjfsBqMxhMjoFGmNExmf0FA== - "@babel/parser@^7.2.3": version "7.2.3" resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489" integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA== -======= ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" @@ -855,7 +847,6 @@ globals "^11.1.0" lodash "^4.17.10" -<<<<<<< HEAD "@babel/traverse@^7.2.3": version "7.2.3" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" @@ -871,10 +862,7 @@ globals "^11.1.0" lodash "^4.17.10" -"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.2.0", "@babel/types@^7.2.2": -======= "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.37", "@babel/types@^7.1.6", "@babel/types@^7.2.0", "@babel/types@^7.2.2": ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin version "7.2.2" resolved "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e" integrity sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg== @@ -3030,9 +3018,6 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -<<<<<<< HEAD -babel-loader@^8.0.2, babel-loader@^8.0.4: -======= babel-jest@^23.6.0: version "23.6.0" resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1" @@ -3050,8 +3035,7 @@ babel-literal-to-ast@^2.0.0: "@babel/types" "^7.0.0-beta.37" babylon "^7.0.0-beta.37" -babel-loader@^8.0.2: ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin +babel-loader@^8.0.2, babel-loader@^8.0.4: version "8.0.4" resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.4.tgz#7bbf20cbe4560629e2e41534147692d3fecbdce6" integrity sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw== @@ -3371,11 +3355,7 @@ bluebird-co@^2.2.0: resolved "https://registry.npmjs.org/bluebird-co/-/bluebird-co-2.2.0.tgz#e0a49e63b6b17e34c91f48b3934b769a377fbed7" integrity sha1-4KSeY7axfjTJH0izk0t2mjd/vtc= -<<<<<<< HEAD -bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3: -======= -bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@~3.5.0: ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin +bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.2, bluebird@^3.5.3, bluebird@~3.5.0: version "3.5.3" resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw== @@ -7332,7 +7312,6 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -<<<<<<< HEAD hsl-regex@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" @@ -7347,14 +7326,13 @@ html-comment-regex@^1.1.0: version "1.1.2" resolved "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== -======= + html-encoding-sniffer@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw== dependencies: whatwg-encoding "^1.0.1" ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin html-entities@^1.2.0: version "1.2.1" @@ -8656,12 +8634,6 @@ jest-worker@^23.2.0: dependencies: merge-stream "^1.0.1" -<<<<<<< HEAD -joycon@^2.2.1: - version "2.2.3" - resolved "https://registry.npmjs.org/joycon/-/joycon-2.2.3.tgz#eeb1169850710c39ab60d8d4a00e50b0b61be581" - integrity sha512-4gHuFIQJPickKKT4sQ0B3IyQJ1uwIATwMPXWXiq/+NAUWSzhRotwV3bNocahOsqpzI6cTZErLtCvKzZFthZ6eQ== -======= jest@^23.6.0: version "23.6.0" resolved "https://registry.npmjs.org/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d" @@ -8669,7 +8641,11 @@ jest@^23.6.0: dependencies: import-local "^1.0.0" jest-cli "^23.6.0" ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin + +joycon@^2.2.1: + version "2.2.3" + resolved "https://registry.npmjs.org/joycon/-/joycon-2.2.3.tgz#eeb1169850710c39ab60d8d4a00e50b0b61be581" + integrity sha512-4gHuFIQJPickKKT4sQ0B3IyQJ1uwIATwMPXWXiq/+NAUWSzhRotwV3bNocahOsqpzI6cTZErLtCvKzZFthZ6eQ== js-levenshtein@^1.1.3: version "1.1.4" @@ -11188,7 +11164,11 @@ pluralize@^7.0.0: resolved "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow== -<<<<<<< HEAD +pn@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" + integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== + poi@^12.2.4: version "12.2.4" resolved "https://registry.npmjs.org/poi/-/poi-12.2.4.tgz#0fe86790427b16867574709f19f334fe09505cd5" @@ -11247,12 +11227,6 @@ poi@^12.2.4: webpack-chain "^5.0.1" webpack-dev-server "^3.1.10" webpack-merge "^4.1.4" -======= -pn@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" - integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin polished@^2.3.1: version "2.3.1" @@ -13374,19 +13348,17 @@ simple-git@^1.85.0: dependencies: debug "^4.0.1" -<<<<<<< HEAD simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= dependencies: is-arrayish "^0.3.1" -======= + sisteransi@^0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce" integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g== ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin slash@^1.0.0: version "1.0.0" @@ -13991,9 +13963,6 @@ supports-color@^2.0.0: resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -<<<<<<< HEAD -supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: -======= supports-color@^3.1.2: version "3.2.3" resolved "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" @@ -14001,8 +13970,7 @@ supports-color@^3.1.2: dependencies: has-flag "^1.0.0" -supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.5.0: ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin +supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -14162,7 +14130,6 @@ text-table@0.2.0, text-table@^0.2.0: resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -<<<<<<< HEAD thread-loader@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/thread-loader/-/thread-loader-1.2.0.tgz#35dedb23cf294afbbce6c45c1339b950ed17e7a4" @@ -14171,12 +14138,11 @@ thread-loader@^1.2.0: async "^2.3.0" loader-runner "^2.3.0" loader-utils "^1.1.0" -======= + throat@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin through2@^2.0.0, through2@^2.0.2: version "2.0.5" @@ -15021,7 +14987,6 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" -<<<<<<< HEAD vue-hot-reload-api@^2.3.0: version "2.3.1" resolved "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2" @@ -15050,7 +15015,7 @@ vue-template-es2015-compiler@^1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18" integrity sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg== -======= + w3c-hr-time@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" @@ -15064,7 +15029,6 @@ walker@~1.0.5: integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= dependencies: makeerror "1.0.x" ->>>>>>> feat(babel-plugin-function-filemeta): add first version of plugin warning@^3.0.0: version "3.0.0"