Switch back to npm, yada yada. Prep for release

jamesdaniels · jamesdaniels · commit e20fb00bf1a5 · 2023-10-24T22:57:13.000-04:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - v16
     paths-ignore:
       - "**/*.md"
   pull_request:
@@ -26,29 +27,20 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '18'
-          check-latest: true
+          check-latest: false
       - name: node_modules cache
         uses: actions/cache@v3
         id: node_modules_cache
         with:
           path: ./node_modules
-          key: ${{ runner.os }}-16-12-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
-      - name: Yarn offline cache
-        if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm-packages-offline-cache
-          key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-18-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-18-
       - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
         run: |
-          yarn config set ignore-engines true
-          yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
-          yarn config set network-timeout 300000
-          yarn config set yarn-offline-mirror-pruning true
-          yarn install --frozen-lockfile --prefer-offline
+          npm ci
       - name: Build
-        id: yarn-pack-dir
         run: ./tools/build.sh
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
@@ -79,36 +71,28 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ./node_modules
-          key: ${{ runner.os }}-${{ matrix.node }}-16-9-12-8-node_modules-${{ hashFiles('yarn.lock') }}
-      - name: Yarn offline cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm-packages-offline-cache
-          key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
-      - name: Configure yarn
-        run: |
-          yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
-          yarn config set network-timeout 300000
-          yarn config set ignore-engines true
-      - name: Yarn install
+          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.node }}-
+      - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile --prefer-offline
+        run: npm ci
       - name: Download Artifacts
         uses: actions/download-artifact@v3
       - name: Relocate Artifacts
         run: mv angularfire-${{ github.run_id }} dist
       - name: Test Node
         run: |
-          yarn build:jasmine
-          yarn test:node
-      - name: ng-build yarn install
-        run: |
-          cd ./test/ng-build
-          yarn --prefer-offline
-      - name: ng-build prerender
-        run: |
-          cd ./test/ng-build
-          yarn prerender
+          npm run build:jasmine
+          npm run test:node
+      #- name: ng-build yarn install
+      #  run: |
+      #    cd ./test/ng-build
+      #    yarn --prefer-offline
+      #- name: ng-build prerender
+      #  run: |
+      #    cd ./test/ng-build
+      #    yarn prerender
 
   browser:
     runs-on: ${{ matrix.os }}
@@ -129,7 +113,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          check-latest: true
+          check-latest: false
       - name: Setup java
         uses: actions/setup-java@v3
         with:
@@ -140,20 +124,12 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ./node_modules
-          key: ${{ runner.os }}-${{ matrix.node }}-16-9-12-8-node_modules-${{ hashFiles('yarn.lock') }}
-      - name: Yarn offline cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm-packages-offline-cache
-          key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
-      - name: Configure yarn
-        run: |
-          yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
-          yarn config set network-timeout 300000
-          yarn config set ignore-engines true
-      - name: Yarn install
+          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.node }}-
+      - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile --prefer-offline
+        run: npm ci
       - name: Firebase emulator cache
         uses: actions/cache@v3
         with:
@@ -164,7 +140,7 @@ jobs:
       - name: Relocate Artifacts
         run: mv angularfire-${{ github.run_id }} dist
       - name: Test browser
-        run: yarn test:${{ matrix.browser }}
+        run: npm run test:${{ matrix.browser }}
 
   contribute:
     runs-on: ${{ matrix.os }}
@@ -187,28 +163,20 @@ jobs:
         id: node_modules_cache
         with:
           path: ./node_modules
-          key: ${{ runner.os }}-${{ matrix.node }}-12-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
-      - name: Yarn offline cache
-        if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm-packages-offline-cache
-          key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.node }}-
       - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        run: |
-          yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
-          yarn config set network-timeout 300000
-          yarn config set ignore-engines true
-          yarn install --frozen-lockfile --prefer-offline
+        run: npm ci
       - name: Lint
-        run: yarn lint
+        run: npm run lint
       - name: Build
-        run: yarn build
+        run: npm run build
       - name: Test Node
         run: |
-          yarn build:jasmine
-          yarn test:node
+          npm run build:jasmine
+          npm run test:node
       - name: Firebase emulator cache
         uses: actions/cache@v3
         with:
@@ -220,7 +188,7 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
       - name: Test headless
-        run: yarn test:chrome-headless
+        run: npm run test:chrome-headless
         # Tests are flaky on Windows
         continue-on-error: ${{ matrix.os == 'windows-latest' }}
 
@@ -243,7 +211,7 @@ jobs:
         with:
           node-version: '18'
           registry-url: 'https://registry.npmjs.org'
