Page not found :(
-The requested page could not be found.
-
-
-If they're bigger, we can make sure they are fullwidth.
-
-
-
-# Blockquotes
-
-We can do all sorts of fun stuff with blockquotes. I often use them for notes or
-asides, but we can do whatever, really.
-
-> > We can do all sorts of fun stuff with blockquotes.
-> > I often use them for notes or asides, but we can do whatever, really.
->
-> "You can also add quotation marks if you're feeling fancy."
-
-# Links
-
-We got links. [Lots of links](localhost).
-You can [`link`](localhost) here, too.
-
-# Tables
-
-You can make tables in markdown, too! Who would have thought. Are these styled yet?
-
-| First Header | Second Header |
-| ------------ | ------------- |
-| Content Cell | Content Cell |
-| Content Cell | Content Cell |
-
-# Foldable Text
-
-Content 1 Content 1 Content 1 Content 1 Content 1
-Content 2 Content 2 Content 2 Content 2 Content 2
-Content 1 Content 1 Content 1 Content 1 Content 1
-- {{ page.content | safe | striptags | truncate }} -
-- "Hello, World!" is an example zola website which was built with - Rust - . The goal is to demonstrate how zola builds and deploys static websites. -
-- {{ page.summary | safe | striptags | truncate }} - continue reading... -
- - -- {{ page.content | safe | striptags | truncate }} -
-- {{/* - CurrentSection allows us to use the section title instead of inferring from the folder. - https://gohugo.io/variables/page/#section-variables-and-methods - */}} - {{with .CurrentSection.Title }}{{. | upper }}{{end}} -
-- By {{ . | markdownify }} -
- {{ end }} - {{/* Hugo uses Go's date formatting is set by example. Here are two formats */}} - - {{/* - Show "reading time" and "word count" but only if one of the following are true: - 1) A global config `params` value is set `show_reading_time = true` - 2) A section front matter value is set `show_reading_time = true` - 3) A page front matter value is set `show_reading_time = true` - */}} - {{ if (or (eq (.Param "show_reading_time") true) (eq $section.Params.show_reading_time true) )}} - - {{ .ReadingTime}} minutes read - - {{ .WordCount}} words - {{ end }} -Below you will find pages that utilize the taxonomy term “{{ .Title }}”
-- {{ humanize .Section | upper }} -
-{{ i18n "whatsInThis" . }}
- {{ .TableOfContents }} -{{ i18n "related" }}
-By {{ .Author }}
*/}} -By {{ .Author }}
*/}} -Jquery is working
'); -// -// You can also "require" any script from its location in the node modules folder. Webpack often knows what to look for, but you can add a script directly like this: -// var javascriptthingy = require('name/folder/file.js'); diff --git a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/package.json b/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/package.json deleted file mode 100644 index 15d8bd203..000000000 --- a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/package.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "46-hugo-with-framework", - "version": "1.0.0", - "description": "Default Theme for Hugo Sites", - "main": "index.js", - "repository": "", - "author": "budparr", - "license": "MIT", - "scripts": { - "build:production": "rm -rf ../static/dist && webpack -p", - "build": "webpack --progress --colors --watch", - "start": "npm run build" - }, - "devDependencies": { - "assets-webpack-plugin": "^3.9.10", - "babel-core": "^6.24.1", - "babel-loader": "^7.0.0", - "babel-preset-env": "^1.4.0", - "css-loader": "^0.28.0", - "cssnano": "^3.10.0", - "extract-text-webpack-plugin": "^2.1.0", - "file-loader": "^0.11.1", - "postcss": "^5.2.16", - "postcss-cssnext": "^2.10.0", - "postcss-import": "^9.1.0", - "postcss-loader": "^1.3.3", - "style-loader": "^0.16.1", - "tachyons": "^4.9.1", - "webpack": "^2.3.3" - }, - "dependencies": {} -} diff --git a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/readme.md b/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/readme.md deleted file mode 100644 index b82f62736..000000000 --- a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/readme.md +++ /dev/null @@ -1,40 +0,0 @@ -## Welcome to the SRC folder for the Gohugo Ananke Theme. - -The contents of this folder are used to generate CSS and javascript. You may never have to touch anything here, unless you want to more deeply customize your styles. - -## Tools - -### Yarn - -We use [Yarn](https://yarnpkg.com) for package managment (instead of NPM) because it's fast and generates a lock file to make dependency management more consistent. The theme's `.gitignore` file should be kept intact to make sure that all files in the `node_modules` folder are not pushed to the repository. - -### Webpack - -We use Webpack to manage our asset pipeline. Arguably, Webpack is overkill for this use-case, but we're using it here because once it's set up (which we've done for you), it's really easy to use. If you want to use an external script, just add it via Yarn, and reference it in main.js. You'll find instructions in the js/main.js file. - -### PostCSS - -PostCSS is just CSS. You'll find `postcss.config.js` in the css folder. There you'll find that we're using [`postcss-import`](https://github.com/postcss/postcss-import) which allows us import css files directly from the node_modules folder, [`postcss-cssnext`](http://cssnext.io/features/) which gives us the power to use upcoming CSS features today. If you miss Sass you can find PostCss modules for those capabilities, too. - -### Tachyons - -This theme uses the [Tachyons CSS Library](http://tachyons.io/). It's about 15kb gzipped, highly modular, and each class is atomic so you never have to worry about overwriting your styles. It's a great library for themes because you can make most all the style changes you need right in your layouts. - -## How to Use - -You'll find the commands to run in `src/package.json`. - -For development, you'll need Node and Yarn installed: - -``` -$ cd themes/gohugo-theme-ananke/src/ - -$ yarn install - -$ npm start - -``` - -This will process both the postcss and scripts. - -For production, instead of `npm start`, run `npm run build:production,` which will output minified versions of your files. diff --git a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/webpack.config.js b/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/webpack.config.js deleted file mode 100644 index ed9041cf5..000000000 --- a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/src/webpack.config.js +++ /dev/null @@ -1,57 +0,0 @@ -var path = require('path'); -var ExtractTextPlugin = require('extract-text-webpack-plugin'); -var webpack = require('webpack'); -var AssetsPlugin = require('assets-webpack-plugin'); - -module.exports = { - entry: { - app: './js/main.js', - }, - module: { - rules: [ - { - test: /\.js$/, - exclude: /node_modules/, - use: { - loader: 'babel-loader', - options: { - presets: ['env'], - }, - }, - }, - { - test: /\.css$/, - use: ExtractTextPlugin.extract({ - fallback: 'style-loader', - use: 'css-loader?importLoaders=1!postcss-loader', - }), - }, - ], - }, - - output: { - path: path.join(__dirname, './../static/dist'), - filename: 'js/[name].[chunkhash].js', - }, - - resolve: { - modules: [path.resolve(__dirname, 'src'), 'node_modules'], - }, - - plugins: [ - new AssetsPlugin({ - filename: 'webpack_assets.json', - path: path.join(__dirname, '../data'), - prettyPrint: true, - }), - new ExtractTextPlugin({ - filename: getPath => { - return getPath('css/[name].[contenthash].css'); - }, - allChunks: true, - }), - ], - watchOptions: { - watch: true, - }, -}; diff --git a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/stackbit.yaml b/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/stackbit.yaml deleted file mode 100644 index cebca0849..000000000 --- a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/stackbit.yaml +++ /dev/null @@ -1,233 +0,0 @@ -stackbitVersion: ~0.2.39 -ssgName: custom -publishDir: exampleSite/public -buildCommand: cd exampleSite && hugo --gc --baseURL "/" --themesDir ../.. && cd .. -uploadDir: uploads -staticDir: exampleSite/static -pagesDir: exampleSite/content -dataDir: exampleSite -models: - config: - type: data - label: Config - file: config.toml - fields: - - type: string - name: title - label: Title - required: true - - type: string - name: baseURL - label: Base URL - description: Hostname (and path) to the root - hidden: false - - type: string - name: languageCode - label: Language Code - hidden: true - - type: string - name: MetaDataFormat - label: MetaDataFormat - hidden: true - - type: string - name: DefaultContentLanguage - label: DefaultContentLanguage - hidden: true - - type: string - name: themesDir - label: Themes Directory - hidden: true - - type: string - name: theme - label: Theme Name - hidden: true - - type: string - name: SectionPagesMenu - label: Main Section - hidden: false - - type: number - name: Paginate - label: Paginate Per Page - hidden: false - - type: boolean - name: enableRobotsTXT - label: Enable Robots - hidden: true - - type: string - name: googleAnalytics - label: Google Analytics ID - - type: object - name: sitemap - label: sitemap - hidden: true - fields: - - type: string - name: changefreq - label: changefreq - - type: number - subtype: float - name: priority - label: priority - - type: string - name: filename - label: filename - - type: object - name: params - label: Params - description: Site parameters - required: true - fields: - - type: string - name: featured_image - label: Logo - - type: string - name: favicon - label: Favicon - - type: string - name: description - label: Description - - type: string - name: description - label: Description - - type: string - name: facebook - label: Facebook - - type: string - name: twitter - label: Twitter - - type: string - name: instagram - label: Instagram - - type: string - name: youtube - label: Youtube - - type: string - name: github - label: Github - - type: string - name: gitlab - label: Gitlab - - type: string - name: linkedin - label: Linkedin - - type: string - name: mastodon - label: Mastodon - - type: string - name: slack - label: Slack - - type: string - name: background_color_class - label: background_color_class - - type: number - name: recent_posts_number - label: recent_posts_number - home: - type: page - label: Home - file: _index.md - hideContent: false - singleInstance: true - layout: index.html - fields: - - type: string - name: title - label: Title - description: The title of the page. - required: true - - type: image - name: featured_image - label: Featured Image - description: Image displayed at in the pages intro section - - type: string - name: description - label: Description - - type: string - name: layout - label: layout - basicpage: - type: page - label: Basic Page - match: "*.md" - exclude: _index.md - layout: page/single.html - fields: - - type: string - name: title - label: Title - description: The title of the page. - - type: string - name: type - label: type - default: page - - type: boolean - name: omit_header_text - label: omit_header_text - description: The title of the page. - - type: image - name: featured_image - label: Featured Image - description: Image displayed at in the pages intro section - - type: string - name: description - label: Description - - type: enum - name: menu - label: Menu - options: - - label: Main Menu - value: main - type: object - section: - type: page - label: Section - match: "*/_index.md" - layout: _default/list.html - fields: - - type: string - name: title - label: Title - description: The title of the page. - - type: image - name: featured_image - label: Featured Image - description: Image displayed at in the pages intro section - - type: string - name: description - label: Description - - type: date - name: date - label: Date - - type: enum - name: menu - label: menu - default: main - options: - - label: main - value: main - post: - type: page - label: Posts - folder: post - exclude: _index.md - layout: _default/single.html - fields: - - type: string - name: title - label: Title - - type: date - name: date - label: Date - - type: image - name: featured_image - label: Featured Image - description: Image displayed at in the pages intro section - - type: string - name: description - label: Description - - type: enum - name: tags - label: tags - - type: boolean - name: draft - label: Draft diff --git a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/static/images/gohugo-default-sample-hero-image.jpg b/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/static/images/gohugo-default-sample-hero-image.jpg deleted file mode 100644 index 06815836a..000000000 Binary files a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/static/images/gohugo-default-sample-hero-image.jpg and /dev/null differ diff --git a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/theme.toml b/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/theme.toml deleted file mode 100755 index a2236e0d3..000000000 --- a/packages/static-build/test/fixtures/46-hugo-with-framework/themes/ananke/theme.toml +++ /dev/null @@ -1,15 +0,0 @@ -# theme.toml template for a Hugo theme -# See https://github.com/spf13/hugoThemes#themetoml for an example - -name = "Ananke Gohugo Theme" -license = "MIT" -licenselink = "https://github.com/budparr/gohugo-theme-ananke/blob/master/LICENSE.md" -description = "A Base theme for building full featured Hugo sites" -homepage = "https://github.com/budparr/gohugo-theme-ananke" -tags = ["website", "starter", "responsive", "Disqus", "blog", "Tachyons", "Multilingual", "Stackbit"] -features = ["posts", "shortcodes", "related content", "comments"] -min_version = "0.30.2" - -[author] - name = "Bud Parr" - homepage = "https://github.com/budparr" diff --git a/packages/static-build/test/fixtures/48-nuxt-without-framework/now.json b/packages/static-build/test/fixtures/48-nuxt-without-framework/vercel.json similarity index 100% rename from packages/static-build/test/fixtures/48-nuxt-without-framework/now.json rename to packages/static-build/test/fixtures/48-nuxt-without-framework/vercel.json diff --git a/packages/static-build/test/fixtures/49-scully/now.json b/packages/static-build/test/fixtures/49-scully/now.json deleted file mode 100644 index 12ab8d555..000000000 --- a/packages/static-build/test/fixtures/49-scully/now.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build", - "config": { - "zeroConfig": true - } - } - ], - "probes": [{ "path": "/", "mustContain": "Scully" }] -} diff --git a/packages/static-build/test/fixtures/49-scully/probes.json b/packages/static-build/test/fixtures/49-scully/probes.json new file mode 100644 index 000000000..0e49afdbb --- /dev/null +++ b/packages/static-build/test/fixtures/49-scully/probes.json @@ -0,0 +1,3 @@ +{ + "probes": [{ "path": "/", "mustContain": "Scully" }] +} diff --git a/packages/static-build/test/fixtures/50-ionic-react/now.json b/packages/static-build/test/fixtures/50-ionic-react/vercel.json similarity index 100% rename from packages/static-build/test/fixtures/50-ionic-react/now.json rename to packages/static-build/test/fixtures/50-ionic-react/vercel.json diff --git a/packages/static-build/test/fixtures/52-ionic-angular/now.json b/packages/static-build/test/fixtures/52-ionic-angular/vercel.json similarity index 100% rename from packages/static-build/test/fixtures/52-ionic-angular/now.json rename to packages/static-build/test/fixtures/52-ionic-angular/vercel.json diff --git a/packages/static-build/test/fixtures/53-native-gems/now.json b/packages/static-build/test/fixtures/53-native-gems/vercel.json similarity index 100% rename from packages/static-build/test/fixtures/53-native-gems/now.json rename to packages/static-build/test/fixtures/53-native-gems/vercel.json diff --git a/packages/static-build/test/fixtures/55-ignore-output/now.json b/packages/static-build/test/fixtures/55-ignore-output/vercel.json similarity index 100% rename from packages/static-build/test/fixtures/55-ignore-output/now.json rename to packages/static-build/test/fixtures/55-ignore-output/vercel.json diff --git a/packages/static-build/test/fixtures/74-build-output-directory-with-build-config/vercel.json b/packages/static-build/test/fixtures/61-build-output-directory/probes.json similarity index 88% rename from packages/static-build/test/fixtures/74-build-output-directory-with-build-config/vercel.json rename to packages/static-build/test/fixtures/61-build-output-directory/probes.json index 94d36b03b..b1fffb9d5 100644 --- a/packages/static-build/test/fixtures/74-build-output-directory-with-build-config/vercel.json +++ b/packages/static-build/test/fixtures/61-build-output-directory/probes.json @@ -1,12 +1,4 @@ { - "version": 2, - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build", - "config": { "zeroConfig": true } - } - ], "probes": [ { "path": "/.vercel/functions/root", diff --git a/packages/static-build/test/fixtures/63-build-output-directory-with-static/vercel.json b/packages/static-build/test/fixtures/63-build-output-directory-with-static/probes.json similarity index 79% rename from packages/static-build/test/fixtures/63-build-output-directory-with-static/vercel.json rename to packages/static-build/test/fixtures/63-build-output-directory-with-static/probes.json index d4b219792..20992caab 100644 --- a/packages/static-build/test/fixtures/63-build-output-directory-with-static/vercel.json +++ b/packages/static-build/test/fixtures/63-build-output-directory-with-static/probes.json @@ -1,12 +1,4 @@ { - "version": 2, - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build", - "config": { "zeroConfig": true } - } - ], "probes": [ { "path": "/", "mustContain": "hello world" }, { "path": "/hello.txt", "mustContain": "hello world" }, diff --git a/packages/static-build/test/fixtures/65-build-output-directory-with-legacy-node-functions/vercel.json b/packages/static-build/test/fixtures/65-build-output-directory-with-legacy-node-functions/probes.json similarity index 72% rename from packages/static-build/test/fixtures/65-build-output-directory-with-legacy-node-functions/vercel.json rename to packages/static-build/test/fixtures/65-build-output-directory-with-legacy-node-functions/probes.json index 443415837..c8366bf7c 100644 --- a/packages/static-build/test/fixtures/65-build-output-directory-with-legacy-node-functions/vercel.json +++ b/packages/static-build/test/fixtures/65-build-output-directory-with-legacy-node-functions/probes.json @@ -1,12 +1,4 @@ { - "version": 2, - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build", - "config": { "zeroConfig": true } - } - ], "probes": [ { "path": "/.vercel/functions/my-function/index", diff --git a/packages/static-build/test/fixtures/66-build-output-directory-with-functions/vercel.json b/packages/static-build/test/fixtures/66-build-output-directory-with-functions/probes.json similarity index 74% rename from packages/static-build/test/fixtures/66-build-output-directory-with-functions/vercel.json rename to packages/static-build/test/fixtures/66-build-output-directory-with-functions/probes.json index d8d56ff0b..7c9e75394 100644 --- a/packages/static-build/test/fixtures/66-build-output-directory-with-functions/vercel.json +++ b/packages/static-build/test/fixtures/66-build-output-directory-with-functions/probes.json @@ -1,12 +1,4 @@ { - "version": 2, - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build", - "config": { "zeroConfig": true } - } - ], "probes": [ { "path": "/.vercel/functions/go-site/index", "status": 404 }, { "path": "/.vercel/functions/go-site", "status": 200 }, diff --git a/packages/static-build/test/fixtures/61-build-output-directory/vercel.json b/packages/static-build/test/fixtures/74-build-output-directory-with-build-config/probes.json similarity index 88% rename from packages/static-build/test/fixtures/61-build-output-directory/vercel.json rename to packages/static-build/test/fixtures/74-build-output-directory-with-build-config/probes.json index 94d36b03b..b1fffb9d5 100644 --- a/packages/static-build/test/fixtures/61-build-output-directory/vercel.json +++ b/packages/static-build/test/fixtures/74-build-output-directory-with-build-config/probes.json @@ -1,12 +1,4 @@ { - "version": 2, - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build", - "config": { "zeroConfig": true } - } - ], "probes": [ { "path": "/.vercel/functions/root", diff --git a/packages/static-build/test/fixtures/75-pnpm7-custom-commands/probes.json b/packages/static-build/test/fixtures/75-pnpm7-custom-commands/probes.json new file mode 100644 index 000000000..4857edf5a --- /dev/null +++ b/packages/static-build/test/fixtures/75-pnpm7-custom-commands/probes.json @@ -0,0 +1,8 @@ +{ + "probes": [ + { + "path": "/", + "mustContain": "pnpm version: 7" + } + ] +} diff --git a/packages/static-build/test/fixtures/75-pnpm7-custom-commands/vercel.json b/packages/static-build/test/fixtures/75-pnpm7-custom-commands/vercel.json deleted file mode 100644 index 1032c06b9..000000000 --- a/packages/static-build/test/fixtures/75-pnpm7-custom-commands/vercel.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 2, - "builds": [ - { - "src": "package.json", - "use": "@vercel/static-build" - } - ], - "probes": [ - { - "path": "/", - "mustContain": "pnpm version: 7" - } - ] -} diff --git a/test/lib/deployment/now-deploy.js b/test/lib/deployment/now-deploy.js index 18e7908bb..34c21e89f 100644 --- a/test/lib/deployment/now-deploy.js +++ b/test/lib/deployment/now-deploy.js @@ -9,7 +9,7 @@ const ms = require('ms'); const sleep = ms => new Promise(resolve => setTimeout(resolve, ms)); -async function nowDeploy(bodies, randomness, uploadNowJson) { +async function nowDeploy(projectName, bodies, randomness, uploadNowJson) { const files = Object.keys(bodies) .filter(n => uploadNowJson @@ -29,9 +29,11 @@ async function nowDeploy(bodies, randomness, uploadNowJson) { (path.extname(n) === '.sh' ? 0o100755 : 0o100644), })); - const { FORCE_BUILD_IN_REGION, NOW_DEBUG, VERCEL_DEBUG, VERCEL_CLI_VERSION } = + const { FORCE_BUILD_IN_REGION, VERCEL_DEBUG, VERCEL_CLI_VERSION } = process.env; - const nowJson = JSON.parse(bodies['vercel.json'] || bodies['now.json']); + const nowJson = JSON.parse( + bodies['vercel.json'] || bodies['now.json'] || '{}' + ); delete nowJson.probes; @@ -44,13 +46,12 @@ async function nowDeploy(bodies, randomness, uploadNowJson) { ...(nowJson.build || {}).env, RANDOMNESS_BUILD_ENV_VAR: randomness, FORCE_BUILD_IN_REGION, - NOW_DEBUG, VERCEL_DEBUG, VERCEL_CLI_VERSION, NEXT_TELEMETRY_DISABLED: '1', }, }, - name: 'test2020', + name: projectName, files, meta: {}, ...nowJson, diff --git a/test/lib/deployment/test-deployment.js b/test/lib/deployment/test-deployment.js index e6ccb4a62..1833e87e5 100644 --- a/test/lib/deployment/test-deployment.js +++ b/test/lib/deployment/test-deployment.js @@ -264,8 +264,12 @@ async function runProbe(probe, deploymentId, deploymentUrl, ctx) { assert(hadTest, 'probe must have a test condition'); } -async function testDeployment(fixturePath, buildDelegate) { - logWithinTest('testDeployment', fixturePath); +async function testDeployment(fixturePath) { + const projectName = path + .basename(fixturePath) + .toLowerCase() + .replace(/(_|\.)/g, '-'); + logWithinTest(`testDeployment "${projectName}"`); const globResult = await glob(`${fixturePath}/**`, { nodir: true, dot: true, @@ -300,7 +304,7 @@ async function testDeployment(fixturePath, buildDelegate) { const configName = 'vercel.json' in bodies ? 'vercel.json' : 'now.json'; // we use json5 to allow comments for probes - const nowJson = json5.parse(bodies[configName]); + const nowJson = json5.parse(bodies[configName] || '{}'); const uploadNowJson = nowJson.uploadNowJson; delete nowJson.uploadNowJson; @@ -316,23 +320,36 @@ async function testDeployment(fixturePath, buildDelegate) { } }); - for (const build of nowJson.builds || []) { - if (buildDelegate) { - buildDelegate(build); - } + const probePath = path.resolve(fixturePath, 'probe.js'); + let probes = []; + if ('probes' in nowJson) { + probes = nowJson.probes; + } else if ('probes.json' in bodies) { + probes = json5.parse(bodies['probes.json']).probes; + } else if (fs.existsSync(probePath)) { + // we'll run probes after we have the deployment url below + } else { + console.warn( + `WARNING: Test fixture "${fixturePath}" does not contain probes.json, probe.js, or vercel.json` + ); } - bodies[configName] = Buffer.from(JSON.stringify(nowJson)); delete bodies['probe.js']; + delete bodies['probes.json']; const { deploymentId, deploymentUrl } = await nowDeploy( + projectName, bodies, randomness, uploadNowJson ); const probeCtx = {}; - for (const probe of nowJson.probes || []) { + if (fs.existsSync(probePath)) { + await require(probePath)({ deploymentUrl, fetch, randomness }); + } + + for (const probe of probes) { const stringifiedProbe = JSON.stringify(probe); logWithinTest('testing', stringifiedProbe); @@ -363,11 +380,6 @@ async function testDeployment(fixturePath, buildDelegate) { } } - const probeJsFullPath = path.resolve(fixturePath, 'probe.js'); - if (fs.existsSync(probeJsFullPath)) { - await require(probeJsFullPath)({ deploymentUrl, fetch, randomness }); - } - return { deploymentId, deploymentUrl }; } @@ -377,7 +389,7 @@ async function nowDeployIndexTgz(file) { 'now.json': Buffer.from(JSON.stringify({ version: 2 })), }; - return (await nowDeploy(bodies)).deploymentUrl; + return (await nowDeploy('pack-n-deploy', bodies)).deploymentUrl; } async function fetchDeploymentUrl(url, opts) {