Publish Canary

- @vercel/build-utils@2.12.3-canary.19 - vercel@23.1.3-canary.35 - @vercel/client@10.2.3-canary.20 - @vercel/frameworks@0.5.1-canary.12 - vercel-plugin-go@1.0.0-canary.4 - vercel-plugin-node@1.12.2-canary.10 - vercel-plugin-python@1.0.0-canary.4 - vercel-plugin-ruby@1.0.0-canary.3
[frameworks] Fix Parcel default output directory to dist (#7029 )
2025-12-12 12:57:47 +00:00 · 2021-11-20 10:20:05 -05:00 · 2021-11-20 01:44:22 +00:00 · 2021-11-19 19:07:52 -05:00 · 2021-11-19 17:26:32 -05:00
15 changed files with 122 additions and 168 deletions
--- a/api/frameworks.ts
+++ b/api/frameworks.ts
@@ -14,8 +14,6 @@ const frameworks = (_frameworks as Framework[])
      sort: undefined,
      dependency: undefined,
      defaultRoutes: undefined,
-      devCommand: undefined,
-      buildCommand: undefined,
    };

    if (framework.logo) {
--- a/packages/build-utils/package.json
+++ b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/build-utils",
-  "version": "2.12.3-canary.18",
+  "version": "2.12.3-canary.19",
  "license": "MIT",
  "main": "./dist/index.js",
  "types": "./dist/index.d.js",
@@ -30,7 +30,7 @@
    "@types/node-fetch": "^2.1.6",
    "@types/semver": "6.0.0",
    "@types/yazl": "^2.4.1",
-    "@vercel/frameworks": "0.5.1-canary.11",
+    "@vercel/frameworks": "0.5.1-canary.12",
    "@vercel/ncc": "0.24.0",
    "aggregate-error": "3.0.1",
    "async-retry": "1.2.3",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel",
-  "version": "23.1.3-canary.34",
+  "version": "23.1.3-canary.35",
  "preferGlobal": true,
  "license": "Apache-2.0",
  "description": "The command-line interface for Vercel",
@@ -43,14 +43,14 @@
    "node": ">= 12"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.18",
+    "@vercel/build-utils": "2.12.3-canary.19",
    "@vercel/go": "1.2.4-canary.4",
    "@vercel/node": "1.12.2-canary.6",
    "@vercel/python": "2.0.6-canary.6",
    "@vercel/ruby": "1.2.8-canary.4",
    "update-notifier": "4.1.0",
    "vercel-plugin-middleware": "0.0.0-canary.7",
-    "vercel-plugin-node": "1.12.2-canary.9"
+    "vercel-plugin-node": "1.12.2-canary.10"
  },
  "devDependencies": {
    "@next/env": "11.1.2",
@@ -90,7 +90,7 @@
    "@types/update-notifier": "5.1.0",
    "@types/which": "1.3.2",
    "@types/write-json-file": "2.2.1",
-    "@vercel/frameworks": "0.5.1-canary.11",
+    "@vercel/frameworks": "0.5.1-canary.12",
    "@vercel/ncc": "0.24.0",
    "@vercel/nft": "0.17.0",
    "@zeit/fun": "0.11.2",
--- a/packages/cli/src/commands/build.ts
+++ b/packages/cli/src/commands/build.ts
@@ -30,10 +30,7 @@ import { getCommandName, getPkgName } from '../util/pkg-name';
 import { loadCliPlugins } from '../util/plugins';
 import { findFramework } from '../util/projects/find-framework';
 import { VERCEL_DIR } from '../util/projects/link';
-import {
-  ProjectLinkAndSettings,
-  readProjectSettings,
-} from '../util/projects/project-settings';
+import { readProjectSettings } from '../util/projects/project-settings';
 import pull from './pull';

 const sema = new Sema(16, {
@@ -68,15 +65,6 @@ const help = () => {

 const OUTPUT_DIR = '.output';

-const fields: {
-  name: string;
-  value: keyof ProjectLinkAndSettings['settings'];
-}[] = [
-  { name: 'Build Command', value: 'buildCommand' },
-  { name: 'Output Directory', value: 'outputDirectory' },
-  { name: 'Root Directory', value: 'rootDirectory' },
-];
-
 export default async function main(client: Client) {
  if (process.env.__VERCEL_BUILD_RUNNING) {
    client.output.error(
@@ -168,37 +156,47 @@ export default async function main(client: Client) {
  }

  const buildState = { ...project.settings };
-
+  const formatSetting = (
+    name: string,
+    override: string | null | undefined,
+    defaults: typeof framework.settings.outputDirectory
+  ) =>
+    `  - ${chalk.bold(`${name}:`)} ${`${
+      override
+        ? override + ` (override)`
+        : 'placeholder' in defaults
+        ? chalk.italic(`${defaults.placeholder}`)
+        : defaults.value
+    }`}`;
  console.log(`Retrieved Project Settings:`);
  console.log(
    chalk.dim(`  - ${chalk.bold(`Framework Preset:`)} ${framework.name}`)
  );
-
-  for (let field of fields) {
-    const defaults = (framework.settings as any)[field.value];
-    if (defaults) {
  console.log(
    chalk.dim(
-          `  - ${chalk.bold(`${field.name}:`)} ${`${
-            project.settings[field.value]
-              ? project.settings[field.value] + ` (override)`
-              : isSettingValue(defaults)
-              ? defaults.value
-              : chalk.italic(`${defaults.placeholder}`)
-          }`}`
+      formatSetting(
+        'Build Command',
+        project.settings.buildCommand,
+        framework.settings.buildCommand
+      )
    )
  );
-    }
-    if (field.value != 'buildCommand') {
-      (buildState as any)[field.value] = project.settings[field.value]
-        ? project.settings[field.value]
-        : defaults
-        ? isSettingValue(defaults)
-          ? defaults.value
-          : null
-        : null;
-    }
-  }
+  console.log(
+    chalk.dim(
+      formatSetting(
+        'Output Directory',
+        project.settings.outputDirectory,
+        framework.settings.outputDirectory
+      )
+    )
+  );
+
+  buildState.outputDirectory =
+    project.settings.outputDirectory ||
+    (isSettingValue(framework.settings.outputDirectory)
+      ? framework.settings.outputDirectory.value
+      : null);
+  buildState.rootDirectory = project.settings.rootDirectory;

  if (loadedEnvFiles.length > 0) {
    console.log(
@@ -285,17 +283,19 @@ export default async function main(client: Client) {
  // Clean the output directory
  fs.removeSync(join(cwd, OUTPUT_DIR));

+  // Yarn v2 PnP mode may be activated, so force
+  // "node-modules" linker style
+  const env = {
+    YARN_NODE_LINKER: 'node-modules',
+    ...spawnOpts.env,
+  };
+
  if (typeof buildState.buildCommand === 'string') {
    console.log(`Running Build Command: ${cmd(buildState.buildCommand)}`);
    await execCommand(buildState.buildCommand, {
      ...spawnOpts,
-      // Yarn v2 PnP mode may be activated, so force
-      // "node-modules" linker style
-      env: {
-        YARN_NODE_LINKER: 'node-modules',
-        ...spawnOpts.env,
-      },
-      cwd: cwd,
+      env,
+      cwd,
    });
  } else if (fs.existsSync(join(cwd, 'package.json'))) {
    await runPackageJsonScript(
@@ -304,6 +304,15 @@ export default async function main(client: Client) {
      ['vercel-build', 'now-build', 'build'],
      spawnOpts
    );
+  } else if (typeof framework.settings.buildCommand.value === 'string') {
+    console.log(
+      `Running Build Command: ${cmd(framework.settings.buildCommand.value)}`
+    );
+    await execCommand(framework.settings.buildCommand.value, {
+      ...spawnOpts,
+      env,
+      cwd,
+    });
  }

  if (!fs.existsSync(join(cwd, OUTPUT_DIR))) {
--- a/packages/cli/src/commands/dev/dev.ts
+++ b/packages/cli/src/commands/dev/dev.ts
@@ -6,7 +6,6 @@ import { ProjectEnvVariable } from '../../types';
 import Client from '../../util/client';
 import { getLinkedProject } from '../../util/projects/link';
 import { getFrameworks } from '../../util/get-frameworks';
-import { isSettingValue } from '../../util/is-setting-value';
 import { ProjectSettings } from '../../types';
 import getDecryptedEnvRecords from '../../util/get-decrypted-env-records';
 import setupAndLink from '../../util/link/setup-and-link';
@@ -71,9 +70,9 @@ export default async function dev(
          frameworkSlug = framework.slug;
        }

-        const defaults = framework.settings.devCommand;
-        if (isSettingValue(defaults)) {
-          devCommand = defaults.value;
+        const defaults = framework.settings.devCommand.value;
+        if (defaults) {
+          devCommand = defaults;
        }
      }
    }
--- a/packages/cli/test/integration.js
+++ b/packages/cli/test/integration.js
@@ -2683,7 +2683,7 @@ test('deploy a Lambda with 3 seconds of maxDuration', async t => {
  const url = new URL(output.stdout);

  // Should time out
-  url.pathname = '/api/wait-for/4';
+  url.pathname = '/api/wait-for/5';
  const response1 = await fetch(url.href);
  t.is(
    response1.status,
@@ -2692,7 +2692,7 @@ test('deploy a Lambda with 3 seconds of maxDuration', async t => {
  );

  // Should not time out
-  url.pathname = '/api/wait-for/2';
+  url.pathname = '/api/wait-for/1';
  const response2 = await fetch(url.href);
  t.is(
    response2.status,
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/client",
-  "version": "10.2.3-canary.19",
+  "version": "10.2.3-canary.20",
  "main": "dist/index.js",
  "typings": "dist/index.d.ts",
  "homepage": "https://vercel.com",
@@ -40,7 +40,7 @@
    ]
  },
  "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.18",
+    "@vercel/build-utils": "2.12.3-canary.19",
    "@zeit/fetch": "5.2.0",
    "async-retry": "1.2.3",
    "async-sema": "3.0.0",
--- a/packages/frameworks/package.json
+++ b/packages/frameworks/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@vercel/frameworks",
-  "version": "0.5.1-canary.11",
+  "version": "0.5.1-canary.12",
  "main": "./dist/frameworks.js",
  "types": "./dist/frameworks.d.ts",
  "files": [
--- a/packages/frameworks/src/frameworks.ts
+++ b/packages/frameworks/src/frameworks.ts
@@ -43,6 +43,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `blitz build`',
+        value: 'blitz build',
      },
      devCommand: {
        value: 'blitz start',
@@ -51,8 +52,6 @@ export const frameworks = [
        placeholder: 'Next.js default',
      },
    },
-    devCommand: 'blitz start',
-    buildCommand: 'blitz build',
    getFsOutputDir: async () => '.next',
    getOutputDirName: async () => 'public',
  },
@@ -83,6 +82,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `next build`',
+        value: 'next build',
      },
      devCommand: {
        value: 'next dev --port $PORT',
@@ -98,8 +98,6 @@ export const frameworks = [
        dependencies: ['next-plugin-sentry', 'next-sentry-source-maps'],
      },
    ],
-    devCommand: 'next dev --port $PORT',
-    buildCommand: 'next build',
    getFsOutputDir: async () => '.next',
    getOutputDirName: async () => 'public',
    cachePattern: '.next/cache/**',
@@ -131,6 +129,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `gatsby build`',
+        value: 'gatsby build',
      },
      devCommand: {
        value: 'gatsby develop --port $PORT',
@@ -141,8 +140,6 @@ export const frameworks = [
      },
    },
    dependency: 'gatsby',
-    devCommand: 'gatsby develop --port $PORT',
-    buildCommand: 'gatsby build',
    getOutputDirName: async () => 'public',
    getFsOutputDir: async () => 'public',
    defaultRoutes: async (dirPrefix: string) => {
@@ -219,6 +216,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `hexo generate`',
+        value: 'hexo generate',
      },
      devCommand: {
        value: 'hexo server --port $PORT',
@@ -229,8 +227,6 @@ export const frameworks = [
      },
    },
    dependency: 'hexo',
-    devCommand: 'hexo server --port $PORT',
-    buildCommand: 'hexo generate',
    getFsOutputDir: async () => 'public',
    getOutputDirName: async () => 'public',
  },
@@ -259,6 +255,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `npx @11ty/eleventy`',
+        value: 'npx @11ty/eleventy',
      },
      devCommand: {
        value: 'npx @11ty/eleventy --serve --watch --port $PORT',
@@ -269,8 +266,6 @@ export const frameworks = [
      },
    },
    dependency: '@11ty/eleventy',
-    devCommand: 'npx @11ty/eleventy --serve --watch --port $PORT',
-    buildCommand: 'npx @11ty/eleventy',
    getFsOutputDir: async () => '_site',
    getOutputDirName: async () => '_site',
    cachePattern: '.cache/**',
@@ -300,6 +295,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `docusaurus build`',
+        value: 'docusaurus build',
      },
      devCommand: {
        value: 'docusaurus start --port $PORT',
@@ -310,8 +306,6 @@ export const frameworks = [
      },
    },
    dependency: '@docusaurus/core',
-    devCommand: 'docusaurus start --port $PORT',
-    buildCommand: 'docusaurus build',
    getFsOutputDir: async (dirPrefix: string) => {
      const base = 'build';
      try {
@@ -456,6 +450,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `docusaurus-build`',
+        value: 'docusaurus-build',
      },
      devCommand: {
        value: 'docusaurus-start --port $PORT',
@@ -466,8 +461,6 @@ export const frameworks = [
      },
    },
    dependency: 'docusaurus',
-    devCommand: 'docusaurus-start --port $PORT',
-    buildCommand: 'docusaurus-build',
    getFsOutputDir: async (dirPrefix: string) => {
      const base = 'build';
      try {
@@ -523,6 +516,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `preact build`',
+        value: 'preact build',
      },
      devCommand: {
        value: 'preact watch --port $PORT',
@@ -533,8 +527,6 @@ export const frameworks = [
      },
    },
    dependency: 'preact-cli',
-    devCommand: 'preact watch --port $PORT',
-    buildCommand: 'preact build',
    getFsOutputDir: async () => 'build',
    getOutputDirName: async () => 'build',
    defaultRoutes: [
@@ -581,6 +573,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `dojo build`',
+        value: 'dojo build',
      },
      devCommand: {
        value: 'dojo build -m dev -w -s -p $PORT',
@@ -591,8 +584,6 @@ export const frameworks = [
      },
    },
    dependency: '@dojo/cli',
-    devCommand: 'dojo build -m dev -w -s -p $PORT',
-    buildCommand: 'dojo build',
    getFsOutputDir: async () => 'output/dist',
    getOutputDirName: async () => join('output', 'dist'),
    defaultRoutes: [
@@ -649,6 +640,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `ember build`',
+        value: 'ember build',
      },
      devCommand: {
        value: 'ember serve --port $PORT',
@@ -659,8 +651,6 @@ export const frameworks = [
      },
    },
    dependency: 'ember-cli',
-    devCommand: 'ember serve --port $PORT',
-    buildCommand: 'ember build',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async () => 'dist',
    defaultRoutes: [
@@ -705,6 +695,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `vue-cli-service build`',
+        value: 'vue-cli-service build',
      },
      devCommand: {
        value: 'vue-cli-service serve --port $PORT',
@@ -715,8 +706,6 @@ export const frameworks = [
      },
    },
    dependency: '@vue/cli-service',
-    devCommand: 'vue-cli-service serve --port $PORT',
-    buildCommand: 'vue-cli-service build',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async () => 'dist',
    defaultRoutes: [
@@ -783,6 +772,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `ng build && scully`',
+        value: 'ng build && scully',
      },
      devCommand: {
        value: 'ng serve --port $PORT',
@@ -793,8 +783,6 @@ export const frameworks = [
      },
    },
    dependency: '@scullyio/init',
-    devCommand: 'ng serve --port $PORT',
-    buildCommand: 'ng build && scully',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async () => 'dist/static',
  },
@@ -822,6 +810,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `ng build`',
+        value: 'ng build',
      },
      devCommand: {
        value: 'ng serve --port $PORT',
@@ -831,8 +820,6 @@ export const frameworks = [
      },
    },
    dependency: '@ionic/angular',
-    devCommand: 'ng serve --port $PORT',
-    buildCommand: 'ng build',
    getFsOutputDir: async () => 'www',
    getOutputDirName: async () => 'www',
    defaultRoutes: [
@@ -876,6 +863,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `ng build`',
+        value: 'ng build',
      },
      devCommand: {
        value: 'ng serve --port $PORT',
@@ -886,8 +874,6 @@ export const frameworks = [
      },
    },
    dependency: '@angular/cli',
-    devCommand: 'ng serve --port $PORT',
-    buildCommand: 'ng build',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async (dirPrefix: string) => {
      const base = 'dist';
@@ -945,6 +931,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `polymer build`',
+        value: 'polymer build',
      },
      devCommand: {
        value: 'polymer serve --port $PORT',
@@ -955,8 +942,6 @@ export const frameworks = [
      },
    },
    dependency: 'polymer-cli',
-    devCommand: 'polymer serve --port $PORT',
-    buildCommand: 'polymer build',
    getFsOutputDir: async () => 'build',
    getOutputDirName: async (dirPrefix: string) => {
      const base = 'build';
@@ -1016,6 +1001,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `rollup -c`',
+        value: 'rollup -c',
      },
      devCommand: {
        value: 'rollup -c -w',
@@ -1025,8 +1011,6 @@ export const frameworks = [
      },
    },
    dependency: 'sirv-cli',
-    devCommand: 'rollup -c -w',
-    buildCommand: 'rollup -c',
    getFsOutputDir: async () => 'public',
    getOutputDirName: async () => 'public',
    defaultRoutes: [
@@ -1070,6 +1054,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `svelte-kit build`',
+        value: 'svelte-kit build',
      },
      devCommand: {
        value: 'svelte-kit dev --port $PORT',
@@ -1079,8 +1064,6 @@ export const frameworks = [
        placeholder: 'public',
      },
    },
-    devCommand: 'svelte-kit dev --port $PORT',
-    buildCommand: 'svelte-kit build',
    getFsOutputDir: async () => '.output',
    getOutputDirName: async () => 'public',
  },
@@ -1108,6 +1091,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `react-scripts build`',
+        value: 'react-scripts build',
      },
      devCommand: {
        value: 'react-scripts start',
@@ -1117,8 +1101,6 @@ export const frameworks = [
      },
    },
    dependency: '@ionic/react',
-    devCommand: 'react-scripts start',
-    buildCommand: 'react-scripts build',
    getFsOutputDir: async () => 'build',
    getOutputDirName: async () => 'build',
    defaultRoutes: [
@@ -1216,6 +1198,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `react-scripts build`',
+        value: 'react-scripts build',
      },
      devCommand: {
        value: 'react-scripts start',
@@ -1225,8 +1208,6 @@ export const frameworks = [
      },
    },
    dependency: 'react-scripts',
-    devCommand: 'react-scripts start',
-    buildCommand: 'react-scripts build',
    getFsOutputDir: async () => 'build',
    getOutputDirName: async () => 'build',
    defaultRoutes: [
@@ -1318,6 +1299,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `gridsome build`',
+        value: 'gridsome build',
      },
      devCommand: {
        value: 'gridsome develop -p $PORT',
@@ -1328,8 +1310,6 @@ export const frameworks = [
      },
    },
    dependency: 'gridsome',
-    devCommand: 'gridsome develop -p $PORT',
-    buildCommand: 'gridsome build',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async () => 'dist',
  },
@@ -1357,6 +1337,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `umi build`',
+        value: 'umi build',
      },
      devCommand: {
        value: 'umi dev --port $PORT',
@@ -1367,8 +1348,6 @@ export const frameworks = [
      },
    },
    dependency: 'umi',
-    devCommand: 'umi dev --port $PORT',
-    buildCommand: 'umi build',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async () => 'dist',
    defaultRoutes: [
@@ -1412,6 +1391,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `sapper export`',
+        value: 'sapper export',
      },
      devCommand: {
        value: 'sapper dev --port $PORT',
@@ -1422,8 +1402,6 @@ export const frameworks = [
      },
    },
    dependency: 'sapper',
-    devCommand: 'sapper dev --port $PORT',
-    buildCommand: 'sapper export',
    getFsOutputDir: async () => '__sapper__/export',
    getOutputDirName: async () => '__sapper__/export',
  },
@@ -1451,6 +1429,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `saber build`',
+        value: 'saber build',
      },
      devCommand: {
        value: 'saber --port $PORT',
@@ -1461,8 +1440,6 @@ export const frameworks = [
      },
    },
    dependency: 'saber',
-    devCommand: 'saber --port $PORT',
-    buildCommand: 'saber build',
    getFsOutputDir: async () => 'public',
    getOutputDirName: async () => 'public',
    defaultRoutes: [
@@ -1521,6 +1498,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `stencil build`',
+        value: 'stencil build',
      },
      devCommand: {
        value: 'stencil build --dev --watch --serve --port $PORT',
@@ -1531,8 +1509,6 @@ export const frameworks = [
      },
    },
    dependency: '@stencil/core',
-    devCommand: 'stencil build --dev --watch --serve --port $PORT',
-    buildCommand: 'stencil build',
    getFsOutputDir: async () => 'www',
    getOutputDirName: async () => 'www',
    defaultRoutes: [
@@ -1611,6 +1587,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `nuxt generate`',
+        value: 'nuxt generate',
      },
      devCommand: {
        value: 'nuxt',
@@ -1620,8 +1597,6 @@ export const frameworks = [
      },
    },
    dependency: 'nuxt',
-    devCommand: 'nuxt',
-    buildCommand: 'nuxt generate',
    getFsOutputDir: async () => '.output',
    getOutputDirName: async () => 'dist',
    cachePattern: '.nuxt/**',
@@ -1680,8 +1655,6 @@ export const frameworks = [
        placeholder: 'RedwoodJS default',
      },
    },
-    devCommand: 'yarn rw dev --fwd="--port=$PORT --open=false',
-    buildCommand: 'yarn rw deploy vercel',
    getFsOutputDir: async () => 'public',
    getOutputDirName: async () => 'public',
  },
