@contentful/create-contentful-app 1.6.1 → 1.7.1

package/lib/constants.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXAMPLES_REPO_URL = exports.CREATE_APP_DEFINITION_GUIDE_URL = void 0;
+exports.TEMPLATES = exports.EXAMPLES_REPO_URL = exports.CREATE_APP_DEFINITION_GUIDE_URL = void 0;
 exports.CREATE_APP_DEFINITION_GUIDE_URL = 'https://ctfl.io/app-tutorial#embed-your-app-in-the-contentful-web-app';
 exports.EXAMPLES_REPO_URL = 'https://github.com/contentful/apps/tree/master/examples';
+exports.TEMPLATES = ['javascript', 'typescript', 'vue', 'vite-react', 'nextjs'];

package/lib/getTemplateSource.js

@@ -18,43 +18,50 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const chalk_1 = __importDefault(require("chalk"));
 const types_1 = require("./types");
 const logger_1 = require("./logger");
+const constants_1 = require("./constants");
+const CONTENTFUL_APPS_EXAMPLE_FOLDER = 'https://api.github.com/repos/contentful/apps/contents/examples';
 const EXAMPLES_PATH = 'contentful/apps/examples/';
 function isContentfulTemplate(url) {
     return Object.values(types_1.ContentfulExample).some((t) => url.includes(EXAMPLES_PATH + t));
 }
-const CONTENTFUL_APPS_EXAMPLE_FOLDER = "https://api.github.com/repos/contentful/apps/contents/examples";
 function getGithubFolderNames() {
     return __awaiter(this, void 0, void 0, function* () {
         const response = yield (0, node_fetch_1.default)(CONTENTFUL_APPS_EXAMPLE_FOLDER);
         const contents = yield response.json();
         return contents
-            .filter((content) => content.type === 'dir')
+            .filter((content) => content.type === 'dir' && !constants_1.TEMPLATES.includes(content.name))
             .map((content) => content.name);
     });
 }
 function promptExampleSelection() {
     return __awaiter(this, void 0, void 0, function* () {
         let template = 'typescript';
-        // ask user whether to start with a blank template or use an example template
+        // ask user whether to start with a blank template or use an example
         const { starter } = yield inquirer_1.default.prompt([
             {
                 name: 'starter',
                 message: 'Do you want to start with a blank template or use one of our examples?',
                 type: 'list',
-                choices: ['blank', 'example'],
-                default: 'blank',
+                choices: [
+                    { name: 'Template', value: 'template' },
+                    { name: 'Example', value: 'example' },
+                ],
+                default: 'template',
             },
         ]);
-        // if the user chose to use an blank template, ask which language they prefer
-        if (starter === 'blank') {
+        // if the user chose to use a template, ask which language they prefer
+        if (starter === 'template') {
             const { language } = yield inquirer_1.default.prompt([
                 {
                     name: 'language',
-                    message: 'Do you prefer TypeScript or JavaScript',
+                    message: 'Pick a template',
                     type: 'list',
                     choices: [
                         { name: 'TypeScript', value: 'typescript' },
                         { name: 'JavaScript', value: 'javascript' },
+                        { name: 'Next.js', value: 'nextjs' },
+                        { name: 'React + Vite', value: 'vite-react' },
+                        { name: 'Vue', value: 'vue' },
                     ],
                     default: 'typescript',
                 },

package/lib/index.js

@@ -130,7 +130,7 @@ function initProject(appName, options) {
             '',
             (0, logger_1.code)('  create-contentful-app my-app --source "github:user/repo"'),
             '',
-            `Official Contentful templates are hosted at ${(0, logger_1.highlight)(constants_1.EXAMPLES_REPO_URL)}.`,
+            `Official Contentful templates and examples are hosted at ${(0, logger_1.highlight)(constants_1.EXAMPLES_REPO_URL)}.`,
         ].join('\n'))
             .argument('[app-name]', 'app name')
             .option('--npm', 'use npm')

package/lib/utils.js

@@ -5,7 +5,7 @@ const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const logger_1 = require("./logger");
-const MUTUALLY_EXCLUSIVE_OPTIONS = ['source', 'example', 'javascript', 'typescript'];
+const MUTUALLY_EXCLUSIVE_OPTIONS = ['source', 'example', 'typescript', 'javascript'];
 function exec(command, args, options) {
     return new Promise((resolve, reject) => {
         const process = (0, child_process_1.spawn)(command, args, Object.assign({ stdio: 'inherit', shell: true }, options));
@@ -64,7 +64,8 @@ function normalizeOptions(options) {
         delete normalizedOptions.javascript;
     }
     if (currentMutuallyExclusiveOptions.length > 1) {
-        (0, logger_1.warn)(`Options ${(0, logger_1.highlight)('--source')}, ${(0, logger_1.highlight)('--example')}, ${(0, logger_1.highlight)('--typescript')} and ${(0, logger_1.highlight)('--javascript')} are mutually exclusive, using ${(0, logger_1.choice)(fallbackOption)}.`);
+        const paramsString = new Intl.ListFormat('en', { style: 'long', type: 'conjunction' }).format(currentMutuallyExclusiveOptions.map((option) => (0, logger_1.highlight)(`--${option}`)));
+        (0, logger_1.warn)(`Options ${paramsString} are mutually exclusive, using ${(0, logger_1.choice)(fallbackOption)}.`);
     }
     return normalizedOptions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/create-contentful-app",
-  "version": "1.6.1",
+  "version": "1.7.1",
   "description": "A template for building Contentful Apps",
   "keywords": [
     "contentful",
@@ -35,7 +35,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@contentful/app-scripts": "1.7.0",
+    "@contentful/app-scripts": "1.7.1",
     "analytics-node": "^6.2.0",
     "chalk": "4.1.2",
     "commander": "9.5.0",
@@ -68,5 +68,5 @@
     "@types/tildify": "2.0.2",
     "@types/validate-npm-package-name": "4.0.0"
   },
-  "gitHead": "a121f69fd88c3cfb3f45b08f42e0f54a33df852c"
+  "gitHead": "6bc2e2e5a1c2764debb87bfbfde1b234e667771e"
 }