Fix test and build

Author: jamesdaniels

.github/workflows/test.yml

@@ -89,7 +89,10 @@ jobs:
       - name: Relocate Artifacts
         run: mv firebase-frameworks-${{ github.run_id }} dist
       - name: Test
-        run: npm run test:${{ matrix.framework }}
+        run: |
+          npm i -g firebase-tools
+          npm i --prefix $(npm root -g)/firebase-tools --force --save .
+          npm run test:${{ matrix.framework }}
         env:
           FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
 

package.json

@@ -30,10 +30,9 @@
     "test:e2e": "npm run e2e:config && cd e2e && firebase emulators:exec \"exit 0\"",
     "clean:build": "rm -rf dist",
     "clean:e2e": "rm -rf e2e",
-    "clean:dev": "npm uninstall -g firebase-tools && rm -rf firebase-tools",
-    "test:angular": ". ./tools/dev-tools.sh && npm run e2e:build-angular && npm run test:e2e",
-    "test:next": ". ./tools/dev-tools.sh && npm run e2e:build-next && npm run test:e2e",
-    "test:nuxt": ". ./tools/dev-tools.sh && npm run e2e:build-next && npm run test:e2e"
+    "test:angular": "npm run e2e:build-angular && npm run test:e2e",
+    "test:next": "npm run e2e:build-next && npm run test:e2e",
+    "test:nuxt": "npm run e2e:build-next && npm run test:e2e"
   },
   "exports": {
     ".": {

src/frameworks/angular/index.ts

@@ -44,26 +44,23 @@ export const build = async (config: DeployConfig | Required<DeployConfig>, getPr
             serverTarget = targetFromTargetString(options.serverTarget);
         if (prerenderTarget) {
             const prerenderOptions = await architectHost.getOptionsForTarget(prerenderTarget);
-            if (!prerenderOptions) throw 'foo';
-            if (typeof prerenderOptions.browserTarget !== 'string') throw 'foo';
-            if (typeof prerenderOptions.serverTarget !== 'string') throw 'foo';
             if (browserTarget) {
-                if (targetStringFromTarget(browserTarget) !== prerenderOptions.browserTarget)
+                if (targetStringFromTarget(browserTarget) !== prerenderOptions?.browserTarget)
                     throw 'foo';
             } else {
+                if (typeof prerenderOptions?.browserTarget !== 'string') throw 'foo';
                 browserTarget = targetFromTargetString(prerenderOptions.browserTarget);
             }
-            if (serverTarget && targetStringFromTarget(serverTarget) !== prerenderOptions.serverTarget)
+            if (serverTarget && targetStringFromTarget(serverTarget) !== prerenderOptions?.serverTarget)
                 throw 'foo';
         }
     } else if (workspaceProject.targets.has('prerender')) {
         // TODO test and warn if production doesn't exist, fallback to default
         prerenderTarget = { project, target: 'prerender', configuration: 'production' };
         const production = await architectHost.getOptionsForTarget(prerenderTarget);
-        if (!production) throw 'foo';
-        if (typeof production.browserTarget !== 'string') throw 'foo';
-        if (typeof production.serverTarget !== 'string') throw 'foo';
+        if (typeof production?.browserTarget !== 'string') throw 'foo';
         browserTarget = targetFromTargetString(production.browserTarget);
+        if (typeof production?.serverTarget !== 'string') throw 'foo';
         serverTarget = targetFromTargetString(production.serverTarget);
     } else {
         // TODO test and warn if production doesn't exist, fallback to default

tools/build.ts

@@ -49,7 +49,7 @@ const main = async () => {
     const { version } = require('../package.json');
     const npmList = JSON.parse(spawnSync('npm', ['list', '--json=true'], { encoding: 'utf8' }).stdout.toString());
     const from = ['__FIREBASE_FRAMEWORKS_VERSION__'];
-    const to = [`file:${process.cwd()}/firebase-frameworks-${version}.tgz`];
+    const to = [`file:${process.cwd()}`];
     for (const [dep, { version }] of Object.entries<Record<string, string>>(npmList.dependencies)) {
         from.push(`__${dep.toUpperCase().replace(/[^A-Z]/g, '_')}_VERSION__`);
         to.push(`^${version}`);

tools/prepare.sh

@@ -18,6 +18,6 @@ npm --no-git-tag-version --allow-same-version -f version $OVERRIDE_VERSION
 
 npm run build &&
     echo "npm --no-git-tag-version --allow-same-version -f version $OVERRIDE_VERSION &&
-    sed -i \"/const FIREBASE_FRAMEWORKS_VERSION =/c\const FIREBASE_FRAMEWORKS_VERSION = '$OVERRIDE_VERSION'/\" ./dist/index.js &&
+    sed 's/const FIREBASE_FRAMEWORKS_VERSION =.*/const FIREBASE_FRAMEWORKS_VERSION = \"$OVERRIDE_VERSION\"/' ./dist/index.js &&
     npm publish . --tag $NPM_TAG" > ./dist/publish.sh &&
     chmod +x ./dist/publish.sh