MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli - new handler respects latestPackagesFolder

This commit is contained in:
Michael Shanks 2019-11-07 21:46:47 +00:00
parent b64c57bbfb
commit d14d297d25
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/cli/src/commands/new/newHandler.js
View File

@ -2,17 +2,18 @@ const { getAppContext } = require("../../common");
const { const {
getMasterApisWithFullAccess getMasterApisWithFullAccess
} = require("@budibase/server/utilities/budibaseApi"); } = require("@budibase/server/utilities/budibaseApi");
const { copy, readJSON, writeJSON, remove } = require("fs-extra"); const { copy, readJSON, writeJSON, remove, exists } = require("fs-extra");
const { resolve, join } = require("path"); const { resolve, join } = require("path");
const thisPackageJson = require("../../../package.json"); const thisPackageJson = require("../../../package.json");
const {exec} = require('child_process'); const {exec} = require('child_process');
module.exports = ({name}) => { module.exports = (opts) => {
run({name}); run(opts);
} }
const run = async (opts) => { const run = async (opts) => {
const context = await getAppContext({configName:opts.config, masterIsCreated:true}); const context = await getAppContext({configName:opts.config, masterIsCreated:true});
opts.config = context.config;
const bb = await getMasterApisWithFullAccess(context); const bb = await getMasterApisWithFullAccess(context);
const app = bb.recordApi.getNew("/applications", "application"); const app = bb.recordApi.getNew("/applications", "application");
@ -28,11 +29,14 @@ const createEmtpyAppPackage = async (opts) => {
const templateFolder = resolve( const templateFolder = resolve(
__dirname, "appPackageTemplate"); __dirname, "appPackageTemplate");
const destinationFolder = resolve(".", opts.name); const appsFolder = opts.config.latestPackagesFolder || ".";
const destinationFolder = resolve(appsFolder, opts.name);
if(await exists(destinationFolder)) return;
await copy(templateFolder, destinationFolder); await copy(templateFolder, destinationFolder);
const packageJsonPath = join(opts.name, "package.json"); const packageJsonPath = join(appsFolder, opts.name, "package.json");
const packageJson = await readJSON(packageJsonPath); const packageJson = await readJSON(packageJsonPath);
packageJson.name = opts.name; packageJson.name = opts.name;

2
packages/cli/src/common.js
View File

@ -20,6 +20,6 @@ module.exports.getAppContext = async ({configName, masterIsCreated}) => {
configName = "config.js"; configName = "config.js";
} }
const config = require(join(cwd(), configName))(); const config = require(resolve(cwd(), configName))();
return await buildAppContext(config, masterIsCreated); return await buildAppContext(config, masterIsCreated);
} }

2
packages/server/package.json
View File

@ -6,7 +6,7 @@
"scripts": { "scripts": {
"test": "jest", "test": "jest",
"build": "cd appPackages/_master && yarn && cd ../testApp && yarn && cd ../testApp2 && yarn", "build": "cd appPackages/_master && yarn && cd ../testApp && yarn && cd ../testApp2 && yarn",
"initialise": "node initialise/initialiseBudibase --datastore local --username admin --password admin --rootPath .data --cleanDev", "initialise": "node initialise/initialiseBudibase --datastore local --username admin --password admin --rootPath .data --cleanDev && node ../cli/bin/budi new testApp2",
"dev:builder": "node index" "dev:builder": "node index"
}, },
"keywords": [ "keywords": [