@@ -1717,6 +1690,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `hugo -D --gc`',
+        value: 'hugo -D --gc',
      },
      devCommand: {
        value: 'hugo server -D -w -p $PORT',
@@ -1726,8 +1700,6 @@ export const frameworks = [
        placeholder: '`public` or `publishDir` from the `config` file',
      },
    },
-    devCommand: 'hugo server -D -w -p $PORT',
-    buildCommand: 'hugo -D --gc',
    getFsOutputDir: async (dirPrefix: string): Promise<string> => {
      type HugoConfig = { publishDir?: string };
      const config = await readConfigFile<HugoConfig>(
@@ -1772,6 +1744,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `jekyll build`',
+        value: 'jekyll build',
      },
      devCommand: {
        value: 'bundle exec jekyll serve --watch --port $PORT',
@@ -1781,8 +1754,6 @@ export const frameworks = [
        placeholder: '`_site` or `destination` from `_config.yml`',
      },
    },
-    devCommand: 'bundle exec jekyll serve --watch --port $PORT',
-    buildCommand: 'jekyll build',
    getFsOutputDir: async (dirPrefix: string): Promise<string> => {
      type JekyllConfig = { destination?: string };
      const config = await readConfigFile<JekyllConfig>(
@@ -1821,6 +1792,7 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `brunch build --production`',
+        value: 'brunch build --production',
      },
      devCommand: {
        value: 'brunch watch --server --port $PORT',
@@ -1830,8 +1802,6 @@ export const frameworks = [
        value: 'public',
      },
    },
-    devCommand: 'brunch watch --server --port $PORT',
-    buildCommand: 'brunch build --production',
    getFsOutputDir: async () => 'public',
    getOutputDirName: async () => 'public',
  },
@@ -1856,18 +1826,17 @@ export const frameworks = [
        value: 'bundle install',
      },
      buildCommand: {
-        value: '`npm run build` or `bundle exec middleman build`',
+        placeholder: '`npm run build` or `bundle exec middleman build`',
+        value: 'bundle exec middleman build',
      },
      devCommand: {
-        value: 'bundle exec middleman server -p $PORT',
        placeholder: 'bundle exec middleman server',
+        value: 'bundle exec middleman server -p $PORT',
      },
      outputDirectory: {
        value: 'build',
      },
    },
