From 2a63ed6bfc4d434fc523d1241b876a0e1e7a09ba Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 21 Jun 2019 02:22:43 -0700 Subject: [PATCH] fix(builtin): add test case for @bazel/hide-bazel-files bug --- .../package-lock.json | 4 +++- e2e/symlinked_node_modules_npm/package.json | 10 ++++---- e2e/symlinked_node_modules_npm/yarn.lock | 23 ------------------- e2e/symlinked_node_modules_yarn/package.json | 6 ++--- 4 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 e2e/symlinked_node_modules_npm/yarn.lock diff --git a/e2e/symlinked_node_modules_npm/package-lock.json b/e2e/symlinked_node_modules_npm/package-lock.json index 01c476e506..0f4c7ab0af 100644 --- a/e2e/symlinked_node_modules_npm/package-lock.json +++ b/e2e/symlinked_node_modules_npm/package-lock.json @@ -3,7 +3,9 @@ "lockfileVersion": 1, "dependencies": { "@bazel/hide-bazel-files": { - "version": "file:../../dist/npm_bazel_hide-bazel-files", + "version": "0.32.1", + "resolved": "https://registry.npmjs.org/@bazel/hide-bazel-files/-/hide-bazel-files-0.32.1.tgz", + "integrity": "sha512-8825JCnpr30W3GpRbVvEuKe0C2M/7MbAVn082G+XRf0j6EvF2NScuog8U1UQU1J/9LUY3iaMCEAnFTSqxlSCfw==", "dev": true }, "rxjs": { diff --git a/e2e/symlinked_node_modules_npm/package.json b/e2e/symlinked_node_modules_npm/package.json index dfe7507599..2ab0a050b2 100644 --- a/e2e/symlinked_node_modules_npm/package.json +++ b/e2e/symlinked_node_modules_npm/package.json @@ -1,13 +1,13 @@ { "dependencies": { - "typescript": "2.9.1", - "rxjs": "6.4.0" + "rxjs": "6.4.0", + "typescript": "2.9.1" }, "devDependencies": { - "@bazel/hide-bazel-files": "file:../../dist/npm_bazel_hide-bazel-files" + "@bazel/hide-bazel-files": "0.32.1" }, "scripts": { - "postinstall": "hide-bazel-files", - "test": "bazel test ... && rm -rf node_modules && bazel test ... && rm -rf node_modules && yarn install && bazel test ..." + "//": "we use fixed version of @bazel/hide-bazel-files above as npm makes symlinks for `file:` deps and @bazel/hide-bazel-files doesn't work as a symlink because that would require --preserve-symlinks-main", + "test": "bazel test ... && rm -rf node_modules && bazel test ... && rm -rf node_modules && npm install && npm add @schematics/angular@8.0.0-beta.15 && bazel test ... && npm remove @schematics/angular" } } diff --git a/e2e/symlinked_node_modules_npm/yarn.lock b/e2e/symlinked_node_modules_npm/yarn.lock deleted file mode 100644 index e341ab7aad..0000000000 --- a/e2e/symlinked_node_modules_npm/yarn.lock +++ /dev/null @@ -1,23 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@bazel/hide-bazel-files@file:../../dist/npm_bazel_hide-bazel-files": - version "0.31.1-16-g4196fa7" - -rxjs@6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504" - integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw== - dependencies: - tslib "^1.9.0" - -tslib@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== - -typescript@2.9.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961" - integrity sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA== diff --git a/e2e/symlinked_node_modules_yarn/package.json b/e2e/symlinked_node_modules_yarn/package.json index f22a381145..2e2ba90890 100644 --- a/e2e/symlinked_node_modules_yarn/package.json +++ b/e2e/symlinked_node_modules_yarn/package.json @@ -1,12 +1,12 @@ { "dependencies": { - "typescript": "2.9.1", - "rxjs": "6.4.0" + "rxjs": "6.4.0", + "typescript": "2.9.1" }, "devDependencies": { "@bazel/hide-bazel-files": "file:../../dist/npm_bazel_hide-bazel-files" }, "scripts": { - "test": "bazel test ... && rm -rf node_modules && bazel test ... && rm -rf node_modules && yarn install && bazel test ..." + "test": "bazel test ... && rm -rf node_modules && bazel test ... && rm -rf node_modules && yarn install && yarn add @schematics/angular@8.0.0-beta.15 && bazel test ... && yarn remove @schematics/angular" } }