diff --git a/package-lock.json b/package-lock.json index 921dff86697..b17ef1e778d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -110,9 +110,9 @@ "dev": true }, "@types/node": { - "version": "11.11.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.5.tgz", - "integrity": "sha512-pz6wNe/XwyesgfVX7P6B0hY3TnTAYXk6KSTLdpQfbuq3be+hnMoCuFzE+yLTskPdBwmNiGRL2TAsnF09aRugvQ==" + "version": "11.11.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz", + "integrity": "sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==" }, "@types/pretty-ms": { "version": "4.0.0", @@ -329,9 +329,9 @@ "dev": true }, "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz", + "integrity": "sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==", "dev": true }, "atob": { @@ -616,9 +616,9 @@ "dev": true }, "chokidar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz", - "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz", + "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==", "dev": true, "requires": { "anymatch": "^2.0.0", @@ -632,7 +632,7 @@ "normalize-path": "^3.0.0", "path-is-absolute": "^1.0.0", "readdirp": "^2.2.1", - "upath": "^1.1.0" + "upath": "^1.1.1" } }, "ci-info": { @@ -873,7 +873,7 @@ "requires": { "import-fresh": "^2.0.0", "is-directory": "^0.3.1", - "js-yaml": "3.13.0", + "js-yaml": "^3.9.0", "parse-json": "^4.0.0" }, "dependencies": { @@ -1185,7 +1185,7 @@ "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "inquirer": "^6.2.2", - "js-yaml": "3.13.0", + "js-yaml": "^3.12.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.3.0", "lodash": "^4.17.11", @@ -3015,9 +3015,9 @@ "dev": true }, "is-reference": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.1.tgz", - "integrity": "sha512-URlByVARcyP2E2GC7d3Ur702g3vqW391VKCHuF5Goo/M8IT97k4RU/+56OYImwDdX1J/V/VRxECE/wJqB0I2tg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.2.tgz", + "integrity": "sha512-Kn5g8c7XHKejFOpTf2QN9YjiHHKl5xRj+2uAZf9iM2//nkBNi/NNeB5JMoun28nEaUVHyPUzqzhfRlfAirEjXg==", "dev": true, "requires": { "@types/estree": "0.0.39" @@ -3089,7 +3089,7 @@ "esprima": "2.7.x", "glob": "^5.0.15", "handlebars": "^4.0.1", - "js-yaml": "3.13.0", + "js-yaml": "3.x", "mkdirp": "0.5.x", "nopt": "3.x", "once": "1.x", @@ -3551,16 +3551,16 @@ } }, "markdownlint-cli": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.14.0.tgz", - "integrity": "sha512-EE2YBEgw7W38eCXeOA79I2pv33Rr5hLAkRqZtXJtEbTHKMQtVaVGLD2Qb4RDekYXgXyuR+LRXFE947WlxOvLXQ==", + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.14.1.tgz", + "integrity": "sha512-bHueUEp1NmSFPWvOk3SNWhRRAInrdvmuzlkMrZJptUF6jNXJ32OhPXicRw2xg43+NLiUI01V5sc1VIrRWLKgig==", "dev": true, "requires": { "commander": "~2.9.0", "deep-extend": "~0.5.1", "get-stdin": "~5.0.1", "glob": "~7.1.2", - "js-yaml": "3.13.0", + "js-yaml": "~3.13.0", "lodash.differencewith": "~4.5.0", "lodash.flatten": "~4.4.0", "markdownlint": "~0.12.0", @@ -3570,7 +3570,7 @@ "dependencies": { "commander": { "version": "2.9.0", - "resolved": "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { @@ -3731,7 +3731,7 @@ "glob": "7.1.3", "growl": "1.10.5", "he": "1.2.0", - "js-yaml": "3.13.0", + "js-yaml": "3.12.0", "log-symbols": "2.2.0", "minimatch": "3.0.4", "mkdirp": "0.5.1", @@ -3792,9 +3792,9 @@ "dev": true }, "nan": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz", - "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz", + "integrity": "sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==", "dev": true, "optional": true }, @@ -4690,13 +4690,24 @@ } }, "rollup-plugin-typescript": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-typescript/-/rollup-plugin-typescript-1.0.0.tgz", - "integrity": "sha512-d2KDNMJXgaaB//dDGd/YmyMiopt1Pz965Iu3zmEoL08YqNcKRBz26uHqqc47rFGfrJV5kFqifC9IYlh6dpSCLg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rollup-plugin-typescript/-/rollup-plugin-typescript-1.0.1.tgz", + "integrity": "sha512-rwJDNn9jv/NsKZuyBb/h0jsclP4CJ58qbvZt2Q9zDIGILF2LtdtvCqMOL+Gq9IVq5MTrTlHZNrn8h7VjQgd8tw==", "dev": true, "requires": { - "resolve": "^1.8.1", - "rollup-pluginutils": "^2.3.1" + "resolve": "^1.10.0", + "rollup-pluginutils": "^2.5.0" + }, + "dependencies": { + "resolve": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", + "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } + } } }, "rollup-pluginutils": { @@ -5380,7 +5391,7 @@ "commander": "^2.12.1", "diff": "^3.2.0", "glob": "^7.1.1", - "js-yaml": "3.13.0", + "js-yaml": "^3.7.0", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "resolve": "^1.3.2", @@ -5552,9 +5563,9 @@ } }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", + "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", "dev": true }, "uri-js": { diff --git a/package.json b/package.json index 7dafe4fd9db..e5bfe9ca820 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "homepage": "https://github.com/rollup/rollup", "dependencies": { "@types/estree": "0.0.39", - "@types/node": "^11.11.5", + "@types/node": "^11.11.6", "acorn": "^6.1.1" }, "devDependencies": { @@ -74,7 +74,7 @@ "acorn-walk": "^6.1.1", "ansi-escapes": "^4.0.1", "buble": "^0.19.7", - "chokidar": "^2.1.2", + "chokidar": "^2.1.5", "console-group": "^0.3.3", "date-time": "^3.0.0", "eslint": "^5.15.3", @@ -84,12 +84,12 @@ "hash.js": "^1.1.7", "husky": "^1.3.1", "immutable": "^4.0.0-rc.12", - "is-reference": "^1.1.1", + "is-reference": "^1.1.2", "istanbul": "^0.4.5", "lint-staged": "^8.1.5", "locate-character": "^2.0.5", "magic-string": "^0.25.2", - "markdownlint-cli": "^0.14.0", + "markdownlint-cli": "^0.14.1", "minimist": "^1.2.0", "mocha": "^6.0.2", "prettier": "^1.16.4", @@ -106,7 +106,7 @@ "rollup-plugin-replace": "^2.1.1", "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^4.0.4", - "rollup-plugin-typescript": "^1.0.0", + "rollup-plugin-typescript": "^1.0.1", "rollup-pluginutils": "^2.5.0", "sander": "^0.6.0", "shx": "^0.3.2", diff --git a/test/function/samples/break-label/_config.js b/test/function/samples/break-label/_config.js new file mode 100644 index 00000000000..aa7779caafc --- /dev/null +++ b/test/function/samples/break-label/_config.js @@ -0,0 +1,8 @@ +const assert = require('assert'); + +module.exports = { + description: 'do not deconflict break label (#2773)', + exports(exports) { + assert.deepStrictEqual(exports, { value: 'original', n: 1 }); + } +}; diff --git a/test/function/samples/break-label/main.js b/test/function/samples/break-label/main.js new file mode 100644 index 00000000000..0f654106917 --- /dev/null +++ b/test/function/samples/break-label/main.js @@ -0,0 +1,5 @@ +export { n } from './module_1'; +export { value } from './module_2'; +import { n } from './module_2'; + +n(); diff --git a/test/function/samples/break-label/module_1.js b/test/function/samples/break-label/module_1.js new file mode 100644 index 00000000000..207e69e47dd --- /dev/null +++ b/test/function/samples/break-label/module_1.js @@ -0,0 +1 @@ +export var n = 1; diff --git a/test/function/samples/break-label/module_2.js b/test/function/samples/break-label/module_2.js new file mode 100644 index 00000000000..d7bf73ddc59 --- /dev/null +++ b/test/function/samples/break-label/module_2.js @@ -0,0 +1,8 @@ +export let value = 'original'; + +export function n() { + n: if (value === 1) { + break n; + value = 'changed'; + } +}