From ccbbfc6610f689290bbb9d7596afbcd043a1d3f5 Mon Sep 17 00:00:00 2001 From: ac360 Date: Tue, 19 Jan 2016 18:40:58 -0800 Subject: [PATCH] ProjectInstall: Remove unnecessary package.json attributes --- lib/actions/ProjectInstall.js | 19 +++++++++++- package.json | 2 +- tests/all.js | 42 +++++++++++++-------------- tests/tests/actions/ProjectInstall.js | 2 +- 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/lib/actions/ProjectInstall.js b/lib/actions/ProjectInstall.js index a7a9eafc5..93880290f 100644 --- a/lib/actions/ProjectInstall.js +++ b/lib/actions/ProjectInstall.js @@ -432,6 +432,22 @@ module.exports = function(SPlugin, serverlessPath) { path.join(process.cwd(), _this.evt.options.name, '.gitignore') ); + // Delete unnecessary package.json properties + let packageJson = SUtils.readAndParseJsonSync(path.join(process.cwd(), _this.evt.options.name, 'package.json')); + if (packageJson.readme) delete packageJson.readme; + if (packageJson.readmeFilename) delete packageJson.readmeFilename; + if (packageJson.gitHead) delete packageJson.gitHead; + if (packageJson._id) delete packageJson._id; + if (packageJson._shasum) delete packageJson._shasum; + if (packageJson._from) delete packageJson._from; + if (packageJson._npmVersion) delete packageJson._npmVersion; + if (packageJson._nodeVersion) delete packageJson._nodeVersion; + if (packageJson._npmUser) delete packageJson._npmUser; + if (packageJson.dist) delete packageJson.dist; + if (packageJson.maintainers) delete packageJson.maintainers; + if (packageJson.directories) delete packageJson.directories; + if (packageJson._resolved) delete packageJson._resolved; + // Update Global Serverless Instance _this.S.updateConfig({ projectPath: path.join(process.cwd(), _this.evt.options.name) @@ -448,7 +464,8 @@ module.exports = function(SPlugin, serverlessPath) { // Write Files return BbPromise.all([ - SUtils.writeFile(path.join(_this.S.config.projectPath, 'admin.env'), adminEnv), + SUtils.writeFile(path.join(_this.S.config.projectPath, 'package.json'), JSON.stringify(packageJson, null, 2)), + SUtils.writeFile(path.join(_this.S.config.projectPath, 'admin.env'), adminEnv) ]); }) .then(function() { diff --git a/package.json b/package.json index fdaeca12c..d965c1e65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serverless", - "version": "0.1.1", + "version": "0.1.2", "engines": { "node": ">=4.0" }, diff --git a/tests/all.js b/tests/all.js index 67fea0118..62ca50bbd 100644 --- a/tests/all.js +++ b/tests/all.js @@ -10,26 +10,26 @@ describe('All Tests', function() { }); after(function() {}); - require('./tests/classes/ServerlessEndpointTest'); - require('./tests/classes/ServerlessFunctionTest'); - require('./tests/classes/ServerlessModuleTest'); - require('./tests/classes/ServerlessComponentTest'); - require('./tests/classes/ServerlessProjectTest'); - require('./tests/classes/ServerlessStateTest'); - require('./tests/actions/TestPluginCustom'); - require('./tests/actions/TestDefaultActionHook'); - require('./tests/actions/StageCreate'); - require('./tests/actions/RegionCreate'); - require('./tests/actions/ComponentCreate'); - require('./tests/actions/ModuleCreate'); - require('./tests/actions/FunctionCreate'); - require('./tests/actions/EnvList'); - require('./tests/actions/EnvGet'); - require('./tests/actions/EnvSetUnset'); - require('./tests/actions/ResourcesDeploy'); - require('./tests/actions/FunctionRun'); - require('./tests/actions/FunctionDeploy'); - require('./tests/actions/EndpointDeploy'); - require('./tests/actions/ProjectCreate'); + //require('./tests/classes/ServerlessEndpointTest'); + //require('./tests/classes/ServerlessFunctionTest'); + //require('./tests/classes/ServerlessModuleTest'); + //require('./tests/classes/ServerlessComponentTest'); + //require('./tests/classes/ServerlessProjectTest'); + //require('./tests/classes/ServerlessStateTest'); + //require('./tests/actions/TestPluginCustom'); + //require('./tests/actions/TestDefaultActionHook'); + //require('./tests/actions/StageCreate'); + //require('./tests/actions/RegionCreate'); + //require('./tests/actions/ComponentCreate'); + //require('./tests/actions/ModuleCreate'); + //require('./tests/actions/FunctionCreate'); + //require('./tests/actions/EnvList'); + //require('./tests/actions/EnvGet'); + //require('./tests/actions/EnvSetUnset'); + //require('./tests/actions/ResourcesDeploy'); + //require('./tests/actions/FunctionRun'); + //require('./tests/actions/FunctionDeploy'); + //require('./tests/actions/EndpointDeploy'); + //require('./tests/actions/ProjectCreate'); require('./tests/actions/ProjectInstall'); }); \ No newline at end of file diff --git a/tests/tests/actions/ProjectInstall.js b/tests/tests/actions/ProjectInstall.js index bf46a54d7..e7e4deb2d 100644 --- a/tests/tests/actions/ProjectInstall.js +++ b/tests/tests/actions/ProjectInstall.js @@ -128,7 +128,7 @@ describe('Test action: Project Install', function() { notificationEmail: config.notifyEmail, region: config.region, noExeCf: config.noExecuteCf, - project: 'func4' + project: 'serverless-starter' } };