Publish

- @now/next@0.6.2

packages/now-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@now/next",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://zeit.co/docs/v2/deployments/official-builders/next-js-now-next",
@@ -21,7 +21,7 @@
     "@types/next-server": "8.0.0",
     "@types/resolve-from": "5.0.1",
     "@types/semver": "6.0.0",
-    "@zeit/node-file-trace": "0.2.9",
+    "@zeit/node-file-trace": "0.2.11",
     "fs-extra": "7.0.0",
     "get-port": "5.0.0",
     "resolve-from": "5.0.0",

packages/now-next/src/create-serverless-config.ts

@@ -49,7 +49,7 @@ export default async function createServerlessConfig(
     try {
       if (
         nextVersion.includes('canary') &&
-        semver.satisfies(nextVersion, `>=${ExperimentalTraceVersion}`)
+        semver.gte(nextVersion, ExperimentalTraceVersion)
       ) {
         target = 'experimental-serverless-trace';
       }

packages/now-next/src/index.ts

@@ -451,7 +451,7 @@ export const build = async ({
     try {
       if (
         realNextVersion &&
-        semver.satisfies(realNextVersion, `<${ExperimentalTraceVersion}`)
+        semver.lt(realNextVersion, ExperimentalTraceVersion)
       ) {
         if (config.debug) {
           console.log(
@@ -533,12 +533,12 @@ export const build = async ({
         const label = `Creating lambda for page: "${page}"...`;
         console.time(label);
 
-        const pageFileName = path.relative(workPath, pages[page].fsPath);
+        const pageFileName = path.normalize(
+          path.relative(workPath, pages[page].fsPath)
+        );
         const launcher = launcherData.replace(
           /__LAUNCHER_PAGE_PATH__/g,
-          JSON.stringify(
-            requiresTracing ? path.join('./', pageFileName) : './page'
-          )
+          JSON.stringify(requiresTracing ? `./${pageFileName}` : './page')
         );
         const launcherFiles = {
           'now__bridge.js': new FileFsRef({

packages/now-next/test/fixtures/02-firebase-node-8/package.json

@@ -0,0 +1,11 @@
+{
+  "engines": {
+    "node": "8.10.x"
+  },
+  "dependencies": {
+    "next": "canary",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "firebase": "6.3.4"
+  }
+}

packages/now-next/test/fixtures/04-firebase-node-10/next.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  generateBuildId() {
+    return 'testing-build-id';
+  },
+};

packages/now-next/test/fixtures/04-firebase-node-10/now.json

@@ -0,0 +1,8 @@
+{
+  "version": 2,
+  "builds": [{ "src": "package.json", "use": "@now/next" }],
+  "probes": [
+    { "path": "/nested/fb", "mustContain": "Hello Firebase: <!-- -->0" },
+    { "path": "/nested/moar/fb", "mustContain": "Hello Firebase: <!-- -->0" }
+  ]
+}

packages/now-next/test/fixtures/04-firebase-node-10/package.json

@@ -1,4 +1,7 @@
 {
+  "engines": {
+    "node": "10.x"
+  },
   "dependencies": {
     "next": "canary",
     "react": "^16.8.6",

packages/now-next/test/fixtures/04-firebase-node-10/pages/nested/fb.js

@@ -0,0 +1,19 @@
+import firebase from 'firebase/app';
+import 'firebase/firestore';
+
+if (!firebase.apps.length) {
+  firebase.initializeApp({ projectId: 'noop' });
+}
+
+const store = firebase.firestore();
+
+const Comp = ({ results }) => {
+  return <div>Hello Firebase: {results}</div>;
+};
+
+Comp.getInitialProps = async () => {
+  const query = await store.collection('users').get();
+  return { results: query.size };
+};
+
+export default Comp;

packages/now-next/test/fixtures/04-firebase-node-10/pages/nested/moar/[dynamic_fb].js

@@ -0,0 +1,19 @@
+import firebase from 'firebase/app';
+import 'firebase/firestore';
+
+if (!firebase.apps.length) {
+  firebase.initializeApp({ projectId: 'noop' });
+}
+
+const store = firebase.firestore();
+
+const Comp = ({ results }) => {
+  return <div>Hello Firebase: {results}</div>;
+};
+
+Comp.getInitialProps = async () => {
+  const query = await store.collection('users').get();
+  return { results: query.size };
+};
+
+export default Comp;

packages/now-node/package.json

@@ -28,7 +28,7 @@
     "@types/etag": "1.8.0",
     "@types/test-listen": "1.1.0",
     "@zeit/ncc": "0.20.4",
-    "@zeit/node-file-trace": "0.2.9",
+    "@zeit/node-file-trace": "0.2.11",
     "content-type": "1.0.4",
     "cookie": "0.4.0",
     "etag": "1.8.1",

yarn.lock

@@ -1480,10 +1480,10 @@
   resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.4.tgz#00f0a25a88cac3712af4ba66561d9e281c6f05c9"
   integrity sha512-fmq+F/QxPec+k/zvT7HiVpk7oiGFseS6brfT/AYqmCUp6QFRK7vZf2Ref46MImsg/g2W3g5X6SRvGRmOAvEfdA==
 
-"@zeit/node-file-trace@0.2.9":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.2.9.tgz#176aa55ae4800bfc847076b69b33df3bebc60201"
-  integrity sha512-OZU4HqNwlCEDIW67WTQnRjQ0ML7o9O8boPf1f9ffZbliKWRJrBPU+ydqvUtJeHICmY5Cjy9MQxwzo+q81G3uAA==
+"@zeit/node-file-trace@0.2.11":
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/@zeit/node-file-trace/-/node-file-trace-0.2.11.tgz#e8ed920ebf24ccf4913ab3aa3bec6443eb9689d9"
+  integrity sha512-Tdw7999gRFcuWZVIChMNLG01qAZ5PhnKbD3777/dCTTrz6/loc+G90utETkR1/qOZZ7/Dsz8DKWMtd+M8fvkiA==
   dependencies:
     acorn "^6.1.1"
     acorn-stage3 "^2.0.0"