Skip to content
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

Adds support for both yarn and npm. #22

Merged
merged 3 commits into from
Nov 8, 2019
Merged

Adds support for both yarn and npm. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41d2f94
Enables yarn and npm support.
asyed94 Oct 4, 2019
2e38839
Adds package-lock.json
asyed94 Oct 4, 2019
dac5d86
Makes poetic find out dep manager at install time, then update packag…
asyed94 Nov 6, 2019
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
49 changes: 39 additions & 10 deletions bin/install-boilerplate.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ const installConfigurationFiles = () => {
}
}

const updatePackageJson = () => {
const updatePackageJsonDevDependencies = () => {
try {
console.log('🥝 Updating package.json ...');
console.log('🥝 Updating package.json devDependencies ...');

const packageJson = path.join(currentDir, "package.json");

Expand All @@ -47,11 +47,6 @@ const updatePackageJson = () => {
const package = fse.readJsonSync(packageJson);
const packageScripts = fse.readJsonSync(path.join(sourceRootDir, 'bin/package.boilerplate.json'));

package.scripts = {
...package.scripts,
...packageScripts.scripts,
};

package.devDependencies = {
...package.devDependencies,
...packageScripts.devDependencies,
Expand All @@ -66,12 +61,45 @@ const updatePackageJson = () => {
const installPackages = () => {
try {
console.log('🍉 Installing packages ...');
cp.execSync('yarn install');
try {
cp.execSync('yarn install');
return 'yarn'
} catch (e) {
process.stdout.moveCursor(0, -1)
process.stdout.clearLine(0)
cp.execSync('npm install');
return 'npm'
}
} catch (e) {
throw Error(`Could not install packages.`);
}
}

const updatePackageJsonScripts = (manager) => {
try {
console.log('🥝 Updating package.json scripts ...');

const packageJson = path.join(currentDir, "package.json");

if (!fse.existsSync(packageJson)) {
throw Error ('package.json not found in the current directory.')
}

const package = fse.readJsonSync(packageJson);
const packageScriptsRaw = fse.readFileSync(path.join(sourceRootDir, 'bin/package.boilerplate.json'), { encoding: 'utf8' })
const packageScripts = JSON.parse(packageScriptsRaw.replace(/\$\{manager\}/g, manager));

package.scripts = {
...package.scripts,
...packageScripts.scripts,
};

fse.writeJsonSync(packageJson, package, {spaces: 2});
} catch (e) {
throw Error(`Could not update package.json: ${e}`);
}
}

const displaySuccessMessage = () => {
console.log('');
console.log('💫 Poetic was installed successfully!');
Expand All @@ -94,8 +122,9 @@ const displayErrorMessage = (error) => {
try {
setCheckpoint();
installConfigurationFiles();
updatePackageJson();
installPackages();
updatePackageJsonDevDependencies();
const manager = installPackages();
updatePackageJsonScripts(manager);
displaySuccessMessage();
} catch (e) {
displayErrorMessage(e);
Expand Down
2 changes: 1 addition & 1 deletion bin/package.boilerplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"poetic": "^1.0.5"
},
"scripts": {
"code:clean": "yarn code:lint && yarn code:format",
"code:clean": "${manager} code:lint && ${manager} code:format",
"code:lint": "eslint --ext .js,.jsx,.ts,.tsx \"src/\" --fix",
"code:format": "prettier './src/**/**.{js,jsx,ts,tsx}' --write",
"code:check:rules": "eslint --print-config .eslintrc.js | eslint-config-prettier-check"
Expand Down
Loading