Skip to content

Commit

Permalink
Revert "Restructures src directory and implements RollUpJS (#128)" (#130
Browse files Browse the repository at this point in the history
)

This reverts commit 749173c.
  • Loading branch information
ahmadayubi authored Aug 12, 2020
1 parent 749173c commit 7e2fcbb
Show file tree
Hide file tree
Showing 23 changed files with 4,649 additions and 4,742 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ dist: bionic
install:
- npm install
- npm install -g grunt-cli
- grunt clean copy rollup
- grunt clean copy
script:
- npm test
16 changes: 2 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,7 @@ module.exports = function(grunt) {
},
clean: {
dist: ['dist']
},
rollup: {
options: {
format: 'iife',
},
main: {
dest: 'dist/mapml.js',
src: 'src/mapml/index.js', // Only one source file is permitted
},
},
}
});

/*grunt.loadNpmTasks('grunt-html');*/
Expand All @@ -156,15 +147,12 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-rollup');

/* grunt.loadNpmTasks('grunt-processhtml'); */


grunt.registerTask('test', ['jshint']);

grunt.registerTask('default', ['clean:dist', 'copy', 'jshint', 'concat', 'uglify', 'rollup']);
grunt.registerTask('build', ['rollup']);

grunt.registerTask('default', ['clean:dist', 'copy', 'jshint', 'concat', 'uglify']);

};
18 changes: 0 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@
"grunt-contrib-uglify-es": "~3.3.0",
"grunt-contrib-watch": "~1.1.0",
"grunt-html": "~9.3.0",
"grunt-rollup": "^11.3.0",
"jest": "^26.1.0",
"jest-playwright-preset": "^0.1.3",
"leaflet": "~1.6.0",
"path": "^0.12.7",
"playwright": "^1.2.1",
"proj4": "2.6.0",
"proj4leaflet": "1.0.1",
"rollup": "^2.23.1"
"proj4leaflet": "1.0.1"
}
}
7 changes: 0 additions & 7 deletions rollup.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/mapml.css
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@
.mapml-contextmenu-separator {
border-bottom: 1px solid #ccc;
margin: 5px 0;
}
}
Loading

0 comments on commit 7e2fcbb

Please sign in to comment.