Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ddohler committed Sep 30, 2022
2 parents 15d963b + 4ab5ece commit 43984a1
Show file tree
Hide file tree
Showing 13 changed files with 8,358 additions and 6,111 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"sinon": true
},

"parser": "babel-eslint",
"parser": "@babel/eslint-parser",

"plugins": [

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- name: Check out commit
uses: actions/checkout@v2

- name: Use Node.js 12
- name: Use Node.js 18
uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 18.x
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
node-version: [12.x, 14.x]
node-version: [14.x, 16.x, 18.x]

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,10 @@ node_modules
.vscode

.DS_Store

# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/versions
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.10
v18
783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.3.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.3.cjs
7 changes: 6 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
## Upcoming
## 1.1.1 (2022-09-30)
- Document bytes() method
- Fix production bundle not including unminified assets.
- Add Node versions 16 and 18 to testing matrix (this library currently targets browser environments only)
- Drop testing on Node 12 (this library currently targets browser environments only)
- Update to latest stable version of Yarn

## 1.1.0 (2021-09-29)
- Improve documentation for integrating with build tools
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@ A promise which resolves to the affine transform.
<br />
### `GDALDataset.bytes()`
Get the on-disk representation of the dataset, as an array of bytes.
#### Return value
A promise which resolves to a Uint8Array containing the bytes of the dataset.
<br />
### `GDALDataset.convert(args)`
Converts raster data between different formats. This is the equivalent of the [gdal_translate](https://gdal.org/programs/gdal_translate.html) command.
Expand Down Expand Up @@ -184,8 +191,10 @@ Utility for rendering and computing DEM metrics. This is the equivalent of the [
A promise that resolves to a new `GDALDataset`.
# Developing
Yarn and NVM are required.
After cloning,
1. `nvm use`
1. `yarn install`
2. `yarn dev` and in another session `yarn test:watch`
Expand Down
42 changes: 22 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"name": "loam",
"version": "1.1.0",
"version": "1.1.1",
"description": "Javascript wrapper for GDAL in the browser",
"main": "lib/loam.js",
"scripts": {
"build": "webpack --config=webpack.prod.js",
"build": "webpack --config=webpack.dev.js && webpack --config=webpack.prod.js",
"dev": "webpack --progress --color --watch --config=webpack.dev.js",
"demo": "webpack serve --config=webpack.dev.js",
"format": "prettier --write ./src",
"test": "karma start --single-run --browser ChromeHeadless karma.conf.js",
"test:watch": "karma start --auto-watch --browser ChromeHeadless karma.conf.js",
"test:ci": "webpack --config=webpack.dev.js && webpack --config=webpack.prod.js && karma start --single-run --browser ChromeHeadless karma.conf.js"
"test:ci": "prettier --check src/**/*.js && webpack --config=webpack.dev.js && webpack --config=webpack.prod.js && karma start --single-run --browser ChromeHeadless karma.conf.js"
},
"repository": {
"type": "git",
Expand All @@ -32,31 +33,32 @@
],
"homepage": "https://github.com/azavea/loam",
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"babel-eslint": "^10.0.0",
"babel-loader": "^8.0.0",
"babel-plugin-add-module-exports": "^1.0.2",
"chai": "^4.1.2",
"@babel/cli": "^7.18.10",
"@babel/core": "^7.19.1",
"@babel/eslint-parser": "^7.19.1",
"@babel/preset-env": "^7.19.1",
"babel-loader": "^8.2.5",
"babel-plugin-add-module-exports": "^1.0.4",
"chai": "^4.3.6",
"chai-as-promised": "^7.1.1",
"eslint": "^7.31.0",
"eslint-webpack-plugin": "^3.0.1",
"karma": "^4.0.0",
"karma-babel-preprocessor": "^8.0.0",
"karma": "^6.4.1",
"karma-babel-preprocessor": "^8.0.2",
"karma-chai": "^0.1.0",
"karma-chai-as-promised": "^0.1.2",
"karma-chrome-launcher": "^3.1.0",
"karma-mocha": "^1.3.0",
"mocha": "^6.0.0",
"prettier": "^2.1.2",
"karma-chrome-launcher": "^3.1.1",
"karma-mocha": "^2.0.1",
"mocha": "^10.0.0",
"prettier": "^2.7.1",
"uglifyjs-webpack-plugin": "^2.2.0",
"webpack": "^5.35.1",
"webpack": "^5.74.0",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^4.0.0-rc.0",
"yargs": "^14.0.0"
"webpack-dev-server": "^4.11.1",
"yargs": "^17.5.1"
},
"dependencies": {
"gdal-js": "2.0.0"
}
},
"packageManager": "[email protected]"
}
4 changes: 1 addition & 3 deletions src/wrappers/gdalClose.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ export default function (GDALClose, errorHandling) {
// Check for errors; throw if error is detected
// Note that due to https://github.com/ddohler/gdal-js/issues/38 this can only check for
// CEFatal errors in order to avoid raising an exception on GDALClose
if (
errorType === errorHandling.CPLErr.CEFatal
) {
if (errorType === errorHandling.CPLErr.CEFatal) {
let message = errorHandling.CPLGetLastErrorMsg();

throw new Error('Error in GDALClose: ' + message);
Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const config = {
},
output: {
path: path.join(__dirname, 'lib'),
filename: '[name].js',
filename: '[name].min.js',
library: {
name: 'loam',
type: 'umd',
Expand Down
Loading

0 comments on commit 43984a1

Please sign in to comment.