Merge pull request #65 from netlify/fix-module-export

Fix module API export

Author: bcomnes

Diff for: README.md

@@ -60,6 +60,11 @@ loginModal.close()
 loginModal.logout();
 ```
 
+#### A note on script tag versioning
+
+The `v1` in the above URL is not pinned to the major version of the module API, and will only reflect breaking changes in the
+markup API.
+
 ### Module API
 
 Netlify Identity Widget also has a [module api](https://www.npmjs.com/package/netlify-identity-widget):
@@ -71,33 +76,31 @@ yarn add netlify-identity-widget
 Import or require as usual:
 
 ```js
-import NetlifyIdentity from "netlify-identity-widget"
-// or
-const netlifyIdentity = require("netlify-identity-widget");
+const netlifyIdentity =  require("netlify-identity-widget")
 
 netlifyIdentity.init({
   container: "#netlify-modal" // defaults to document.body
 });
 
-identity.open() // open the modal
+netlifyIdentity.open() // open the modal
 
-identity.on('init', user => console.log(user))
-identity.on('login', login => console.log(user))
-identity.on('logout', () => console.log("Logged out"))
-identity.on('error', err => console.error("Logged out"))
-identity.on('open', () => console.log("Widget opened"))
-identity.on('close', () => console.log("Widget closed"))
+netlifyIdentity.on('init', user => console.log(user))
+netlifyIdentity.on('login', login => console.log(user))
+netlifyIdentity.on('logout', () => console.log("Logged out"))
+netlifyIdentity.on('error', err => console.error("Logged out"))
+netlifyIdentity.on('open', () => console.log("Widget opened"))
+netlifyIdentity.on('close', () => console.log("Widget closed"))
 
 // Close the modal
 identity.close()
 
 // Logout the user
-loginModal.logout();
+netlifyIdentity.logout();
 
 // Access the underlying gotrue instance.
 // Note that doing things directly through gotrue brings a risk of getting out of
 // sync between your state and the widgets state.
-identity.gotrue
+netlifyIdentity.gotrue
 ```
 
 ## Localhost

Diff for: package.json

@@ -1,14 +1,17 @@
 {
   "name": "netlify-identity-widget",
   "version": "1.0.0",
+  "releaseVersion": "v1",
   "description": "Netlify Identity widget for easy integration",
   "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack-dev-server --inline --progress",
+    "dev": "cross-env NODE_ENV=development webpack-dev-server --inline --progress --config webpack.config.babel.js",
     "start": "serve build -s -c 1",
-    "prestart": "npm run build",
-    "version": "npm run release",
-    "prepublish": "npm run build",
-    "build": "cross-env NODE_ENV=production webpack --progress",
+    "prestart": "run-s build",
+    "version": "run-s release",
+    "prepublish": "run-s build",
+    "build": "run-p build:*",
+    "build:bundle": "cross-env NODE_ENV=production webpack --progress --config webpack.config.babel.js",
+    "build:umd": "cross-env NODE_ENV=production webpack --progress --config webpack.umd.config.babel.js",
     "prebuild": "mkdirp build",
     "test": "eslint src",
     "release": "node ./script/release.js",
@@ -42,27 +45,26 @@
     "eslint-plugin-prettier": "^2.2.0",
     "eslint-plugin-react": "^7.0.0",
     "file-loader": "^0.11.1",
+    "gotrue-js": "^0.9.8",
     "html-webpack-plugin": "^2.28.0",
     "json-loader": "^0.5.4",
     "mkdirp": "^0.5.1",
+    "mobx": "^3.2.2",
+    "mobx-preact": "^0.3.1",
+    "npm-run-all": "^4.1.1",
+    "postcss-cssnext": "^3.0.2",
+    "postcss-import": "^10.0.0",
     "postcss-loader": "^2.0.3",
+    "postcss-nested": "^2.1.2",
+    "preact": "^8.1.0",
+    "preact-compat": "^3.15.0",
     "prettier": "^1.6.1",
     "raw-loader": "^0.5.1",
-    "semver": "^5.4.1",
+    "serve": "^6.0.0",
     "source-map-loader": "^0.2.1",
     "url-loader": "^0.5.8",
     "webpack": "^3.0.0",
     "webpack-dev-server": "^2.4.4"
   },
-  "dependencies": {
-    "gotrue-js": "^0.9.8",
-    "mobx": "^3.2.2",
-    "mobx-preact": "^0.3.1",
-    "postcss-cssnext": "^3.0.2",
-    "postcss-import": "^10.0.0",
-    "postcss-nested": "^2.1.2",
-    "preact": "^8.1.0",
-    "preact-compat": "^3.15.0",
-    "serve": "^6.0.0"
-  }
+  "dependencies": {}
 }

Diff for: script/release.js

@@ -1,7 +1,6 @@
 /* eslint no-console: "off" */
 const exec = require("child_process").execSync;
-const semver = require("semver");
-const version = "v" + semver(require("../package.json").version).major;
+const version = require("../package.json").releaseVersion;
 
 console.log("Building new release for ", version);
 

Diff for: src/index.ejs

@@ -206,6 +206,16 @@
 		}
 
 	</style>
+
+	<script>
+			// Bind to events
+		netlifyIdentity.on("init", user => console.log(user));
+		netlifyIdentity.on("login", user => console.log(user));
+		netlifyIdentity.on("logout", () => console.log("Logged out"));
+		netlifyIdentity.on("error", err => console.error("Logged out"));
+		netlifyIdentity.on("open", () => console.log("Widget opened"));
+		netlifyIdentity.on("close", () => console.log("Widget closed"));
+</script>
 </head>
 <body>
 	<div class="main">

Diff for: src/netlify-identity.js

@@ -212,7 +212,9 @@ function init(options) {
   };
   setStyle(iframe, iframeStyle);
   iframe.src = "about:blank";
-  const container = options.container ? document.querySelector : document.body;
+  const container = options.container
+    ? document.querySelector(options.container)
+    : document.body;
   container.appendChild(iframe);
   /* There's a certain case where we might have called setStyle before the iframe was ready.
 	   Make sure we take the last style and apply it */

Diff for: webpack.config.babel.js

@@ -12,7 +12,6 @@ module.exports = {
   context: path.resolve(__dirname, "src"),
   entry: {
     "netlify-identity-widget": "./index.js",
-    "netlify-identity": "./netlify-identity.js"
   },
 
   output: {

Diff for: webpack.umd.config.babel.js

@@ -0,0 +1,21 @@
+import baseConfig from "./webpack.config.babel.js";
+import path from "path";
+
+const umdConfig = Object.assign({}, baseConfig, {
+  entry: {
+    "netlify-identity": "./netlify-identity.js"
+  },
+
+  output: {
+    path: path.resolve(__dirname, "build"),
+    publicPath: "/",
+    filename: "[name].js",
+    library: "netlifyIdentity",
+    libraryTarget: "umd",
+    libraryExport: "default"
+  }
+})
+
+umdConfig.plugins.splice(2,1) // Remove html plugin
+
+module.exports = umdConfig