Skip to content

Commit

Permalink
Merge pull request #116 from AR-js-org/ES6
Browse files Browse the repository at this point in the history
Webpack Build for AR.js (follow-up)
  • Loading branch information
kalwalt authored Nov 16, 2021
2 parents 6812d75 + 9df0e1d commit fccd194
Show file tree
Hide file tree
Showing 105 changed files with 54,729 additions and 139,662 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
.atom-live-server.json
node_modules/*
package-lock.json
aframe/build/*.txt
three.js/build/*.txt
8 changes: 8 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
aframe/examples/**/**/*
aframe/examples/**/*
aframe/examples/*
three.js/examples/**/**/*
three.js/examples/**/*
three.js/examples/*
test/**/*
test/*
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- Deactivated GPS listener when AR.js app not in the foreground (thanks to @NVFedorov for raising this issue)

- update license wording (thanks to @chingucoding)

# 3.3.1

- Fix minor location-based bugs
Expand Down
16 changes: 0 additions & 16 deletions Makefile

This file was deleted.

11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ Please follow this simple steps:
</body>
</html>
```
Important! Be aware that if you are referring to external resources, in any app, especially those using NFT, you will encounter CORS problems if those resources are not in the same server of the code. If you can’t see the tracking, please open your Browser Dev Tools and check if you have CORS errors in the console. If so, you have to fix those errors in order to see your content. The correct fix is to place your resources on the same server of your code.

If you cannot do that, you can host a proxy anywhere server to solve that (https://github.com/Rob--W/cors-anywhere).
Please note that several hosting services have policies that does not permit to use such server. Always check hosting services policies before using them to avoid account suspensions

Important! Be aware that if you are referring to external resources, in any app, especially those using NFT, you will encounter CORS problems if those resources are not in the same server of the code. If you can’t see the tracking, please open your Browser Dev Tools and check if you have CORS errors in the console. If so, you have to fix those errors in order to see your content. The correct fix is to place your resources on the same server of your code.

Expand All @@ -205,6 +209,13 @@ Please note that several hosting services have policies that does not permit to

Learn more on the [AR.js Official Documentation](https://ar-js-org.github.io/AR.js-Docs/).

## Experimental ES6 npm package

Even if not yet in the master branch, you can install **AR.js** with NPM:

```
npm install @ar-js-org/ar.js
```
## Troubleshooting, feature requests, community

**You can find a lot of help on the old [AR.js repositories issues](https://github.com/jeromeetienne/AR.js/issues). Please search on open/closed issues, you may find interesting stuff.**
Expand Down
27 changes: 0 additions & 27 deletions aframe/Makefile

This file was deleted.

Loading

0 comments on commit fccd194

Please sign in to comment.