File tree Expand file tree Collapse file tree 3 files changed +16
-12
lines changed Expand file tree Collapse file tree 3 files changed +16
-12
lines changed Original file line number Diff line number Diff line change 1
1
/* jshint node: true */
2
2
'use strict' ;
3
- var path = require ( 'path' ) ;
4
3
var DeployPluginBase = require ( 'ember-cli-deploy-plugin' ) ;
5
4
var S3 = require ( './lib/s3' ) ;
5
+ var joinUriSegments = require ( './lib/util/join-uri-segments' ) ;
6
6
7
7
module . exports = {
8
8
name : 'ember-cli-deploy-s3-index' ,
@@ -43,7 +43,7 @@ module.exports = {
43
43
var filePattern = this . readConfig ( 'filePattern' ) ;
44
44
var gzippedFiles = this . readConfig ( 'gzippedFiles' ) ;
45
45
var allowOverwrite = this . readConfig ( 'allowOverwrite' ) ;
46
- var filePath = path . join ( distDir , filePattern ) ;
46
+ var filePath = joinUriSegments ( distDir , filePattern ) ;
47
47
48
48
var options = {
49
49
bucket : bucket ,
Original file line number Diff line number Diff line change 1
1
/* jshint node: true */
2
2
'use strict' ;
3
3
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' ) ;
10
11
11
12
function headObject ( client , params ) {
12
13
return new Promise ( function ( resolve , reject ) {
@@ -24,10 +25,6 @@ function headObject(client, params) {
24
25
} ) ;
25
26
}
26
27
27
- function joinUriSegments ( prefix , uri ) {
28
- return prefix === '' ? uri : [ prefix , uri ] . join ( '/' ) ;
29
- }
30
-
31
28
module . exports = CoreObject . extend ( {
32
29
init : function ( options ) {
33
30
var plugin = options . plugin ;
Original file line number Diff line number Diff line change
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 ;
You can’t perform that action at this time.
0 commit comments