-    devCommand: 'bundle exec middleman server -p $PORT',
-    buildCommand: 'bundle exec middleman build',
    getFsOutputDir: async () => 'build',
    getOutputDirName: async () => 'build',
    cachePattern: '{vendor/bin,vendor/cache,vendor/bundle}/**',
@@ -1896,15 +1865,13 @@ export const frameworks = [
        value: 'zola build',
      },
      devCommand: {
-        value: 'zola serve --port $PORT',
        placeholder: 'zola serve',
+        value: 'zola serve --port $PORT',
      },
      outputDirectory: {
        value: 'public',
      },
    },
-    devCommand: 'zola serve --port $PORT',
-    buildCommand: 'zola build',
    getFsOutputDir: async () => 'public',
    getOutputDirName: async () => 'public',
    defaultVersion: '0.13.0',
@@ -1934,17 +1901,17 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `vite build`',
+        value: 'vite build',
      },
      devCommand: {
        placeholder: 'vite',
+        value: 'vite',
      },
      outputDirectory: {
        value: 'dist',
      },
    },
    dependency: 'vite',
-    devCommand: 'vite',
-    buildCommand: 'vite build',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async () => 'dist',
  },
@@ -1972,17 +1939,17 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run build` or `parcel build`',
+        value: 'parcel build',
      },
      devCommand: {
        placeholder: 'parcel',
+        value: 'parcel',
      },
      outputDirectory: {
-        placeholder: 'dist',
+        value: 'dist',
      },
    },
    dependency: 'parcel',
-    devCommand: 'parcel',
-    buildCommand: 'parcel build',
    getFsOutputDir: async () => 'dist',
    getOutputDirName: async () => 'dist',
    defaultRoutes: [
@@ -2016,16 +1983,16 @@ export const frameworks = [
      },
      buildCommand: {
        placeholder: '`npm run vercel-build` or `npm run build`',
+        value: null,
      },
      devCommand: {
        placeholder: 'None',
+        value: null,
      },
      outputDirectory: {
        placeholder: '`public` if it exists, or `.`',
      },
    },
-    devCommand: null,
-    buildCommand: null,
    getFsOutputDir: async (dirPrefix: string): Promise<string> => {
      // Public if it exists or `.`
      let base = 'public';
--- a/packages/frameworks/src/types.ts
+++ b/packages/frameworks/src/types.ts
@@ -26,7 +26,7 @@ export interface SettingValue {
   * A predefined setting for the detected framework
   * @example "next dev --port $PORT"
   */
-  value: string;
+  value: string | null;
  placeholder?: string;
 }

@@ -129,11 +129,11 @@ export interface Framework {
    /**
     * Default Build Command or a placeholder
     */
-    buildCommand: Setting;
+    buildCommand: SettingValue;
    /**
     * Default Development Command or a placeholder
     */
-    devCommand: Setting;
+    devCommand: SettingValue;
    /**
     * Default Output Directory
     */
@@ -157,6 +157,7 @@ export interface Framework {
  /**
   * Name of a dependency in `package.json` to detect this framework.
   * @example "hexo"
+   * @deprecated use `detectors` instead (new frameworks should not use this prop)
   */
  dependency?: string;
  /**
@@ -201,16 +202,6 @@ export interface Framework {
   * @example ".cache/**"
   */
  cachePattern?: string;
-  /**
-   * The default build command for the framework.
-   * @example "next build"
-   */
-  buildCommand: string | null;
-  /**
-   * The default development command for the framework.
-   * @example "next dev"
-   */
-  devCommand: string | null;
  /**
   * The default version of the framework command that is available within the
   * build image. Usually an environment variable can be set to override this.
--- a/packages/frameworks/test/frameworks.unit.test.ts
+++ b/packages/frameworks/test/frameworks.unit.test.ts
@@ -34,7 +34,7 @@ const SchemaSettings = {
      additionalProperties: false,
      properties: {
        value: {
-          type: 'string',
+          type: ['string', 'null'],
        },
        placeholder: {
          type: 'string',
@@ -58,15 +58,7 @@ const Schema = {
  type: 'array',
  items: {
    type: 'object',
-    required: [
-      'name',
-      'slug',
-      'logo',
-      'description',
-      'settings',
-      'buildCommand',
-      'devCommand',
-    ],
+    required: ['name', 'slug', 'logo', 'description', 'settings'],
    properties: {
      name: { type: 'string' },
      slug: { type: ['string', 'null'] },
@@ -138,8 +130,6 @@ const Schema = {

      dependency: { type: 'string' },
      cachePattern: { type: 'string' },
-      buildCommand: { type: ['string', 'null'] },
-      devCommand: { type: ['string', 'null'] },
      defaultVersion: { type: 'string' },
    },
  },
--- a/packages/plugin-go/package.json
+++ b/packages/plugin-go/package.json
@@ -1,7 +1,7 @@
 {
  "private": false,
  "name": "vercel-plugin-go",
-  "version": "1.0.0-canary.3",
+  "version": "1.0.0-canary.4",
  "main": "dist/index.js",
  "license": "MIT",
  "files": [
@@ -17,7 +17,7 @@
    "prepublishOnly": "tsc"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.18",
+    "@vercel/build-utils": "2.12.3-canary.19",
    "@vercel/go": "1.2.4-canary.4"
  },
  "devDependencies": {
--- a/packages/plugin-node/package.json
+++ b/packages/plugin-node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vercel-plugin-node",
-  "version": "1.12.2-canary.9",
+  "version": "1.12.2-canary.10",
  "license": "MIT",
  "main": "./dist/index",
  "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -34,7 +34,7 @@
    "@types/node-fetch": "2",
    "@types/test-listen": "1.1.0",
    "@types/yazl": "2.4.2",
-    "@vercel/build-utils": "2.12.3-canary.18",
+    "@vercel/build-utils": "2.12.3-canary.19",
    "@vercel/fun": "1.0.3",
    "@vercel/ncc": "0.24.0",
    "@vercel/nft": "0.14.0",
--- a/packages/plugin-python/package.json
+++ b/packages/plugin-python/package.json
@@ -1,7 +1,7 @@
 {
  "private": false,
  "name": "vercel-plugin-python",
-  "version": "1.0.0-canary.3",
+  "version": "1.0.0-canary.4",
  "main": "dist/index.js",
  "license": "MIT",
  "files": [
@@ -17,7 +17,7 @@
    "prepublishOnly": "tsc"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.18",
+    "@vercel/build-utils": "2.12.3-canary.19",
    "@vercel/python": "2.0.6-canary.6"
  },
  "devDependencies": {
--- a/packages/plugin-ruby/package.json
+++ b/packages/plugin-ruby/package.json
@@ -1,7 +1,7 @@
 {
  "private": false,
  "name": "vercel-plugin-ruby",
-  "version": "1.0.0-canary.2",
+  "version": "1.0.0-canary.3",
  "main": "dist/index.js",
  "license": "MIT",
  "files": [
@@ -17,7 +17,7 @@
    "prepublishOnly": "tsc"
  },
  "dependencies": {
-    "@vercel/build-utils": "2.12.3-canary.18",
+    "@vercel/build-utils": "2.12.3-canary.19",
    "@vercel/ruby": "1.2.8-canary.4"
  },
  "devDependencies": {
Author	SHA1	Message	Date
Steven	32664cd13b	Publish Canary - @vercel/build-utils@2.12.3-canary.19 - vercel@23.1.3-canary.35 - @vercel/client@10.2.3-canary.20 - @vercel/frameworks@0.5.1-canary.12 - vercel-plugin-go@1.0.0-canary.4 - vercel-plugin-node@1.12.2-canary.10 - vercel-plugin-python@1.0.0-canary.4 - vercel-plugin-ruby@1.0.0-canary.3	2021-11-20 10:20:05 -05:00
Sam Ko	db468c489a	[frameworks] Fix Parcel default output directory to dist (#7029 ) ### Related Issues The Parcel template via the Project Creating Flow returns a build error because the default output directory for the Parcel Framework Preset is searching for `public` instead of `dist`. The default behavior of Parcel's CLI I believe is `dist`. ### 📋 Checklist <!-- Please keep your PR as a Draft until the checklist is complete --> #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR	2021-11-20 01:44:22 +00:00
Steven	edd9bb506c	[frameworks][cli] Consolidate buildCommand and devCommand (#7032 ) * [frameworks] Consolidate buildCommand and devCommand * Fix default build command when no override or package.json found	2021-11-19 19:07:52 -05:00
Steven	a72549a290	[tests] Make test more reliable for function timeout (#7033 )	2021-11-19 17:26:32 -05:00