create-payload-app 0.5.0 → 0.5.2

package/dist/lib/configure-payload-config.js

@@ -56,7 +56,7 @@ var packages_1 = require("./packages");
 /** Update payload config with necessary imports and adapters */
 function configurePayloadConfig(args) {
     return __awaiter(this, void 0, void 0, function () {
-        var packageJsonPath, packageObj, dbPackage, bundlerPackage, editorPackage, err_1, possiblePaths, payloadConfigPath_1, configContent, configLines_1, dbReplacement_1, bundlerReplacement_1, editorReplacement_1, dbConfigStartLineIndex_1, dbConfigEndLineIndex_1;
+        var packageJsonPath, packageObj_1, dbPackage_1, bundlerPackage, editorPackage, err_1, possiblePaths, payloadConfigPath_1, configContent, configLines_1, dbReplacement_1, bundlerReplacement_1, editorReplacement_1, dbConfigStartLineIndex_1, dbConfigEndLineIndex_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -69,15 +69,21 @@ function configurePayloadConfig(args) {
                     _a.trys.push([1, 4, , 5]);
                     return [4 /*yield*/, fs_extra_1.default.readJson(packageJsonPath)];
                 case 2:
-                    packageObj = _a.sent();
-                    packageObj.dependencies['payload'] = 'latest';
-                    dbPackage = packages_1.dbPackages[args.dbDetails.type];
+                    packageObj_1 = _a.sent();
+                    packageObj_1.dependencies['payload'] = '^2.0.0';
+                    dbPackage_1 = packages_1.dbPackages[args.dbDetails.type];
                     bundlerPackage = packages_1.bundlerPackages['webpack'];
                     editorPackage = packages_1.editorPackages['slate'];
-                    packageObj.dependencies[dbPackage.packageName] = 'latest';
-                    packageObj.dependencies[bundlerPackage.packageName] = 'latest';
-                    packageObj.dependencies[editorPackage.packageName] = 'latest';
-                    return [4 /*yield*/, fs_extra_1.default.writeJson(packageJsonPath, packageObj, { spaces: 2 })];
+                    // Delete all other db adapters
+                    Object.values(packages_1.dbPackages).forEach(function (p) {
+                        if (p.packageName !== dbPackage_1.packageName) {
+                            delete packageObj_1.dependencies[p.packageName];
+                        }
+                    });
+                    packageObj_1.dependencies[dbPackage_1.packageName] = dbPackage_1.version;
+                    packageObj_1.dependencies[bundlerPackage.packageName] = bundlerPackage.version;
+                    packageObj_1.dependencies[editorPackage.packageName] = editorPackage.version;
+                    return [4 /*yield*/, fs_extra_1.default.writeJson(packageJsonPath, packageObj_1, { spaces: 2 })];
                 case 3:
                     _a.sent();
                     return [3 /*break*/, 5];

package/dist/lib/{create-project.test.js → create-project.spec.js}

@@ -129,7 +129,7 @@ describe('createProject', function () {
                 ['mongodb', 'webpack'],
                 ['postgres', 'webpack'],
             ])('update config and deps: %s, %s', function (db, bundler) { return __awaiter(void 0, void 0, void 0, function () {
-                var projectName, template, dbReplacement, bundlerReplacement, packageJsonPath, packageJson, payloadConfigPath, content;
+                var projectName, template, dbReplacement, bundlerReplacement, editorReplacement, packageJsonPath, packageJson, payloadConfigPath, content;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -155,11 +155,18 @@ describe('createProject', function () {
                             _a.sent();
                             dbReplacement = packages_1.dbPackages[db];
                             bundlerReplacement = packages_1.bundlerPackages[bundler];
+                            editorReplacement = packages_1.editorPackages['slate'];
                             packageJsonPath = path_1.default.resolve(projectDir, 'package.json');
                             packageJson = fs_extra_1.default.readJsonSync(packageJsonPath);
                             // Check deps
-                            expect(packageJson.dependencies[dbReplacement.packageName]).toBeDefined();
-                            expect(packageJson.dependencies[bundlerReplacement.packageName]).toBeDefined();
+                            expect(packageJson.dependencies['payload']).toEqual('^2.0.0');
+                            expect(packageJson.dependencies[dbReplacement.packageName]).toEqual(dbReplacement.version);
+                            // Should only have one db adapter
+                            expect(Object.keys(packageJson.dependencies).filter(function (n) {
+                                return n.startsWith('@payloadcms/db-');
+                            })).toHaveLength(1);
+                            expect(packageJson.dependencies[bundlerReplacement.packageName]).toEqual(bundlerReplacement.version);
+                            expect(packageJson.dependencies[editorReplacement.packageName]).toEqual(editorReplacement.version);
                             payloadConfigPath = path_1.default.resolve(projectDir, 'src/payload.config.ts');
                             content = fs_extra_1.default.readFileSync(payloadConfigPath, 'utf-8');
                             // Check payload.config.ts
@@ -178,4 +185,8 @@ describe('createProject', function () {
             }); });
         });
     });
+    describe('Templates', function () {
+        it.todo('Verify that all templates are valid');
+        // Loop through all templates.ts that should have replacement comments, and verify that they are present
+    });
 });

package/dist/lib/packages.js

@@ -10,6 +10,7 @@ var mongodbReplacement = {
         '    url: process.env.DATABASE_URI,',
         '  }),',
     ],
+    version: '^1.0.0',
 };
 var postgresReplacement = {
     packageName: '@payloadcms/db-postgres',
@@ -21,6 +22,7 @@ var postgresReplacement = {
         '    },',
         '  }),',
     ],
+    version: '^0.x', // up to, not including 1.0.0
 };
 exports.dbPackages = {
     mongodb: mongodbReplacement,
@@ -31,11 +33,13 @@ var webpackReplacement = {
     importReplacement: "import { webpackBundler } from '@payloadcms/bundler-webpack'",
     // Replacement of line containing `// bundler-config`
     configReplacement: '    bundler: webpackBundler(),',
+    version: '^1.0.0',
 };
 var viteReplacement = {
     packageName: '@payloadcms/bundler-vite',
     importReplacement: "import { viteBundler } from '@payloadcms/bundler-vite'",
     configReplacement: '  bundler: viteBundler(),',
+    version: '^0.x', // up to, not including 1.0.0
 };
 exports.bundlerPackages = {
     webpack: webpackReplacement,
@@ -46,10 +50,12 @@ exports.editorPackages = {
         packageName: '@payloadcms/richtext-slate',
         importReplacement: "import { slateEditor } from '@payloadcms/richtext-slate'",
         configReplacement: '  editor: slateEditor({}),',
+        version: '^1.0.0',
     },
     lexical: {
         packageName: '@payloadcms/richtext-lexical',
         importReplacement: "import { lexicalEditor } from '@payloadcms/richtext-lexical'",
         configReplacement: '  editor: lexicalEditor({}),',
+        version: '^0.x', // up to, not including 1.0.0
     },
 };

package/package.json

@@ -37,7 +37,7 @@
     "prompts": "^2.4.2",
     "terminal-link": "^2.1.1"
   },
-  "version": "0.5.0",
+  "version": "0.5.2",
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
     "@types/degit": "^2.8.3",