Move to pnpm (#185)

Author: samtstern

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 10.x
+          - 12.x
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
@@ -29,13 +29,13 @@ jobs:
       - name: Install dependencies
         run: |
           npm install
-          npm run lerna-bootstrap
+          npm run bootstrap
 
       - name: Lint snippets
         run: npm run lint
 
       - name: Compile snippets
-        run: npm run lerna-compile
+        run: npm run compile
 
       - name: Check generated snippets
         run: |

.gitignore

@@ -5,3 +5,4 @@ tsconfig.json
 dist/
 .DS_Store
 .idea
+pnpm-lock.yaml

analytics-next/ecommerce.js

@@ -35,7 +35,7 @@ const item_socks = {
 
 function ecommerceViewItemList() {
   // [START analytics_ecommerce_view_item_list]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce params
   const params1 = {
@@ -52,7 +52,7 @@ function ecommerceViewItemList() {
 
 function ecommerceSelectItem() {
   // [START analytics_ecommerce_select_item]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce event params
   const params2 = {
@@ -69,7 +69,7 @@ function ecommerceSelectItem() {
 
 function ecommerceViewItemDetails() {
   // [START analytics_ecommerce_view_item_details]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce event params
   const params3 = {
@@ -86,7 +86,7 @@ function ecommerceViewItemDetails() {
 
 function ecommerceAddCart() {
   // [START analytics_ecommerce_add_cart]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Specify order quantity
   const item_jeggings_quantity = {
@@ -112,7 +112,7 @@ function ecommerceAddCart() {
 
 function ecommerceViewCart() {
   // [START analytics_ecommerce_view_cart]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Specify order quantity
   const item_jeggings_quantity = {
@@ -140,7 +140,7 @@ function ecommerceViewCart() {
 
 function ecommerceRemoveCart() {
   // [START analytics_ecommerce_remove_cart]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce params
   const params6 = {
@@ -157,7 +157,7 @@ function ecommerceRemoveCart() {
 
 function ecommerceCheckout() {
   // [START analytics_ecommerce_checkout]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce params
   const params7 = {
@@ -175,7 +175,7 @@ function ecommerceCheckout() {
 
 function ecommerceShippingInfo() {
   // [START analytics_ecommerce_shipping_info]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce params
   const params8 = {
@@ -194,7 +194,7 @@ function ecommerceShippingInfo() {
 
 function ecommercePaymentInfo() {
   // [START analytics_ecommerce_payment_info]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce params
   const params9 = {
@@ -213,7 +213,7 @@ function ecommercePaymentInfo() {
 
 function ecommercePurchase() {
   // [START analytics_ecommerce_purchase]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce bundle
   const params10 = {
@@ -235,7 +235,7 @@ function ecommercePurchase() {
 
 function ecommerceRefund() {
   // [START analytics_ecommerce_refund]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce params
   const params11 = {
@@ -262,7 +262,7 @@ function ecommerceRefund() {
 
 function ecommercePromotions() {
   // [START analytics_ecommerce_promotions]
-  const { getAnalytics, logEvent } = require("@firebase/analytics");
+  const { getAnalytics, logEvent } = require("firebase/analytics");
 
   // Prepare ecommerce params
   const params12 = {

firestore-next/test.solution-arrays.js

@@ -78,7 +78,7 @@ describe("firestore-solution-arrays", () => {
         it("should query in a category by timestamp", () => {
             function queryOne() {
                 // [START query_in_category_timestamp_invalid]
-                const { collection, query, where, orderBy, FirebaseFirestore } = require("@firebase/firestore");
+                const { collection, query, where, orderBy, FirebaseFirestore } = require("firebase/firestore");
 
                 const q = query(collection(db, "posts"),
                     where("categories.cats", "==", true),
@@ -89,7 +89,7 @@ describe("firestore-solution-arrays", () => {
 
             function queryTwo() {
                 // [START query_in_category_timestamp]
-                const { collection, query, where, orderBy } = require("@firebase/firestore");
+                const { collection, query, where, orderBy } = require("firebase/firestore");
 
                 const q = query(collection(db, "posts"),
                     where("categories.cats", ">", 0),

firestore-next/test.solution-counters.js

@@ -28,7 +28,7 @@ function createCounter(ref, num_shards) {
 
 // [START increment_counter]
 function incrementCounter(db, ref, num_shards) {
-    const { collection, doc, updateDoc, increment, FirebaseFirestore } = require("@firebase/firestore");
+    const { doc, updateDoc, increment } = require("firebase/firestore");
 
     // Select a shard of the counter at random
     const shardId = Math.floor(Math.random() * num_shards).toString();
@@ -41,7 +41,7 @@ function incrementCounter(db, ref, num_shards) {
 
 // [START get_count]
 async function getCount(ref) {
-    const { collection, getDocs } = require("@firebase/firestore");
+    const { collection, getDocs } = require("firebase/firestore");
 
     // Sum the count of each shard in the subcollection
     const snapshot = await getDocs(collection(ref, 'shards'));

lerna.json

@@ -5,13 +5,14 @@
     "snippets": "rimraf snippets && ts-node scripts/separate-snippets.ts",
     "lint": "git ls-files | grep -v 'snippets/' | grep '.js$' | xargs npx eslint",
     "format": "npm run lint -- --fix",
-    "lerna-bootstrap": "lerna bootstrap --no-ci",
-    "lerna-compile": "lerna run compile"
+    "bootstrap": "pnpm recursive install",
+    "compile": "pnpm recursive run compile --workspace-concurrency=4"
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "@types/node": "^15.12.2",
     "eslint": "^7.16.0",
-    "lerna": "^3.22.1",
+    "pnpm": "^6.7.4",
     "rimraf": "^3.0.2",
     "ts-node": "^9.0.0",
     "typescript": "^3.8.3"

package.json

@@ -4,7 +4,7 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START analytics_ecommerce_add_cart_modular]
-import { getAnalytics, logEvent } from "@firebase/analytics";
+import { getAnalytics, logEvent } from "firebase/analytics";
 
 // Specify order quantity
 const item_jeggings_quantity = {

snippets/analytics-next/ecommerce/analytics_ecommerce_add_cart.js

@@ -4,7 +4,7 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START analytics_ecommerce_checkout_modular]
-import { getAnalytics, logEvent } from "@firebase/analytics";
+import { getAnalytics, logEvent } from "firebase/analytics";
 
 // Prepare ecommerce params
 const params7 = {

snippets/analytics-next/ecommerce/analytics_ecommerce_checkout.js

@@ -4,7 +4,7 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START analytics_ecommerce_payment_info_modular]
-import { getAnalytics, logEvent } from "@firebase/analytics";
+import { getAnalytics, logEvent } from "firebase/analytics";
 
 // Prepare ecommerce params
 const params9 = {