Skip to content

Commit 510e05b

Browse files
committed
Remove remaining path.join for win-compatibility
1 parent 7e08c3b commit 510e05b

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* jshint node: true */
22
'use strict';
3-
var path = require('path');
43
var DeployPluginBase = require('ember-cli-deploy-plugin');
54
var S3 = require('./lib/s3');
5+
var joinUriSegments = require('./lib/util/join-uri-segments');
66

77
module.exports = {
88
name: 'ember-cli-deploy-s3-index',
@@ -43,7 +43,7 @@ module.exports = {
4343
var filePattern = this.readConfig('filePattern');
4444
var gzippedFiles = this.readConfig('gzippedFiles');
4545
var allowOverwrite = this.readConfig('allowOverwrite');
46-
var filePath = path.join(distDir, filePattern);
46+
var filePath = joinUriSegments(distDir, filePattern);
4747

4848
var options = {
4949
bucket: bucket,

lib/s3.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/* jshint node: true */
22
'use strict';
33

4-
var AWS = require('aws-sdk');
5-
var CoreObject = require('core-object');
6-
var Promise = require('ember-cli/lib/ext/promise');
7-
var fs = require('fs');
8-
var readFile = Promise.denodeify(fs.readFile);
9-
var mime = require('mime-types');
4+
var AWS = require('aws-sdk');
5+
var CoreObject = require('core-object');
6+
var Promise = require('ember-cli/lib/ext/promise');
7+
var fs = require('fs');
8+
var readFile = Promise.denodeify(fs.readFile);
9+
var mime = require('mime-types');
10+
var joinUriSegments = require('./util/join-uri-segments');
1011

1112
function headObject(client, params) {
1213
return new Promise(function(resolve, reject) {
@@ -24,10 +25,6 @@ function headObject(client, params) {
2425
});
2526
}
2627

27-
function joinUriSegments(prefix, uri) {
28-
return prefix === '' ? uri : [prefix, uri].join('/');
29-
}
30-
3128
module.exports = CoreObject.extend({
3229
init: function(options) {
3330
var plugin = options.plugin;

lib/util/join-uri-segments.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* jshint node: true */
2+
'use strict';
3+
function joinUriSegments(prefix, uri) {
4+
return prefix === '' ? uri : [prefix, uri].join('/');
5+
}
6+
7+
module.exports = joinUriSegments;

0 commit comments

Comments
 (0)