Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove link_deps & unlink_deps scripts #795

Merged
merged 1 commit into from
May 28, 2019
Merged

Remove link_deps & unlink_deps scripts #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ jobs:
- persist_to_workspace:
root: ~/
paths:
- ./rules_nodejs/dist/npm_bazel_typescript$*
- ./rules_nodejs/dist/npm_bazel_typescript

build_karma_package:
<<: *job_defaults
Expand All @@ -219,7 +219,7 @@ jobs:
- persist_to_workspace:
root: ~/
paths:
- ./rules_nodejs/dist/npm_bazel_karma$*
- ./rules_nodejs/dist/npm_bazel_karma

build_jasmine_package:
<<: *job_defaults
Expand All @@ -232,7 +232,7 @@ jobs:
- persist_to_workspace:
root: ~/
paths:
- ./rules_nodejs/dist/npm_bazel_jasmine$*
- ./rules_nodejs/dist/npm_bazel_jasmine

build_labs_package:
<<: *job_defaults
Expand All @@ -245,7 +245,7 @@ jobs:
- persist_to_workspace:
root: ~/
paths:
- ./rules_nodejs/dist/npm_bazel_labs$*
- ./rules_nodejs/dist/npm_bazel_labs

test_packages:
<<: *job_defaults
Expand Down Expand Up @@ -320,7 +320,6 @@ jobs:
name: Test angular-bazel-example
command: |
cd ./examples/angular
../../scripts/link_deps.sh
# Install Bazel from NPM
yarn
# Build and Test
Expand Down
3 changes: 1 addition & 2 deletions e2e/jasmine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "e2e-jasmine",
"dependencies": {
"@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
"@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
"zone.js": "0.8.29"
},
"//": "Include an incompatible jasmine as a devDependency to verify that jasmine_node_test works regardless",
Expand All @@ -10,7 +10,6 @@
"jasmine-core": "2.5.2"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh",
"test": "bazel test ..."
}
}
4 changes: 2 additions & 2 deletions e2e/jasmine/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
version "0.29.0-7-g61d4b0a"
"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine "~3.3.1"
jasmine-core "~3.3.0"
Expand Down
3 changes: 1 addition & 2 deletions e2e/karma/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"dependencies": {
"@bazel/karma": "bazel://@npm_bazel_karma//:npm_package",
"@bazel/karma": "file:../../dist/npm_bazel_karma",
"karma": "3.0.0"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh",
"test": "bazel test ..."
}
}
4 changes: 2 additions & 2 deletions e2e/karma/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/karma@file:../../dist/npm_bazel_karma$2011":
version "0.29.0-7-g61d4b0a"
"@bazel/karma@file:../../dist/npm_bazel_karma":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine-core "2.8.0"
karma "^4.0.0"
Expand Down
5 changes: 2 additions & 3 deletions e2e/karma_stack_trace/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"dependencies": {
"@bazel/karma": "bazel://@npm_bazel_karma//:npm_package",
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/karma": "file:../../dist/npm_bazel_karma",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"@types/jasmine": "2.8.2",
"typescript": "3.1.x"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh",
"test": "bazel test ..."
}
}
8 changes: 4 additions & 4 deletions e2e/karma_stack_trace/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/karma@file:../../dist/npm_bazel_karma$2011":
version "0.29.0-7-g61d4b0a"
"@bazel/karma@file:../../dist/npm_bazel_karma":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine-core "2.8.0"
karma "^4.0.0"
Expand All @@ -17,8 +17,8 @@
semver "5.6.0"
tmp "0.0.33"

"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
5 changes: 2 additions & 3 deletions e2e/karma_typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"dependencies": {
"@bazel/karma": "bazel://@npm_bazel_karma//:npm_package",
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/karma": "file:../../dist/npm_bazel_karma",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"@types/jasmine": "^3.3.12",
"jasmine": "^3.4.0",
"rxjs": "^6.4.0",
"typescript": "2.9.2"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh",
"test": "bazel test ..."
}
}
8 changes: 4 additions & 4 deletions e2e/karma_typescript/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/karma@file:../../dist/npm_bazel_karma$2011":
version "0.29.0-7-g61d4b0a"
"@bazel/karma@file:../../dist/npm_bazel_karma":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine-core "2.8.0"
karma "^4.0.0"
Expand All @@ -17,8 +17,8 @@
semver "5.6.0"
tmp "0.0.33"

