feat(npm) switch to npm as default package manager

This commit is contained in:
Philipp Kunz 2018-05-27 14:34:38 +02:00
parent d55c77560a
commit 7681f09d38
6 changed files with 14 additions and 1874 deletions

View File

@ -49,5 +49,6 @@
"smartstring": "^2.0.24", "smartstring": "^2.0.24",
"smartsystem": "^2.0.2", "smartsystem": "^2.0.2",
"through2": "^2.0.3" "through2": "^2.0.3"
} },
"private": true
} }

View File

@ -1,6 +1,7 @@
import * as plugins from '../npmci.plugins'; import * as plugins from '../npmci.plugins';
import * as paths from '../npmci.paths';
import * as npmciConfig from '../npmci.config'; import * as npmciConfig from '../npmci.config';
import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash'; import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
/** /**
* handle cli input * handle cli input
@ -49,6 +50,7 @@ export let install = async versionArg => {
} }
await bash('node -v'); await bash('node -v');
await bash('npm -v'); await bash('npm -v');
await bash(`npm config set cache ${paths.NpmciCacheDir} --global `);
// lets look for further config // lets look for further config
await npmciConfig.getConfig().then(async configArg => { await npmciConfig.getConfig().then(async configArg => {
plugins.beautylog.log('Now checking for needed global npm tools...'); plugins.beautylog.log('Now checking for needed global npm tools...');
@ -60,11 +62,7 @@ export let install = async versionArg => {
plugins.beautylog.log(`Tool ${npmTool} is available`); plugins.beautylog.log(`Tool ${npmTool} is available`);
} else { } else {
plugins.beautylog.info(`globally installing ${npmTool} from npm`); plugins.beautylog.info(`globally installing ${npmTool} from npm`);
if (await yarnAvailable.promise) { await bash(`npm install ${npmTool} -q -g`);
await bash(`yarn global add ${npmTool}`);
} else {
await bash(`npm install ${npmTool} -q -g`);
}
} }
} }
plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!'); plugins.beautylog.success('all global npm tools specified in npmextra.json are now available!');

View File

@ -1,6 +1,6 @@
import * as plugins from './mod.plugins'; import * as plugins from './mod.plugins';
import * as configModule from '../npmci.config'; import * as configModule from '../npmci.config';
import { bash, bashNoError, nvmAvailable, yarnAvailable } from '../npmci.bash'; import { bash, bashNoError, nvmAvailable } from '../npmci.bash';
/** /**
* handle cli input * handle cli input
@ -72,13 +72,13 @@ let publish = async () => {
await bash(`npm -v`); await bash(`npm -v`);
// -> build it // -> build it
await bash(`yarn install`); await bash(`npm install`);
await bash(`yarn run build`); await bash(`npm run build`);
plugins.beautylog.success(`Nice!!! The build for the publication was successfull!`); plugins.beautylog.success(`Nice!!! The build for the publication was successfull!`);
plugins.beautylog.log(`Lets clean up so we don't publish any packages that don't belong to us:`); plugins.beautylog.log(`Lets clean up so we don't publish any packages that don't belong to us:`);
// -> clean up before we publish stuff // -> clean up before we publish stuff
await bash(`rm -r .yarn`); await bashNoError(`rm -r .npmci_cache`);
await bash(`rm -r node_modules`); await bash(`rm -r node_modules`);
plugins.beautylog.success(`Cleaned up!:`); plugins.beautylog.success(`Cleaned up!:`);
@ -91,14 +91,10 @@ let publish = async () => {
let install = async (): Promise<void> => { let install = async (): Promise<void> => {
plugins.beautylog.info('now installing dependencies:'); plugins.beautylog.info('now installing dependencies:');
if (await yarnAvailable.promise) { await bash('npm install');
await bash('yarn install');
} else {
await bash('npm install');
}
}; };
export let test = async (): Promise<void> => { export let test = async (): Promise<void> => {
plugins.beautylog.info('now starting tests:'); plugins.beautylog.info('now starting tests:');
await bash('yarn test'); await bash('npm test');
}; };

View File

@ -7,7 +7,6 @@ import * as smartq from 'smartq';
* wether nvm is available or not * wether nvm is available or not
*/ */
export let nvmAvailable = smartq.defer<boolean>(); export let nvmAvailable = smartq.defer<boolean>();
export let yarnAvailable = smartq.defer<boolean>();
/** /**
* the smartshell instance for npmci * the smartshell instance for npmci
*/ */
@ -35,22 +34,8 @@ let checkToolsAvailable = async () => {
} else { } else {
nvmAvailable.resolve(false); nvmAvailable.resolve(false);
} }
// check for yarn
await plugins.smartshell.which('yarn').then(
async () => {
await plugins.smartshell.exec(
`yarn config set cache-folder ${plugins.path.join(paths.cwd, '.yarn')}`
);
yarnAvailable.resolve(true);
},
() => {
yarnAvailable.resolve(false);
}
);
} else { } else {
nvmAvailable.resolve(true); nvmAvailable.resolve(true);
yarnAvailable.resolve(true);
} }
}; };
checkToolsAvailable(); checkToolsAvailable();

View File

@ -6,3 +6,4 @@ export let NpmciPackageRoot = plugins.path.join(__dirname, '../');
export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json'); export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot, './config.json');
export let NpmciProjectDir = cwd; export let NpmciProjectDir = cwd;
export let NpmciTestDir = plugins.path.join(cwd, './test'); export let NpmciTestDir = plugins.path.join(cwd, './test');
export let NpmciCacheDir = plugins.path.join(cwd, './.npmci_cache');

1841
yarn.lock

File diff suppressed because it is too large Load Diff