Skip to content

Commit

Permalink
Merge pull request #326 from spatialnetworkslab/master
Browse files Browse the repository at this point in the history
replace es6 package.json import with rollup replace
  • Loading branch information
ahocevar committed Nov 16, 2019
2 parents f7aba22 + 82532ab commit 305e885
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
5 changes: 5 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
var json = require('rollup-plugin-json');
var nodeResolve = require('rollup-plugin-node-resolve');
var replace = require('rollup-plugin-replace');
var pkg = require('./package.json');

var projs = [
'tmerc',
Expand Down Expand Up @@ -63,6 +65,9 @@ module.exports = function (grunt) {
format: "umd",
moduleName: "proj4",
plugins: [
replace({
__VERSION__: pkg.version
}),
json(),
nodeResolve()
]
Expand Down
3 changes: 1 addition & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import common from "./common/toPoint";
import defs from "./defs";
import transform from "./transform";
import mgrs from "mgrs";
import version from "./version";
import includedProjections from "../projs";

proj4.defaultDatum = 'WGS84'; //default datum
Expand All @@ -16,6 +15,6 @@ proj4.toPoint = common;
proj4.defs = defs;
proj4.transform = transform;
proj4.mgrs = mgrs;
proj4.version = version;
proj4.version = '__VERSION__';
includedProjections(proj4);
export default proj4;
1 change: 0 additions & 1 deletion lib/version.js

This file was deleted.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"rollup": "^0.50.0",
"rollup-plugin-json": "^2.3.0",
"rollup-plugin-node-resolve": "^3.0.0",
"rollup-plugin-replace": "^2.0.0",
"tin": "~0.5.0"
},
"dependencies": {
Expand Down

0 comments on commit 305e885

Please sign in to comment.