Skip to content
This repository has been archived by the owner on Sep 28, 2018. It is now read-only.

fix browserify build #70

Closed
wants to merge 6 commits into from
Closed

fix browserify build #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2af063
fix browserify build
calvinmetcalf Mar 28, 2017
541fea3
fix up
calvinmetcalf Jun 9, 2017
21c13cb
0.6.5
calvinmetcalf Jun 9, 2017
93dc28a
change name
calvinmetcalf Jun 9, 2017
c12eb15
0.6.5
calvinmetcalf Jun 9, 2017
4aff951
0.6.7
calvinmetcalf Jun 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions bower.json
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
// This is free and unencumbered software released into the public domain.
// See LICENSE.md for more information.

var encoding = require("./lib/encoding.js");

module.exports = {
TextEncoder: encoding.TextEncoder,
TextDecoder: encoding.TextDecoder,
};
module.exports = require("./lib/encoding.js");
6 changes: 1 addition & 5 deletions lib/encoding-indexes.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions lib/encoding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
// If we're in node require encoding-indexes and attach it to the global.
if (typeof module !== "undefined" && module.exports &&
!global["encoding-indexes"]) {
global["encoding-indexes"] =
require("./encoding-indexes.js")["encoding-indexes"];
require("./encoding-indexes.js");
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This directly conflicts with the change made for b4e5bc2 for #67

}

//
Expand Down Expand Up @@ -3310,4 +3309,4 @@

// For strict environments where `this` inside the global scope
// is `undefined`, take a pure object instead
}(this || {}));
}(this || {}));
7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "text-encoding",
"name": "text-encoding-polyfill",
"author": "Joshua Bell <[email protected]>",
"contributors": [
"Joshua Bell <[email protected]>",
Expand All @@ -12,7 +12,7 @@
"Pierre Queinnec <[email protected]>",
"Zack Weinberg <[email protected]>"
],
"version": "0.6.4",
"version": "0.6.7",
"description": "Polyfill for the Encoding Living Standard's API.",
"main": "index.js",
"files": [
Expand All @@ -29,6 +29,9 @@
"decoding",
"living standard"
],
"browser": {
"./lib/encoding-indexes.js": false
},
"bugs": {
"url": "https://github.com/inexorabletash/text-encoding/issues"
},
Expand Down