Skip to content

Commit a74cb2e

Browse files
Removed dependency on almond.js
1 parent abe54af commit a74cb2e

File tree

5 files changed

+23
-44
lines changed

5 files changed

+23
-44
lines changed

Gruntfile.coffee

+19-34
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module.exports = (grunt)->
1111
grunt.initConfig
1212
config:
1313
src: 'src/main/paths'
14-
helpers: 'src/main/helpers'
1514
dist: 'dist'
1615
test: 'src/test'
1716
test_dist: 'test'
@@ -20,23 +19,26 @@ module.exports = (grunt)->
2019
dist: ['<%= config.dist %>']
2120
test: ['<%= config.test_dist %>']
2221
global: [
23-
'<%= config.dist %>/helpers',
24-
'<%= config.dist %>/temp',
25-
'<%= config.dist %>/amd/all.js',
26-
'<%= config.dist %>/amd/almond.js',
27-
'<%= config.dist %>/node/all.js',
28-
'<%= config.dist %>/node/almond.js'
22+
'<%= config.dist %>/temp'
23+
'<%= config.dist %>/amd/all.js'
24+
'<%= config.dist %>/node/all.js'
2925
]
3026

3127
coffee:
32-
# options:
33-
# bare: true
3428
dist:
3529
expand: true
3630
cwd: '<%= config.src %>'
3731
src: ['**/*.coffee']
3832
dest: '<%= config.dist %>/amd'
3933
ext: '.js'
34+
temp:
35+
options:
36+
bare: true
37+
expand: true
38+
cwd: '<%= config.src %>'
39+
src: ['**/*.coffee']
40+
dest: '<%= config.dist %>/temp'
41+
ext: '.js'
4042
test:
4143
expand: true
4244
cwd: '<%= config.test %>'
@@ -55,35 +57,18 @@ module.exports = (grunt)->
5557
files: [
5658
{ expand: true, cwd: '.', src: ['package.json'], dest: '<%= config.dist %>/node' }
5759
{ expand: true, cwd: '.', src: ['README.md'], dest: '<%= config.dist %>/node' }
58-
{
59-
expand: false,
60-
cwd: '.',
61-
src: ['<%= config.dist %>/temp/almond.js'],
62-
dest: '<%= config.dist %>/global/paths.js'
63-
}
64-
]
65-
almond:
66-
files:[
67-
{
68-
expand: false,
69-
cwd: '.',
70-
src: ['bower_components/almond/almond.js'],
71-
dest: '<%= config.dist %>/amd/almond.js'
72-
}
7360
]
7461

7562
requirejs:
7663
compile:
7764
options:
78-
baseUrl: '.'
79-
appDir: '<%= config.dist %>/amd'
80-
dir: '<%= config.dist %>/temp'
65+
baseUrl: '<%= config.dist %>/temp'
8166
skipDirOptimize: true
82-
deps: ['all']
83-
name: 'almond'
84-
wrap:
85-
start: "(function() {"
86-
end: "require('all');}());"
67+
name: 'all'
68+
out: '<%= config.dist %>/global/paths.js'
69+
wrap: true
70+
onBuildWrite: (moduleName, path, contents) ->
71+
module.require('amdclean').clean(contents)
8772

8873
watch:
8974
dist:
@@ -109,11 +94,11 @@ module.exports = (grunt)->
10994
grunt.registerTask 'build', [
11095
'clean:dist'
11196
'coffee:dist'
112-
'copy:almond'
97+
'coffee:temp'
11398
'requirejs:compile'
11499
'urequire:dist'
115100
'copy:dist'
116101
'clean:global'
117102
]
118103

119-
grunt.registerTask 'default', ['test']
104+
grunt.registerTask 'default', ['test']

bower.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@
99
"package.json"
1010
],
1111
"dependencies": {},
12-
"devDependencies": {
13-
"almond": "~0.2.9"
14-
}
12+
"devDependencies": {}
1513
}

0 commit comments

Comments
 (0)