Cleanup package_example

.circleci/config.yml

@@ -176,7 +176,7 @@ jobs:
       # TODO(gmagolan): move these tests into `build` job once
       # https://github.com/bazelbuild/bazel/issues/6481 is resolved
       - run: bazel test @examples_program//...
-      - run: bazel test @packages_example//...
+      - run: bazel test @internal_e2e_packages//...
 
   build_release:
     <<: *job_defaults

WORKSPACE

@@ -34,7 +34,7 @@ local_repository(
 )
 
 local_repository(
-    name = "packages_example",
+    name = "internal_e2e_packages",
     path = "internal/e2e/packages",
 )
 
@@ -91,9 +91,9 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
 
 install_bazel_dependencies()
 
-load("@packages_example//:setup_workspace.bzl", "packages_example_setup_workspace")
+load("@internal_e2e_packages//:setup_workspace.bzl", "internal_e2e_packages_setup_workspace")
 
-packages_example_setup_workspace()
+internal_e2e_packages_setup_workspace()
 
 # Dependencies to run skydoc
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")

internal/e2e/packages/BUILD.bazel

@@ -16,20 +16,20 @@ VARIANTS = [
 [jasmine_node_test(
     name = "version_" + variant + "_test",
     srcs = [variant + ".spec.js"],
-    node_modules = "@packages_example_" + variant + "//:node_modules",
+    node_modules = "@internal_e2e_packages_" + variant + "//:node_modules",
     deps = [":test_version"],
 ) for variant in VARIANTS]
 
 jasmine_node_test(
     name = "npm_determinism_test",
     srcs = ["npm_determinism.spec.js"],
-    data = ["@packages_example_npm_install//node_modules/jsesc:package.json"],
-    node_modules = "@packages_example_npm_install_duplicate_for_determinism_testing//:node_modules",
+    data = ["@internal_e2e_packages_npm_install//node_modules/jsesc:package.json"],
+    node_modules = "@internal_e2e_packages_npm_install_duplicate_for_determinism_testing//:node_modules",
 )
 
 jasmine_node_test(
     name = "yarn_determinism_test",
     srcs = ["yarn_determinism.spec.js"],
-    data = ["@packages_example_yarn_install//node_modules/jsesc:package.json"],
-    node_modules = "@packages_example_yarn_install_duplicate_for_determinism_testing//:node_modules",
+    data = ["@internal_e2e_packages_yarn_install//node_modules/jsesc:package.json"],
+    node_modules = "@internal_e2e_packages_yarn_install_duplicate_for_determinism_testing//:node_modules",
 )

internal/e2e/packages/WORKSPACE

@@ -1,4 +1,4 @@
-workspace(name = "packages_example")
+workspace(name = "internal_e2e_packages")
 
 local_repository(
     name = "build_bazel_rules_nodejs",
@@ -10,8 +10,8 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_rules_nodejs_version", "node
 # Test that check_rules_nodejs_version works as expected
 check_rules_nodejs_version(minimum_version_string = "0.11.2")
 
-node_repositories(package_json = ["//:package.json"])
+node_repositories()
 
-load(":setup_workspace.bzl", "packages_example_setup_workspace")
+load(":setup_workspace.bzl", "internal_e2e_packages_setup_workspace")
 
-packages_example_setup_workspace()
+internal_e2e_packages_setup_workspace()

internal/e2e/packages/npm1/package.json

@@ -0,0 +1,10 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ./postinstall.js"
+  }
+}

internal/e2e/packages/npm2/package.json

@@ -0,0 +1,10 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ./postinstall.js"
+  }
+}

internal/e2e/packages/npm3/package.json

@@ -0,0 +1,10 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ./postinstall.js"
+  }
+}

internal/e2e/packages/npm_determinism.spec.js