"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
4 changes: 2 additions & 2 deletions e2e/ts_auto_deps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"dependencies": {
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"typescript": "2.9.2"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh && bazel run @nodejs//:yarn",
"pretest": "bazel run @nodejs//:yarn",
"test": "cd simple && ts_auto_deps && bazel build simple"
}
}
4 changes: 2 additions & 2 deletions e2e/ts_auto_deps/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
4 changes: 2 additions & 2 deletions e2e/ts_devserver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"@types/jasmine": "2.8.2",
"@types/node": "7.0.18",
"concurrently": "^3.5.1",
Expand All @@ -10,7 +10,7 @@
"typescript": "2.7.x"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh && bazel run @nodejs//:yarn && webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG",
"pretest": "bazel run @nodejs//:yarn && webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG",
"test_root": "concurrently \"bazel run //:devserver\" \"while ! nc -z 127.0.0.1 8080; do sleep 1; done && protractor --suite root\" --kill-others --success first",
"test_subpackage": "concurrently \"bazel run //subpackage:devserver\" \"while ! nc -z 127.0.0.1 8080; do sleep 1; done && protractor --suite subpackage\" --kill-others --success first",
"test_genrule": "concurrently \"bazel run //genrule:devserver\" \"while ! nc -z 127.0.0.1 8080; do sleep 1; done && protractor --suite genrule\" --kill-others --success first",
Expand Down
4 changes: 2 additions & 2 deletions e2e/ts_devserver/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
6 changes: 3 additions & 3 deletions e2e/ts_library/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"//": "When setting bazelOpts { tsickle: true }, you must also add a devDependency on the tsickle npm package",
"dependencies": {
"@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"@types/hammerjs": "2.0.35",
"@types/jasmine": "3.3.9",
"@types/node": "11.11.2",
Expand All @@ -11,7 +11,7 @@
"zone.js": "0.8.26"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh && bazel run @nodejs//:yarn",
"pretest": "bazel run @nodejs//:yarn",
"test": "bazel build ... && bazel test ... && bazel build @disable_tsetse_for_external_test//..."
}
}
8 changes: 4 additions & 4 deletions e2e/ts_library/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# yarn lockfile v1


"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
version "0.29.0-7-g61d4b0a"
"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine "~3.3.1"
jasmine-core "~3.3.0"
v8-coverage "1.0.9"

"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tsconfig_extends/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"typescript": "^3.3.1"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions e2e/tsconfig_extends/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# yarn lockfile v1


"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
5 changes: 2 additions & 3 deletions e2e/typescript_2.7/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"dependencies": {
"@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"@types/jasmine": "2.8.2",
"@types/node": "7.0.18",
"typescript": "2.7.x"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh",
"test": "bazel test ..."
}
}
8 changes: 4 additions & 4 deletions e2e/typescript_2.7/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# yarn lockfile v1


"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
version "0.29.0-7-g61d4b0a"
"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine "~3.3.1"
jasmine-core "~3.3.0"
v8-coverage "1.0.9"

"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
5 changes: 2 additions & 3 deletions e2e/typescript_2.8/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"dependencies": {
"@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"@types/jasmine": "2.8.2",
"@types/node": "7.0.18",
"typescript": "2.8.x"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh",
"test": "bazel test ..."
}
}
8 changes: 4 additions & 4 deletions e2e/typescript_2.8/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# yarn lockfile v1


"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
version "0.29.0-7-g61d4b0a"
"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine "~3.3.1"
jasmine-core "~3.3.0"
v8-coverage "1.0.9"

"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
5 changes: 2 additions & 3 deletions e2e/typescript_2.9/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"dependencies": {
"@bazel/jasmine": "bazel://@npm_bazel_jasmine//:npm_package",
"@bazel/typescript": "bazel://@npm_bazel_typescript//:npm_package",
"@bazel/jasmine": "file:../../dist/npm_bazel_jasmine",
"@bazel/typescript": "file:../../dist/npm_bazel_typescript",
"@types/jasmine": "2.8.2",
"@types/node": "7.0.18",
"typescript": "2.9.x"
},
"scripts": {
"pretest": "../../scripts/link_deps.sh",
"test": "bazel test ..."
}
}
8 changes: 4 additions & 4 deletions e2e/typescript_2.9/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# yarn lockfile v1


"@bazel/jasmine@file:../../dist/npm_bazel_jasmine$6825":
version "0.29.0-7-g61d4b0a"
"@bazel/jasmine@file:../../dist/npm_bazel_jasmine":
version "0.30.1-2-g5cc5c06"
dependencies:
jasmine "~3.3.1"
jasmine-core "~3.3.0"
v8-coverage "1.0.9"

"@bazel/typescript@file:../../dist/npm_bazel_typescript$7423":
version "0.29.0-7-g61d4b0a"
"@bazel/typescript@file:../../dist/npm_bazel_typescript":
version "0.30.1-2-g5cc5c06"
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down
Loading