-          check-latest: true
+          check-latest: false
       - name: 'Download Artifacts'
         uses: actions/download-artifact@v3
       - name: Publish
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
   },
   "homepage": "https://github.com/angular/angularfire#readme",
   "dependencies": {
-    "@angular-devkit/architect": "^0.1601.1",
+    "@angular-devkit/architect": "~0.1600.0",
     "@angular-devkit/core": "^16.0.0",
     "@angular-devkit/schematics": "^16.0.0",
     "@angular/common": "^16.0.0",
@@ -55,7 +55,7 @@
     "@angular/platform-browser-dynamic": "^16.0.0",
     "@angular/router": "^16.0.0",
     "@schematics/angular": "^16.0.0",
-    "firebase": "^9.0.0 || ^10.0.0",
+    "firebase": "^10.0.0",
     "firebase-admin": "^9.11.1",
     "firebase-functions": "^3.6.0",
     "firebase-tools": "^12.2.1",
@@ -77,10 +77,10 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^16.0.0",
-    "@angular-eslint/builder": "^16.1.1",
-    "@angular-eslint/eslint-plugin": "^16.1.1",
-    "@angular-eslint/schematics": "16.0.3",
-    "@angular/animations": "~16.0.0",
+    "@angular-eslint/builder": "^16.0.0",
+    "@angular-eslint/eslint-plugin": "^16.0.0",
+    "@angular-eslint/schematics": "^16.0.0",
+    "@angular/animations": "^16.0.0",
     "@angular/cli": "^16.0.0",
     "@angular/compiler-cli": "^16.0.0",
     "@angular/platform-server": "^16.0.0",
@@ -96,17 +96,12 @@
     "@types/winston": "^2.4.4",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
     "@typescript-eslint/parser": "^6.5.0",
-    "codelyzer": "^6.0.0",
-    "concurrently": "^2.2.0",
     "conventional-changelog-cli": "^1.2.0",
     "cross-spawn": "^7.0.3",
     "eslint": "^8.48.0",
     "eslint-plugin-import": "^2.28.1",
-    "file-loader": "^6.2.0",
-    "firebase-functions-test": "^0.2.2",
     "globals": "^13.21.0",
     "globalthis": "^1.0.1",
-    "gzip-size": "^5.1.1",
     "jasmine": "^5.0.0",
     "jasmine-core": "~5.0.0",
     "karma": "~6.4.0",
@@ -118,24 +113,16 @@
     "karma-safarinative-launcher": "^1.1.0",
     "ncp": "^2.0.0",
     "ng-packagr": "^16.0.0",
-    "pretty-size": "^2.0.0",
     "protractor": "~7.0.0",
     "reflect-metadata": "^0.1.2",
     "replace-in-file": "^5.0.2",
     "rimraf": "^2.5.4",
-    "rollup": "^2.22.0",
     "schematics-utilities": "^2.0.1",
     "shelljs": "^0.8.0",
-    "systemjs": "^0.19.16",
-    "systemjs-builder": "^0.15.7",
-    "traceur": "0.0.96",
     "ts-transformer-keys": "^0.4.2",
-    "tsconfig-paths": "^3.8.0",
-    "tsickle": "^0.39.1",
     "tslint": "~6.1.0",
     "ttypescript": "^1.5.12",
-    "typedoc": "^0.16.4",
-    "typescript": "^5.0.0"
+    "typescript": ">=4.9.3 <5.2"
   },
   "typings": "index.d.ts"
 }
diff --git a/src/firestore/firebase.ts b/src/firestore/firebase.ts
diff --git a/src/package.json b/src/package.json
@@ -23,21 +23,21 @@
   "author": "angular,firebase",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/common": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@angular/platform-browser": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "rxjs": "~6.6.0 || ^7.0.0",
-    "firebase-tools": "^9.9.0 || ^10.0.0 || ^11.0.0 || ^12.0.0"
+    "@angular/common": "^16.0.0",
+    "@angular/core": "^16.0.0",
+    "@angular/platform-browser": "^16.0.0",
+    "@angular/platform-browser-dynamic": "^16.0.0",
+    "rxjs": "^6.5.3 || ^7.4.0",
+    "firebase-tools": "^12.0.0"
   },
   "peerDependenciesMeta": {
     "firebase-tools": { "optional": true }
   },
   "dependencies": {
-    "firebase": "^9.8.0",
-    "rxfire": "^6.0.0",
-    "@angular-devkit/schematics": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@schematics/angular": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
+    "firebase": "^10.5.0",
+    "rxfire": "^6.0.5",
+    "@angular-devkit/schematics": "^16.0.0",
+    "@schematics/angular": "^16.0.0",
     "tslib": "^2.0.0",
     "fuzzy": "^0.1.3",
     "inquirer-autocomplete-prompt": "^1.0.1",
diff --git a/tools/build.sh b/tools/build.sh
@@ -16,6 +16,6 @@ fi;
 
 npm --no-git-tag-version --allow-same-version -f version $OVERRIDE_VERSION
 
-yarn build &&
+npm run build &&
     echo "npm publish . --tag $NPM_TAG" > ./dist/packages-dist/publish.sh &&
     chmod +x ./dist/packages-dist/publish.sh
diff --git a/tools/build.ts b/tools/build.ts
@@ -122,16 +122,15 @@ ${exportedZoneWrappedFns}
 }
 
 const src = (...args: string[]) => join(process.cwd(), 'src', ...args);
-const dest = (...args: string[]) => join(process.cwd(), 'dist', '@angular/fire', ...args);
-const destPacakges = (...args: string[]) => join(process.cwd(), 'dist/packages-dist', ...args);
+const dest = (...args: string[]) => join(process.cwd(), 'dist', 'packages-dist', ...args);
 
 const rootPackage = import(join(process.cwd(), 'package.json'));
 
 async function replacePackageCoreVersion() {
   const root = await rootPackage;
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const replace = require('replace-in-file');
-  const files = destPacakges('package.json');
+  const files = dest('package.json');
   return replace({
     files,
     from: 'ANGULARFIRE2_VERSION',
@@ -141,7 +140,7 @@ async function replacePackageCoreVersion() {
 
 async function replaceSchematicVersions() {
   const root = await rootPackage;
-  const packagesPath = destPacakges('schematics', 'versions.json');
+  const packagesPath = dest('schematics', 'versions.json');
   const dependencies = await import(packagesPath);
   Object.keys(dependencies.peerDependencies).forEach(name => {
     dependencies.peerDependencies[name].version = root.dependencies[name] || root.devDependencies[name];
diff --git a/yarn.lock b/yarn.lock
