Skip to content

Feat/lifecycle local server #10

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Feat/lifecycle local server #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c3b00a
fix: sets env vars in provider.environment
andrevandal Aug 13, 2019
7a81f9d
fix: deprecated hook
andrevandal Aug 13, 2019
eaf3c98
chore: remove local-dev-server:loadEnvVars
andrevandal Aug 13, 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
13 changes: 6 additions & 7 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,11 @@ class ServerlessEnvGeneratorPlugin {
'invoke:test:test': this.writeDotEnvFile.bind(this),
'before:deploy:function:packageFunction': this.writeDotEnvFile.bind(this),
'after:deploy:function:packageFunction': this.removeDotEnvFile.bind(this),
'before:deploy:createDeploymentArtifacts': this.writeDotEnvFile.bind(this),
'after:deploy:createDeploymentArtifacts': this.removeDotEnvFile.bind(this),
'before:package:createDeploymentArtifacts': this.writeDotEnvFile.bind(this),
'after:package:createDeploymentArtifacts': this.removeDotEnvFile.bind(this),
'before:offline:start:init': this.setEnvironment.bind(this),
'before:invoke:local:invoke': this.writeDotEnvFile.bind(this),
'after:invoke:local:invoke': this.removeDotEnvFile.bind(this),
'local-dev-server:loadEnvVars': this.setEnvironment.bind(this)
'after:invoke:local:invoke': this.removeDotEnvFile.bind(this)
}
}

Expand Down Expand Up @@ -84,7 +83,7 @@ class ServerlessEnvGeneratorPlugin {
.on('exit', () => {
if (fs.existsSync(config.dotEnvPath)) {
fs.removeSync(config.dotEnvPath);
this.serverless.cli.log('Removed .env file')
this.serverless.cli.log('Removed .env file')
}
})
return helper.getEnvVars(undefined, true, config).then(envFiles => {
Expand All @@ -106,7 +105,7 @@ class ServerlessEnvGeneratorPlugin {
})
}

// Sets options.environment used by serverless-local-dev-server
// Sets environment vars in serverless.service.provider.environment
setEnvironment() {
const config = this.getConfig()
this.serverless.cli.log('Setting YAML environment variables …')
Expand All @@ -117,7 +116,7 @@ class ServerlessEnvGeneratorPlugin {
environment[envVar.attribute] = envVar.value
})
})
this.options.environment = Object.assign(this.serverless.service.provider.environment, environment, dotenv.config({ path: path.join(config.servicePath, '.env.local') }).parsed)
this.serverless.service.provider.environment = Object.assign(this.serverless.service.provider.environment || {}, environment, dotenv.config({ path: path.join(config.servicePath, '.env.local') }).parsed)
})
}

Expand Down