Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebundle #112

Merged
merged 4 commits into from
Jan 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
{
"sourceMaps": true,
"presets": [
["es2015", { "loose":true }],
["env", {
"targets": {
"browsers": ["ie >= 11"]
}
}],
"stage-0"
],
"plugins": [
["transform-decorators-legacy"],
["transform-react-jsx", { "pragma": "h" }]
["transform-react-jsx", { "pragma": "h" }],
["transform-object-rest-spread", { "useBuiltIns": true }]
]
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
/coverage
/.idea
/.vscode
node_modules
node_modules
dist
4 changes: 0 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@
- [ ] `git push && git push --tags`
- [ ] Assign draft gh-release to new tag and publish release notes and double check everything looks right.
- [ ] `npm publish`

Helpful changelog / release tools:

- https://github.com/rvagg/changelog-maker
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "netlify-identity-widget",
"version": "1.4.1",
"version": "1.4.2-beta-2",
"releaseVersion": "v1",
"description": "Netlify Identity widget for easy integration",
"scripts": {
Expand All @@ -12,7 +12,7 @@
"prepublish": "run-s build",
"build": "run-p build:*",
"build:bundle": "cross-env NODE_ENV=production webpack --config webpack.config.babel.js",
"build:umd": "cross-env NODE_ENV=production webpack --config webpack.umd.config.babel.js",
"build:umd": "webpack --config webpack.umd.config.babel.js",
"prebuild": "rimraf build && mkdirp build",
"test": "eslint src",
"release": "node ./script/release.js",
Expand All @@ -30,43 +30,44 @@
"devDependencies": {
"babel-cli": "^6.5.2",
"babel-core": "^6.24.0",
"babel-eslint": "^7.2.2",
"babel-eslint": "^8.1.2",
"babel-loader": "^7.0.0",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-react-jsx": "^6.8.0",
"babel-preset-es2015": "^6.24.0",
"babel-preset-env": "^1.6.1",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.24.0",
"babel-runtime": "^6.11.6",
"caniuse-lite": "^1.0.30000787",
"cross-env": "^5.0.1",
"css-loader": "^0.28.0",
"eslint": "^4.1.0",
"eslint-config-prettier": "^2.4.0",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-prettier": "^2.2.0",
"eslint-plugin-react": "^7.0.0",
"file-loader": "^0.11.1",
"file-loader": "^1.1.6",
"gotrue-js": "^0.9.15",
"html-webpack-plugin": "^2.28.0",
"json-loader": "^0.5.4",
"mkdirp": "^0.5.1",
"mobx": "^3.2.2",
"mobx-preact": "^0.3.1",
"mobx-preact": "^1.1.0",
"npm-run-all": "^4.1.1",
"postcss-cssnext": "^3.0.2",
"postcss-import": "^10.0.0",
"postcss-import": "^11.0.0",
"postcss-loader": "^2.0.3",
"postcss-nested": "^2.1.2",
"postcss-nested": "^3.0.0",
"preact": "^8.1.0",
"preact-compat": "^3.15.0",
"prettier": "^1.6.1",
"raw-loader": "^0.5.1",
"rimraf": "^2.6.2",
"serve": "^6.0.0",
"source-map-loader": "^0.2.1",
"url-loader": "^0.5.8",
"url-loader": "^0.6.2",
"webpack": "^3.0.0",
"webpack-dev-server": "^2.4.4"
},
"dependencies": {}
"webpack-dev-server": "^2.4.4",
"webpack-node-externals": "^1.6.0"
}
}
2 changes: 1 addition & 1 deletion releases/v1/netlify-identity-widget.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion releases/v1/netlify-identity-widget.js.map

Large diffs are not rendered by default.

7,880 changes: 7,878 additions & 2 deletions releases/v1/netlify-identity.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion releases/v1/netlify-identity.js.map

Large diffs are not rendered by default.

17 changes: 4 additions & 13 deletions webpack.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@ module.exports = {
},

resolve: {
extensions: [".jsx", ".js", ".json"],
modules: [
path.resolve(__dirname, "src/lib"),
path.resolve(__dirname, "node_modules"),
"node_modules"
],
alias: {
components: path.resolve(__dirname, "src/components"), // used for tests
style: path.resolve(__dirname, "src/style"),
react: "preact-compat",
"react-dom": "preact-compat"
}
extensions: [".jsx", ".js", ".json"]
},

module: {
Expand All @@ -45,7 +34,7 @@ module.exports = {
},
{
test: /\.jsx?$/,
exclude: /node_modules/,
exclude: /(micro-api-client|lodash)/,
use: "babel-loader"
},
{
Expand Down Expand Up @@ -80,6 +69,8 @@ module.exports = {
}
]
},
// See the other webpack config before changing the order of plugins.
// They modify the plugins array by index
plugins: [
new webpack.NoEmitOnErrorsPlugin(),
new webpack.DefinePlugin({
Expand Down
9 changes: 5 additions & 4 deletions webpack.umd.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ const umdConfig = Object.assign({}, baseConfig, {
library: "netlifyIdentity",
libraryTarget: "umd",
libraryExport: "default"
}
})
},
devtool: "hidden-source-map"
});

umdConfig.plugins.splice(2,1) // Remove html plugin
umdConfig.plugins.splice(2, 1); // Remove html plugin

module.exports = umdConfig
module.exports = umdConfig;
Loading