@@ -5,8 +5,8 @@ const packageJsonPath = require.resolve('jsesc').replace('jsesc.js', 'package.js
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath));
 
 const packageJsonPath2 = packageJsonPath.replace(
-    '/packages_example_npm_install_duplicate_for_determinism_testing/',
-    '/packages_example_npm_install/');
+    '/internal_e2e_packages_npm_install_duplicate_for_determinism_testing/',
+    '/internal_e2e_packages_npm_install/');
 const packageJson2 = JSON.parse(fs.readFileSync(packageJsonPath2));
 
 describe('jsesc package.json files', () => {

internal/e2e/packages/package.json

@@ -1,12 +1,6 @@
 {
-  "description": "runtime dependencies for packages example",
-  "dependencies": {
-    "jsesc": "~1.2.0",
-    "jasmine": "2.8.0"
-  },
   "scripts": {
     "postinstall": "node ./postinstall.js",
-    "pretest": "bazel run @nodejs//:yarn",
     "test": "bazel test //..."
   }
 }

internal/e2e/packages/setup_workspace.bzl

@@ -12,46 +12,46 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Helper function to setup @package_example workspace.
+"""Helper function to setup @internal_e2e_packages workspace.
 """
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_install", "yarn_install")
 
-def packages_example_setup_workspace():
-    """Node repositories for @packages_examples
+def internal_e2e_packages_setup_workspace():
+    """Node repositories for @internal_e2e_packagess
     """
     npm_install(
-        name = "packages_example_npm_install",
-        package_json = "@packages_example//:package.json",
-        package_lock_json = "@packages_example//:package-lock.json",
-        data = ["@packages_example//:postinstall.js"],
+        name = "internal_e2e_packages_npm_install",
+        package_json = "@internal_e2e_packages//:npm1/package.json",
+        package_lock_json = "@internal_e2e_packages//:npm1/package-lock.json",
+        data = ["@internal_e2e_packages//:postinstall.js"],
         # Just here as a smoke test for this attribute
         prod_only = True,
     )
 
     npm_install(
-        name = "packages_example_npm_install_duplicate_for_determinism_testing",
-        package_json = "@packages_example//:package.json",
-        package_lock_json = "@packages_example//:package-lock.json",
-        data = ["@packages_example//:postinstall.js"],
+        name = "internal_e2e_packages_npm_install_duplicate_for_determinism_testing",
+        package_json = "@internal_e2e_packages//:npm2/package.json",
+        package_lock_json = "@internal_e2e_packages//:npm2/package-lock.json",
+        data = ["@internal_e2e_packages//:postinstall.js"],
     )
 
     npm_install(
-        name = "packages_example_npm_no_lockfile",
-        package_json = "@packages_example//:package.json",
-        data = ["@packages_example//:postinstall.js"],
+        name = "internal_e2e_packages_npm_no_lockfile",
+        package_json = "@internal_e2e_packages//:npm3/package.json",
+        data = ["@internal_e2e_packages//:postinstall.js"],
     )
 
     yarn_install(
-        name = "packages_example_yarn_install",
-        package_json = "@packages_example//:package.json",
-        yarn_lock = "@packages_example//:yarn.lock",
-        data = ["@packages_example//:postinstall.js"],
+        name = "internal_e2e_packages_yarn_install",
+        package_json = "@internal_e2e_packages//:yarn1/package.json",
+        yarn_lock = "@internal_e2e_packages//:yarn1/yarn.lock",
+        data = ["@internal_e2e_packages//:postinstall.js"],
     )
 
     yarn_install(
-        name = "packages_example_yarn_install_duplicate_for_determinism_testing",
-        package_json = "@packages_example//:package.json",
-        yarn_lock = "@packages_example//:yarn.lock",
-        data = ["@packages_example//:postinstall.js"],
+        name = "internal_e2e_packages_yarn_install_duplicate_for_determinism_testing",
+        package_json = "@internal_e2e_packages//:yarn2/package.json",
+        yarn_lock = "@internal_e2e_packages//:yarn2/yarn.lock",
+        data = ["@internal_e2e_packages//:postinstall.js"],
     )

internal/e2e/packages/yarn1/package.json

@@ -0,0 +1,10 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ./postinstall.js"
+  }
+}

internal/e2e/packages/yarn2/package.json

@@ -0,0 +1,10 @@
+{
+  "description": "runtime dependencies for packages example",
+  "dependencies": {
+    "jsesc": "~1.2.0",
+    "jasmine": "2.8.0"
+  },
+  "scripts": {
+    "postinstall": "node ./postinstall.js"
+  }
+}