Skip to content

Fix image handling #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix image handling #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 69 additions & 67 deletions packages/create-cosmos-app/src/git-cca-template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ import { join, dirname, basename, sep, relative } from 'path';
import { sync as mkdirp } from 'mkdirp';
import { crossGlob as glob, toPosixPath } from './utils';
import * as fs from 'fs';
import {
cloneRepo,
getPackageLicAndAccessInfo,
getQuestionsAndAnswers,
getTemplateFolder
} from './utils';
import { cloneRepo, getPackageLicAndAccessInfo, getQuestionsAndAnswers, getTemplateFolder } from './utils';
import { CCA_URL } from './constants';

const posixPath = require('path').posix;
Expand All @@ -31,7 +26,6 @@ ${commandSection}
`;
};


const checkRequiredTools = () => {
for (const tool of requiredTools) {
if (!shell.which(tool)) {
Expand All @@ -40,22 +34,22 @@ const checkRequiredTools = () => {
}
}
return true;
}

};

async function getAppName(argv) {
let { name } = await prompt(
[{
name: 'name',
message: 'Enter your new app name',
required: true,
}],
[
{
name: 'name',
message: 'Enter your new app name',
required: true,
},
],
argv
);
return name.replace(/\s/g, '-');
}


async function setupAppDirectory(repo, argv, name) {
const folderName = await getTemplateFolder(argv);
const currentDirectory = process.cwd();
Expand All @@ -65,20 +59,26 @@ async function setupAppDirectory(repo, argv, name) {
return { folderName, currentDirectory, tempDir };
}


async function warnIfOutdated(repo, clonedRepoDir, version) {
if (repo === CCA_URL) {
const rootPkgPath = join(clonedRepoDir, 'packages/create-cosmos-app/package.json');
const rootPkg = JSON.parse(fs.readFileSync(rootPkgPath, 'utf-8'));
if (semver.lt(rootPkg.version, version)) {
console.warn(c.yellow(`⚠️ You are using create-cosmos-app version ${c.red(rootPkg.version)}, but version ${c.green(version)} is available. Run "${c.cyan('cca upgrade')}" or "${c.cyan('npm install -g create-cosmos-app@latest')}" to upgrade.`));
console.warn(
c.yellow(
`⚠️ You are using create-cosmos-app version ${c.red(rootPkg.version)}, but version ${c.green(
version
)} is available. Run "${c.cyan('cca upgrade')}" or "${c.cyan(
'npm install -g create-cosmos-app@latest'
)}" to upgrade.`
)
);
}
}
}

export const createGitApp = (repo: string, version: string) => {
return async argv => {

return async (argv) => {
// if --no-install is set, don't touch!
if (!argv.hasOwnProperty('install')) argv.install = true;
if (!argv.hasOwnProperty('printCmd')) argv.printCmd = true;
Expand All @@ -96,15 +96,18 @@ export const createGitApp = (repo: string, version: string) => {

// get template
const list = shell.ls(`./${folderName}`);
const { template } = await prompt([
{
type: 'list',
name: 'template',
message: 'which template',
required: true,
choices: list
}
], argv);
const { template } = await prompt(
[
{
type: 'list',
name: 'template',
message: 'which template',
required: true,
choices: list,
},
],
argv
);
argv.template = template;

const results = await getQuestionsAndAnswers(argv, name, folderName);
Expand All @@ -115,11 +118,8 @@ export const createGitApp = (repo: string, version: string) => {
let license = {};
let scopedResults: any = {};
if (hasResults) {
({
license,
scopedResults
} = await getPackageLicAndAccessInfo(results));
const path = join(folderName, argv.template, '.questions.json')
({ license, scopedResults } = await getPackageLicAndAccessInfo(results));
const path = join(folderName, argv.template, '.questions.json');
shell.rm('-rf', path);
}

Expand All @@ -131,41 +131,47 @@ export const createGitApp = (repo: string, version: string) => {
const templateFile = files[i];
if (fs.lstatSync(templateFile).isDirectory()) continue;

let content = fs.readFileSync(templateFile).toString();

// LICENSE
if (
basename(templateFile) === 'LICENSE' &&
// @ts-ignore
license.__LICENSE__ === 'closed'
) {
content = `Copyright (c) ${new Date().getFullYear()} __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
const isImage = /\.(png|jpe?g|gif|svg|webp|ico)$/i.test(templateFile);

let content;
if (isImage) {
content = fs.readFileSync(templateFile);
} else {
content = fs.readFileSync(templateFile).toString();

// LICENSE
if (
basename(templateFile) === 'LICENSE' &&
// @ts-ignore
license.__LICENSE__ === 'closed'
) {
content = `Copyright (c) ${new Date().getFullYear()} __USERFULLNAME__ <__USEREMAIL__> - All Rights Reserved
Unauthorized copying via any medium is strictly prohibited
Proprietary and confidential`;
}

// swap out content from results!
Object.keys(results).forEach(key => {
if (/^__/.test(key)) {
content = content.replace(new RegExp(key, 'g'), results[key]);
}
});

// access
if (hasResults) {
// Determine the prefix based on the conditions
let prefix = '';
if (results.__ACCESS__ === 'public') {
prefix = scopedResults.scoped ? `@${results.__USERNAME__}/` : '';
} else {
prefix = `@${results.__USERNAME__}/`;
}

// Replace __PACKAGE_IDENTIFIER__ with the determined prefix and module name
content = content.replace(/__PACKAGE_IDENTIFIER__/g, `${prefix}${results.__MODULENAME__}`);
// swap out content from results!
Object.keys(results).forEach((key) => {
if (/^__/.test(key)) {
content = content.replace(new RegExp(key, 'g'), results[key]);
}
});

// access
if (hasResults) {
// Determine the prefix based on the conditions
let prefix = '';
if (results.__ACCESS__ === 'public') {
prefix = scopedResults.scoped ? `@${results.__USERNAME__}/` : '';
} else {
prefix = `@${results.__USERNAME__}/`;
}

// Replace __PACKAGE_IDENTIFIER__ with the determined prefix and module name
content = content.replace(/__PACKAGE_IDENTIFIER__/g, `${prefix}${results.__MODULENAME__}`);
}
}


// Construct the file path
const relativeFilePath = templateFile.split(toPosixPath(join(folderName, template) + '/'))[1];

Expand All @@ -184,15 +190,13 @@ export const createGitApp = (repo: string, version: string) => {
// Ensure the target directory exists before writing the file
mkdirp(targetDirPath);
fs.writeFileSync(targetFilePath, content);

}

// Clean up and change directory
shell.cd(currentDirectory);
shell.rm('-rf', tempDir);
shell.cd(name);


const fakeLongPath = '/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p';
const closestPkgJson = []
.concat(glob(join(currentDirectory, name, '**', 'package.json')))
Expand All @@ -207,7 +211,7 @@ export const createGitApp = (repo: string, version: string) => {
const pkgPath = closestPkgJson;
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
if (pkg.scripts) {
['locks:remove', 'locks:create', 'locks'].forEach(script => delete pkg.scripts[script]);
['locks:remove', 'locks:create', 'locks'].forEach((script) => delete pkg.scripts[script]);
}
if (pkg.devDependencies) {
delete pkg.devDependencies['generate-lockfile'];
Expand All @@ -228,14 +232,12 @@ export const createGitApp = (repo: string, version: string) => {
cmd += ' && yarn dev';
}
console.log(motd(cmd, argv.printCmd));

} else {
console.log('No package.json file found');
console.log(motd(`cd ${name}`, argv.printCmd));
}

// Change back to the original directory
shell.cd(currentDirectory);

};
};
Loading