Permalink
Browse files

Clean from bower stuff and keep it only for the repo download

  • Loading branch information...
1 parent ee82073 commit f52349979ec575243177ce78d9516560360b8d2f @artf committed Nov 23, 2016
Showing with 60 additions and 46 deletions.
  1. +8 −10 Gruntfile.js
  2. +2 −2 dist/css/grapes.min.css
  3. +14 −14 dist/grapes.min.js
  4. +3 −3 index.html
  5. +17 −3 package.json
  6. +9 −9 src/config/require-config.js
  7. +3 −1 src/grapesjs/main.js
  8. +4 −4 test/config/config.js
View
@@ -33,7 +33,7 @@ module.exports = function(grunt) {
dir: '<%= builtDir %>',
baseUrl: './',
name: 'main',
- include: ["./../vendor/almond/almond"],
+ include: ["./../node_modules/almond/almond"],
removeCombined: true,
findNestedDependencies: true,
keepBuildDir: true,
@@ -96,8 +96,8 @@ module.exports = function(grunt) {
flatten: true,
src: [
'<%= styleDir %>/css/main.css',
- 'vendor/codemirror/lib/codemirror.css',
- 'vendor/codemirror/theme/hopscotch.css'
+ 'node_modules/codemirror/lib/codemirror.css',
+ 'node_modules/codemirror/theme/hopscotch.css'
],
dest: '<%= builtDir %>',
ext: '.min.css'
@@ -127,7 +127,7 @@ module.exports = function(grunt) {
}
},
},
-
+/*
bowercopy: {
options: {
srcPrefix: 'bower_components'
@@ -154,7 +154,7 @@ module.exports = function(grunt) {
},
}
},
-
+*/
watch: {
script: {
files: [ '<%= appDir %>/**/*.js' ],
@@ -239,16 +239,14 @@ module.exports = function(grunt) {
});
- grunt.registerTask('bower', ['bowercopy']);
-
- grunt.registerTask('dev', ['bowercopy', 'connect', 'watch']);
+ grunt.registerTask('dev', ['connect', 'watch']);
grunt.registerTask('test', ['jshint', 'mocha']);
grunt.registerTask('build:fonts', ['webfont-custom']);
- grunt.registerTask('build', ['bowercopy', 'jshint', 'sass', 'before-rjs', 'requirejs', 'uglify', 'cssmin', 'concat', 'clean', 'copy']);
+ grunt.registerTask('build', ['jshint', 'sass', 'before-rjs', 'requirejs', 'uglify', 'cssmin', 'concat', 'clean', 'copy']);
grunt.registerTask('default', ['dev']);
-};
+};
Oops, something went wrong.
View
Oops, something went wrong.
View
@@ -4,8 +4,8 @@
<meta charset="utf-8">
<title>GrapesJS</title>
<link rel="stylesheet" href="styles/css/main.css">
- <link rel="stylesheet" href="vendor/codemirror/lib/codemirror.css">
- <link rel="stylesheet" href="vendor/codemirror/theme/hopscotch.css">
+ <link rel="stylesheet" href="node_modules/codemirror/lib/codemirror.css">
+ <link rel="stylesheet" href="node_modules/codemirror/theme/hopscotch.css">
</head>
<style>
body, html{ height: 100%; margin: 0;}
@@ -811,6 +811,6 @@ <h1 class="bdg-title">The team</h1>
</style>
</div>
- <script data-main="src/demo" src="vendor/require/require.js"></script>
+ <script data-main="src/demo" src="node_modules/requirejs/require.js"></script>
</body>
</html>
View
@@ -11,9 +11,20 @@
"url": "https://github.com/artf/grapesjs.git"
},
"dependencies": {
- "bower": "^1.7.2"
+ "almond": "^0.3.3",
+ "backbone": "^1.3.3",
+ "backbone-undo": "^0.2.5",
+ "bower": "^1.7.2",
+ "codemirror": "^5.21.0",
+ "codemirror-formatting": "^1.0.0",
+ "jquery": "^3.1.1",
+ "keymaster": "^1.6.2",
+ "spectrum-colorpicker": "^1.8.0",
+ "underscore": "^1.8.3"
},
"devDependencies": {
+ "bower": "^1.7.2",
+ "chai": "^3.5.0",
"documentation": "^4.0.0-beta2",
"grunt": "^0.4.5",
"grunt-bowercopy": "^1.2.4",
@@ -30,8 +41,11 @@
"grunt-mocha": "^0.4.15",
"grunt-sass": "^1.1.0",
"istanbul": "^0.4.2",
- "bower": "^1.7.2",
+ "mocha": "^3.1.2",
"node-sass": "^3.4.2",
+ "requirejs": "^2.3.2",
+ "requirejs-text": "^2.0.12",
+ "sinon": "^1.17.6",
"svg2ttf": "^4.0.1",
"ttf2eot": "^2.0.0",
"ttf2woff": "^2.0.1",
@@ -44,14 +58,14 @@
"web template editor",
"web site builder",
"web template builder",
+ "html website builder",
"site builder",
"newsletter builder",
"wysiwyg",
"template",
"editor"
],
"scripts": {
- "postinstall": "./node_modules/.bin/bower install --config.interactive=false",
"build": "./node_modules/.bin/grunt build",
"build:fonts": "./node_modules/.bin/grunt build:fonts",
"test": "./node_modules/.bin/grunt test",
@@ -21,15 +21,15 @@ require.config({
},
paths: {
- jquery: '../vendor/jquery/jquery',
- underscore: '../vendor/underscore/underscore',
- backbone: '../vendor/backbone/backbone',
- backboneUndo: '../vendor/backbone-undo/backbone-undo',
- keymaster: '../vendor/keymaster/keymaster',
- text: '../vendor/require-text/text',
- Spectrum: '../vendor/spectrum/spectrum',
- codemirror: '../vendor/codemirror',
- formatting: '../vendor/codemirror-formatting/formatting',
+ jquery: '../node_modules/jquery/dist/jquery',
+ underscore: '../node_modules/underscore/underscore',
+ backbone: '../node_modules/backbone/backbone',
+ backboneUndo: '../node_modules/backbone-undo/Backbone.Undo',
+ keymaster: '../node_modules/keymaster/keymaster',
+ text: '../node_modules/requirejs-text/text',
+ Spectrum: '../node_modules/spectrum-colorpicker/spectrum',
+ codemirror: '../node_modules/codemirror',
+ formatting: '../node_modules/codemirror-formatting/formatting',
},
packages : [
@@ -12,6 +12,8 @@ define(function (require) {
return {
+ editors: editors,
+
plugins: plugins,
/**
@@ -76,4 +78,4 @@ define(function (require) {
}();
-});
+});
@@ -7,9 +7,9 @@ require.config({
baseUrl : "../src",
paths : {
- chai : '../vendor/chai/chai',
- sinon : '../vendor/sinon/sinon',
- mocha : '../vendor/mocha/mocha',
+ chai : '../node_modules/chai/chai',
+ sinon : '../node_modules/sinon/sinon',
+ mocha : '../node_modules/mocha/mocha',
},
shim: {
@@ -25,4 +25,4 @@ require.config({
},
urlArgs : 'bust=' + (new Date()).getTime()
-});
+});

0 comments on commit f523499

Please sign in to comment.