Skip to content

Commit

Permalink
Fix package copy from global installation - don't use dev dependencie…
Browse files Browse the repository at this point in the history
…s. (#29)
  • Loading branch information
jgraff2 authored and pallavi2209 committed Aug 20, 2018
1 parent 082cfe7 commit 0f982a7
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 20 deletions.
26 changes: 12 additions & 14 deletions package.json
@@ -1,18 +1,18 @@
{
"name": "@salesforce/refocus-sample-generator-template-utils",
"version": "1.1.2",
"version": "1.1.3",
"description": "Refocus Sample Generator Template Utilities",
"main": "index.js",
"dependencies": {
"@salesforce/refocus-collector-eval": "^1.8.0",
"ajv": "^6.5.2",
"bluebird": "^3.5.1",
"chai": "*",
"chai-url": "*",
"commander": "^2.12.2",
"coveralls": "^3.0.0",
"fs-extra": "4.*",
"joi": "^10.6.0",
"jscs": "^3.0.7",
"mock-fs": "^4.4.2",
"mock-require": "^3.0.1",
"nock": "^9.1.6",
"istanbul": "*",
"mocha": "*",
"superagent": "^3.8.1",
"uglify-es": "^3.3.0",
"validate-npm-package-name": "^3.0.0"
Expand All @@ -25,13 +25,11 @@
"sgtu-init": "bin/generateResources.js"
},
"devDependencies": {
"@salesforce/refocus-collector-eval": "^1.8.0",
"ajv": "^6.5.2",
"chai": "*",
"chai-url": "*",
"fs-extra": "4.*",
"istanbul": "*",
"mocha": "*"
"coveralls": "^3.0.0",
"jscs": "^3.0.7",
"mock-fs": "^4.4.2",
"mock-require": "^3.0.1",
"nock": "^9.1.6"
},
"scripts": {
"jscs-enforce": "./node_modules/jscs/bin/jscs src test bin prototype",
Expand Down
22 changes: 16 additions & 6 deletions src/resourceGenUtils.js
Expand Up @@ -18,7 +18,7 @@ let cwd = process.cwd();
const validatePackageName = require('validate-npm-package-name');
const Promise = require('bluebird');
const execSync = require('child_process').execSync;
const devDependencies = require('../package.json').devDependencies;
const dependencies = require('../package.json').dependencies;

/* Format of the README.md file */
const readme = '# %s\n\n' +
Expand All @@ -44,6 +44,17 @@ const scriptsToAdd = {
validate: 'echo "validate"',
};

/* Packages to be copied to the new project */
const packagesToCopy = [
'@salesforce/refocus-collector-eval',
'ajv',
'chai',
'chai-url',
'fs-extra',
'istanbul',
'mocha',
];

/**
* Traverses the dependency tree to find all required modules.
* @param {Array} moduleNames - The top-level modules to search
Expand Down Expand Up @@ -76,8 +87,8 @@ function addScriptsAndDependencies(packageJson) {
});

if (!packageJson.dependencies) packageJson.dependencies = {};
Object.keys(devDependencies).forEach((m) => {
packageJson.dependencies[m] = devDependencies[m];
packagesToCopy.forEach((m) => {
packageJson.dependencies[m] = dependencies[m];
});
}

Expand Down Expand Up @@ -144,11 +155,10 @@ module.exports = {
copyPackages: () => {
console.log('copying packages...');

const npmLs = execSync('npm ls --dev --json', { cwd: __dirname });
const npmLs = execSync('npm ls --prod --json', { cwd: __dirname });
const dependencyTree = JSON.parse(npmLs).dependencies;
const modulesToCopy = Object.keys(devDependencies);

getAllDependencies(modulesToCopy, dependencyTree)
getAllDependencies(packagesToCopy, dependencyTree)
.forEach((m) => {
const fromDir = path.resolve(__dirname, '..', 'node_modules', m);
const toDir = path.resolve(cwd, 'node_modules', m);
Expand Down

0 comments on commit 0f982a7

Please sign in to comment.