diff --git a/package.json b/package.json index b8b3f3580..96690977e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "devDependencies": { "del": "^3.0.0", "lerna": "^2.11.0", - "libundler": "^1.6.4", + "libundler": "^1.7.0", "npm-run-all": "^4.1.3", "prettier": "^1.13.5", "trash-cli": "^1.4.0", diff --git a/packages/docz-core/librc.js b/packages/docz-core/librc.js index a7d95133b..fa414f581 100644 --- a/packages/docz-core/librc.js +++ b/packages/docz-core/librc.js @@ -6,6 +6,7 @@ module.exports = { 'react-dev-utils/FileSizeReporter', 'react-dev-utils/formatWebpackMessages', 'react-dev-utils/printBuildError', + 'react-dom/server', ]), plugins: [ copy([ diff --git a/packages/docz-core/package.json b/packages/docz-core/package.json index aa1fa7248..9d820da6a 100644 --- a/packages/docz-core/package.json +++ b/packages/docz-core/package.json @@ -51,8 +51,10 @@ "load-cfg": "^0.1.2-beta.0", "lodash.get": "^4.4.2", "prettier": "^1.13.5", + "react": "^16.4.0", "react-dev-utils": "^5.0.1", "react-docgen-typescript-loader": "^2.1.0", + "react-dom": "^16.4.0", "react-hot-loader": "4.3.0", "remark-frontmatter": "^1.2.0", "remark-parse": "^5.0.0", @@ -88,6 +90,8 @@ "@types/lodash.get": "^4.4.3", "@types/node": "10.3.2", "@types/prettier": "^1.13.0", + "@types/react": "^16.3.17", + "@types/react-dom": "^16.0.6", "@types/resolve": "^0.0.8", "@types/webpack": "^4.4.0", "@types/webpack-chain": "^4.8.0", diff --git a/packages/docz-core/src/Entries.ts b/packages/docz-core/src/Entries.tsx similarity index 85% rename from packages/docz-core/src/Entries.ts rename to packages/docz-core/src/Entries.tsx index 9050bbf2c..71f8fc2f6 100644 --- a/packages/docz-core/src/Entries.ts +++ b/packages/docz-core/src/Entries.tsx @@ -1,20 +1,23 @@ +import * as React from 'react' import * as fs from 'fs-extra' import * as glob from 'fast-glob' import * as path from 'path' +import { renderToString } from 'react-dom/server' import * as paths from './config/paths' -import { touch, compiled, readIfExist } from './utils/fs' +import { touch, compiled } from './utils/fs' import { Entry, parseMdx } from './Entry' import { Plugin } from './Plugin' import { Config } from './commands/args' +import { Html } from './components/Html' const fromTemplates = (file: string) => path.join(paths.templates, file) -const fromDocz = (file: string) => path.join(paths.docz, file) const writeAppFiles = async (config: Config, dev: boolean): Promise => { const { plugins, title, description, theme } = config const props = Plugin.propsOfPlugins(plugins) + const html = renderToString() const wrappers = props('wrapper') const onPreRenders = props('onPreRender') @@ -22,9 +25,6 @@ const writeAppFiles = async (config: Config, dev: boolean): Promise => { const root = await compiled(fromTemplates('root.tpl.js')) const js = await compiled(fromTemplates('index.tpl.js')) - const html = await compiled(fromTemplates('index.tpl.html')) - const head = await readIfExist(fromDocz('_head.html')) - const scripts = await readIfExist(fromDocz('_scripts.html')) const rawRootJs = root({ theme, @@ -38,16 +38,9 @@ const writeAppFiles = async (config: Config, dev: boolean): Promise => { onPostRenders, }) - const rawIndexHtml = html({ - title, - description, - head: head ? head.trimRight() : '', - scripts: scripts ? scripts.trimRight() : '', - }) - await touch(paths.rootJs, rawRootJs) await touch(paths.indexJs, rawIndexJs) - await touch(paths.indexHtml, rawIndexHtml) + await touch(paths.indexHtml, `${html}`) } const writeImports = async (map: EntryMap): Promise => { diff --git a/packages/docz-core/src/components/Html.tsx b/packages/docz-core/src/components/Html.tsx new file mode 100644 index 000000000..dcb199a73 --- /dev/null +++ b/packages/docz-core/src/components/Html.tsx @@ -0,0 +1,22 @@ +import * as React from 'react' +import { SFC } from 'react' + +export interface HtmlProps { + title: string + description: string +} + +export const Html: SFC = ({ title, description }) => ( + + + + + + + {title} + + +
+ + +) diff --git a/packages/docz-core/templates/index.tpl.html b/packages/docz-core/templates/index.tpl.html deleted file mode 100644 index 9a39a4229..000000000 --- a/packages/docz-core/templates/index.tpl.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - <%- title %> - <%- head %> - - -
- <%- scripts %> - - diff --git a/yarn.lock b/yarn.lock index 484563b7c..a7155df91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,13 +8,13 @@ dependencies: "@babel/highlight" "7.0.0-beta.42" -"@babel/code-frame@7.0.0-beta.49": +"@babel/code-frame@7.0.0-beta.49", "@babel/code-frame@^7.0.0-beta.47": version "7.0.0-beta.49" resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz#becd805482734440c9d137e46d77340e64d7f51b" dependencies: "@babel/highlight" "7.0.0-beta.49" -"@babel/core@7.0.0-beta.42", "@babel/core@^7.0.0-beta.42": +"@babel/core@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.42.tgz#b3a838fddbd19663369a0b4892189fd8d3f82001" dependencies: @@ -34,7 +34,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@7.0.0-beta.49": +"@babel/core@7.0.0-beta.49", "@babel/core@^7.0.0-beta.49": version "7.0.0-beta.49" resolved "https://registry.npmjs.org/@babel/core/-/core-7.0.0-beta.49.tgz#73de2081dd652489489f0cb4aa97829a1133314e" dependencies: @@ -151,13 +151,6 @@ dependencies: "@babel/types" "7.0.0-beta.42" -"@babel/helper-module-imports@7.0.0-beta.35": - version "7.0.0-beta.35" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.35.tgz#308e350e731752cdb4d0f058df1d704925c64e0a" - dependencies: - "@babel/types" "7.0.0-beta.35" - lodash "^4.2.0" - "@babel/helper-module-imports@7.0.0-beta.40": version "7.0.0-beta.40" resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.40.tgz#251cbb6404599282e8f7356a5b32c9381bef5d2d" @@ -172,6 +165,13 @@ "@babel/types" "7.0.0-beta.42" lodash "^4.2.0" +"@babel/helper-module-imports@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.44.tgz#60edc68cdf17e13eaca5be813c96127303085133" + dependencies: + "@babel/types" "7.0.0-beta.44" + lodash "^4.2.0" + "@babel/helper-module-transforms@7.0.0-beta.42": version "7.0.0-beta.42" resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.42.tgz#4d260cc786e712e8440bef58dae28040b77a6183" @@ -765,14 +765,6 @@ invariant "^2.2.0" lodash "^4.17.5" -"@babel/types@7.0.0-beta.35": - version "7.0.0-beta.35" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.35.tgz#cf933a9a9a38484ca724b335b88d83726d5ab960" - dependencies: - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^2.0.0" - "@babel/types@7.0.0-beta.40": version "7.0.0-beta.40" resolved "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.40.tgz#25c3d7aae14126abe05fcb098c65a66b6d6b8c14" @@ -789,6 +781,14 @@ lodash "^4.2.0" to-fast-properties "^2.0.0" +"@babel/types@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757" + dependencies: + esutils "^2.0.2" + lodash "^4.2.0" + to-fast-properties "^2.0.0" + "@babel/types@7.0.0-beta.49": version "7.0.0-beta.49" resolved "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.49.tgz#b7e3b1c3f4d4cfe11bdf8c89f1efd5e1617b87a6" @@ -896,12 +896,6 @@ escape-string-regexp "^1.0.5" lodash.deburr "^4.1.0" -"@types/acorn@^4.0.3": - version "4.0.3" - resolved "https://registry.npmjs.org/@types/acorn/-/acorn-4.0.3.tgz#d1f3e738dde52536f9aad3d3380d14e448820afd" - dependencies: - "@types/estree" "*" - "@types/bluebird@^3.5.20": version "3.5.20" resolved "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.20.tgz#f6363172add6f4eabb8cada53ca9af2781e8d6a1" @@ -953,9 +947,9 @@ dependencies: "@types/glob" "*" -"@types/estree@*", "@types/estree@0.0.38": - version "0.0.38" - resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2" +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" "@types/events@*": version "1.2.0" @@ -1335,7 +1329,7 @@ acorn@^3.0.4: version "3.3.0" resolved "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.0, acorn@^5.5.3: +acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.0: version "5.5.3" resolved "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" @@ -2764,9 +2758,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-env@^5.1.4: - version "5.1.4" - resolved "https://registry.npmjs.org/cross-env/-/cross-env-5.1.4.tgz#f61c14291f7cc653bb86457002ea80a04699d022" +cross-env@^5.1.6: + version "5.1.6" + resolved "https://registry.npmjs.org/cross-env/-/cross-env-5.1.6.tgz#0dc05caf945b24e4b9e3b12871fe0e858d08b38d" dependencies: cross-spawn "^5.1.0" is-windows "^1.0.0" @@ -2879,12 +2873,6 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -date-time@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2" - dependencies: - time-zone "^1.0.0" - dateformat@^3.0.0: version "3.0.3" resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" @@ -2942,10 +2930,6 @@ deepmerge@^1.5.2: version "1.5.2" resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" -deepmerge@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz#511a54fff405fc346f0240bb270a3e9533a31102" - deepmerge@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" @@ -3701,7 +3685,7 @@ filesize@3.5.11: version "3.5.11" resolved "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee" -filesize@^3.5.11, filesize@^3.6.0: +filesize@^3.5.11, filesize@^3.6.1: version "3.6.1" resolved "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" @@ -4569,10 +4553,6 @@ ipaddr.js@1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b" -irregular-plurals@^1.0.0: - version "1.4.0" - resolved "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766" - is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -4835,12 +4815,6 @@ is-redirect@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" -is-reference@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.1.0.tgz#50e6ef3f64c361e2c53c0416cdc9420037f2685b" - dependencies: - "@types/estree" "0.0.38" - is-regex@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" @@ -5240,39 +5214,39 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -libundler@^1.6.4: - version "1.6.4" - resolved "https://registry.npmjs.org/libundler/-/libundler-1.6.4.tgz#88acdf9935448617f50a7215b081e250dae91556" +libundler@^1.7.0: + version "1.7.0" + resolved "https://registry.npmjs.org/libundler/-/libundler-1.7.0.tgz#cabb75d21c635add9ee38dbe666843b5f2bbf631" dependencies: - "@babel/core" "^7.0.0-beta.42" + "@babel/core" "^7.0.0-beta.49" bluebird "^3.5.1" bluebird-co "^2.2.0" - chalk "^2.3.2" - cross-env "^5.1.4" - deepmerge "^2.1.0" + chalk "^2.4.1" + cross-env "^5.1.6" + deepmerge "^2.1.1" eslint "^4.1.1" figures "^2.0.0" - filesize "^3.6.0" + filesize "^3.6.1" find-up "^2.1.0" gzip-size "^4.1.0" hasha "^3.0.0" log-update "^2.1.0" - micromatch "^3.1.9" - neo-async "^2.5.0" + micromatch "^3.1.10" + neo-async "^2.5.1" node-emoji "^1.8.1" pretty-error "^2.1.1" - rollup "^0.57.1" - rollup-plugin-babel "^4.0.0-beta.2" - rollup-plugin-commonjs "^9.1.0" + rollup "^0.60.1" + rollup-plugin-babel "^4.0.0-beta.4" + rollup-plugin-commonjs "^9.1.3" rollup-plugin-gzip "^1.3.0" rollup-plugin-node-resolve "^3.3.0" rollup-plugin-sizes "^0.4.0" rollup-plugin-sourcemaps "^0.4.2" - rollup-plugin-typescript2 "^0.12.0" - rollup-plugin-uglify "^3.0.0" - shelljs "^0.8.1" - tslint "^5.9.1" - typescript "2.7.2" + rollup-plugin-typescript2 "^0.14.0" + rollup-plugin-uglify "^4.0.0" + shelljs "^0.8.2" + tslint "^5.10.0" + typescript "2.9.1" uglify-es "^3.3.9" yargs "^11.0.0" @@ -5336,10 +5310,6 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -locate-character@^2.0.5: - version "2.0.5" - resolved "https://registry.npmjs.org/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5664,7 +5634,7 @@ micromatch@^2.3.11: parse-glob "^3.0.4" regex-cache "^0.4.2" -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9: +micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: version "3.1.10" resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" dependencies: @@ -5921,7 +5891,7 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -neo-async@^2.5.0: +neo-async@^2.5.0, neo-async@^2.5.1: version "2.5.1" resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee" @@ -6400,10 +6370,6 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" -parse-ms@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d" - parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -6535,12 +6501,6 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" -plur@^2.1.2: - version "2.1.2" - resolved "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a" - dependencies: - irregular-plurals "^1.0.0" - pluralize@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" @@ -6572,13 +6532,6 @@ pretty-error@^2.0.2, pretty-error@^2.1.1: renderkid "^2.0.1" utila "~0.4" -pretty-ms@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/pretty-ms/-/pretty-ms-3.1.0.tgz#e9cac9c76bf6ee52fe942dd9c6c4213153b12881" - dependencies: - parse-ms "^1.0.0" - plur "^2.1.2" - pretty-time@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/pretty-time/-/pretty-time-1.0.0.tgz#544784adecaa2cd7d045ff8a8f1d4791c8e06e23" @@ -7285,10 +7238,6 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -require-relative@^0.8.7: - version "0.8.7" - resolved "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" - require-uncached@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" @@ -7378,16 +7327,16 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-babel@^4.0.0-beta.2: - version "4.0.0-beta.3" - resolved "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.0-beta.3.tgz#357d444acbb12e9f02887ad007aa77aec9c19ceb" +rollup-plugin-babel@^4.0.0-beta.4: + version "4.0.0-beta.4" + resolved "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.0-beta.4.tgz#d869646885d6ad73dd10791a261fb92674a80410" dependencies: - "@babel/helper-module-imports" "7.0.0-beta.35" + "@babel/helper-module-imports" "7.0.0-beta.44" rollup-pluginutils "^2.0.1" -rollup-plugin-commonjs@^9.1.0: - version "9.1.0" - resolved "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.0.tgz#468341aab32499123ee9a04b22f51d9bf26fdd94" +rollup-plugin-commonjs@^9.1.3: + version "9.1.3" + resolved "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.3.tgz#37bfbf341292ea14f512438a56df8f9ca3ba4d67" dependencies: estree-walker "^0.5.1" magic-string "^0.22.4" @@ -7439,20 +7388,21 @@ rollup-plugin-svg@^1.0.1: dependencies: rollup-pluginutils "^1.3.1" -rollup-plugin-typescript2@^0.12.0: - version "0.12.0" - resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.12.0.tgz#c6cd4d6c2fff954ba475ed5faec3c08544a9fc71" +rollup-plugin-typescript2@^0.14.0: + version "0.14.0" + resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.14.0.tgz#b24c1019facdcfb100beff5673e0b229e9c79475" dependencies: fs-extra "^5.0.0" - resolve "^1.5.0" + resolve "^1.7.1" rollup-pluginutils "^2.0.1" tslib "^1.9.0" -rollup-plugin-uglify@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-3.0.0.tgz#a34eca24617709c6bf1778e9653baafa06099b86" +rollup-plugin-uglify@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-4.0.0.tgz#6eb471738f1ce9ba7d9d4bc43b71cba02417c8fb" dependencies: - uglify-es "^3.3.7" + "@babel/code-frame" "^7.0.0-beta.47" + uglify-js "^3.3.25" rollup-pluginutils@^1.3.1: version "1.5.2" @@ -7468,21 +7418,12 @@ rollup-pluginutils@^2.0.1: estree-walker "^0.3.0" micromatch "^2.3.11" -rollup@^0.57.1: - version "0.57.1" - resolved "https://registry.npmjs.org/rollup/-/rollup-0.57.1.tgz#0bb28be6151d253f67cf4a00fea48fb823c74027" +rollup@^0.60.1: + version "0.60.1" + resolved "https://registry.npmjs.org/rollup/-/rollup-0.60.1.tgz#07cb66153f1541d5f7e82b8393b405c31647dae9" dependencies: - "@types/acorn" "^4.0.3" - acorn "^5.5.3" - acorn-dynamic-import "^3.0.0" - date-time "^2.1.0" - is-reference "^1.1.0" - locate-character "^2.0.5" - pretty-ms "^3.1.0" - require-relative "^0.8.7" - rollup-pluginutils "^2.0.1" - signal-exit "^3.0.2" - sourcemap-codec "^1.4.1" + "@types/estree" "0.0.39" + "@types/node" "*" run-applescript@^3.0.0: version "3.1.0" @@ -7658,9 +7599,9 @@ shell-quote@1.6.1, shell-quote@^1.6.1: array-reduce "~0.0.0" jsonify "~0.0.0" -shelljs@^0.8.1: - version "0.8.1" - resolved "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz#729e038c413a2254c4078b95ed46e0397154a9f1" +shelljs@^0.8.2: + version "0.8.2" + resolved "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35" dependencies: glob "^7.0.0" interpret "^1.0.0" @@ -7774,10 +7715,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" -sourcemap-codec@^1.4.1: - version "1.4.1" - resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2" - spdx-correct@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" @@ -8157,10 +8094,6 @@ time-fix-plugin@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/time-fix-plugin/-/time-fix-plugin-2.0.1.tgz#4943dd28c8fa36a543aec34e3af2a173abc43de1" -time-zone@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d" - timed-out@^3.0.0: version "3.1.3" resolved "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" @@ -8325,23 +8258,6 @@ tslint@^5.10.0: tslib "^1.8.0" tsutils "^2.12.1" -tslint@^5.9.1: - version "5.9.1" - resolved "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz#1255f87a3ff57eb0b0e1f0e610a8b4748046c9ae" - dependencies: - babel-code-frame "^6.22.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^3.2.0" - glob "^7.1.1" - js-yaml "^3.7.0" - minimatch "^3.0.4" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.8.0" - tsutils "^2.12.1" - tsutils@^2.12.1: version "2.26.2" resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.26.2.tgz#a9f9f63434a456a5e0c95a45d9a59181cb32d3bf" @@ -8379,11 +8295,7 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@2.7.2: - version "2.7.2" - resolved "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836" - -typescript@^2.9.1: +typescript@2.9.1, typescript@^2.9.1: version "2.9.1" resolved "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961" @@ -8391,7 +8303,7 @@ ua-parser-js@^0.7.9: version "0.7.17" resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" -uglify-es@^3.3.4, uglify-es@^3.3.7, uglify-es@^3.3.9: +uglify-es@^3.3.4, uglify-es@^3.3.9: version "3.3.9" resolved "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" dependencies: @@ -8414,6 +8326,13 @@ uglify-js@^2.6: optionalDependencies: uglify-to-browserify "~1.0.0" +uglify-js@^3.3.25: + version "3.4.0" + resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.0.tgz#796762282b5b5f0eafe7d5c8c708d1d7bd5ba11d" + dependencies: + commander "~2.15.0" + source-map "~0.6.1" + uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"