Skip to content

Commit fde0a12

Browse files
authored
Merge pull request #112 from netlify/rebundle
Rebundle
2 parents 98ce399 + 2afeafd commit fde0a12

11 files changed

+8386
-427
lines changed

.babelrc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
{
22
"sourceMaps": true,
33
"presets": [
4-
["es2015", { "loose":true }],
4+
["env", {
5+
"targets": {
6+
"browsers": ["ie >= 11"]
7+
}
8+
}],
59
"stage-0"
610
],
711
"plugins": [
812
["transform-decorators-legacy"],
9-
["transform-react-jsx", { "pragma": "h" }]
13+
["transform-react-jsx", { "pragma": "h" }],
14+
["transform-object-rest-spread", { "useBuiltIns": true }]
1015
]
1116
}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
/coverage
55
/.idea
66
/.vscode
7-
node_modules
7+
node_modules
8+
dist

RELEASE.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,3 @@
88
- [ ] `git push && git push --tags`
99
- [ ] Assign draft gh-release to new tag and publish release notes and double check everything looks right.
1010
- [ ] `npm publish`
11-
12-
Helpful changelog / release tools:
13-
14-
- https://github.com/rvagg/changelog-maker

package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "netlify-identity-widget",
3-
"version": "1.4.1",
3+
"version": "1.4.2-beta-2",
44
"releaseVersion": "v1",
55
"description": "Netlify Identity widget for easy integration",
66
"scripts": {
@@ -12,7 +12,7 @@
1212
"prepublish": "run-s build",
1313
"build": "run-p build:*",
1414
"build:bundle": "cross-env NODE_ENV=production webpack --config webpack.config.babel.js",
15-
"build:umd": "cross-env NODE_ENV=production webpack --config webpack.umd.config.babel.js",
15+
"build:umd": "webpack --config webpack.umd.config.babel.js",
1616
"prebuild": "rimraf build && mkdirp build",
1717
"test": "eslint src",
1818
"release": "node ./script/release.js",
@@ -30,43 +30,44 @@
3030
"devDependencies": {
3131
"babel-cli": "^6.5.2",
3232
"babel-core": "^6.24.0",
33-
"babel-eslint": "^7.2.2",
33+
"babel-eslint": "^8.1.2",
3434
"babel-loader": "^7.0.0",
3535
"babel-plugin-transform-decorators-legacy": "^1.3.4",
36+
"babel-plugin-transform-object-rest-spread": "^6.26.0",
3637
"babel-plugin-transform-react-jsx": "^6.8.0",
37-
"babel-preset-es2015": "^6.24.0",
38+
"babel-preset-env": "^1.6.1",
3839
"babel-preset-stage-0": "^6.5.0",
3940
"babel-register": "^6.24.0",
4041
"babel-runtime": "^6.11.6",
42+
"caniuse-lite": "^1.0.30000787",
4143
"cross-env": "^5.0.1",
4244
"css-loader": "^0.28.0",
4345
"eslint": "^4.1.0",
4446
"eslint-config-prettier": "^2.4.0",
4547
"eslint-plugin-import": "^2.7.0",
4648
"eslint-plugin-prettier": "^2.2.0",
4749
"eslint-plugin-react": "^7.0.0",
48-
"file-loader": "^0.11.1",
50+
"file-loader": "^1.1.6",
4951
"gotrue-js": "^0.9.15",
5052
"html-webpack-plugin": "^2.28.0",
5153
"json-loader": "^0.5.4",
5254
"mkdirp": "^0.5.1",
5355
"mobx": "^3.2.2",
54-
"mobx-preact": "^0.3.1",
56+
"mobx-preact": "^1.1.0",
5557
"npm-run-all": "^4.1.1",
5658
"postcss-cssnext": "^3.0.2",
57-
"postcss-import": "^10.0.0",
59+
"postcss-import": "^11.0.0",
5860
"postcss-loader": "^2.0.3",
59-
"postcss-nested": "^2.1.2",
61+
"postcss-nested": "^3.0.0",
6062
"preact": "^8.1.0",
61-
"preact-compat": "^3.15.0",
6263
"prettier": "^1.6.1",
6364
"raw-loader": "^0.5.1",
6465
"rimraf": "^2.6.2",
6566
"serve": "^6.0.0",
6667
"source-map-loader": "^0.2.1",
67-
"url-loader": "^0.5.8",
68+
"url-loader": "^0.6.2",
6869
"webpack": "^3.0.0",
69-
"webpack-dev-server": "^2.4.4"
70-
},
71-
"dependencies": {}
70+
"webpack-dev-server": "^2.4.4",
71+
"webpack-node-externals": "^1.6.0"
72+
}
7273
}

releases/v1/netlify-identity-widget.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

releases/v1/netlify-identity-widget.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

releases/v1/netlify-identity.js

Lines changed: 7878 additions & 2 deletions
Large diffs are not rendered by default.

releases/v1/netlify-identity.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webpack.config.babel.js

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,7 @@ module.exports = {
2121
},
2222

2323
resolve: {
24-
extensions: [".jsx", ".js", ".json"],
25-
modules: [
26-
path.resolve(__dirname, "src/lib"),
27-
path.resolve(__dirname, "node_modules"),
28-
"node_modules"
29-
],
30-
alias: {
31-
components: path.resolve(__dirname, "src/components"), // used for tests
32-
style: path.resolve(__dirname, "src/style"),
33-
react: "preact-compat",
34-
"react-dom": "preact-compat"
35-
}
24+
extensions: [".jsx", ".js", ".json"]
3625
},
3726

3827
module: {
@@ -45,7 +34,7 @@ module.exports = {
4534
},
4635
{
4736
test: /\.jsx?$/,
48-
exclude: /node_modules/,
37+
exclude: /(micro-api-client|lodash)/,
4938
use: "babel-loader"
5039
},
5140
{
@@ -80,6 +69,8 @@ module.exports = {
8069
}
8170
]
8271
},
72+
// See the other webpack config before changing the order of plugins.
73+
// They modify the plugins array by index
8374
plugins: [
8475
new webpack.NoEmitOnErrorsPlugin(),
8576
new webpack.DefinePlugin({

webpack.umd.config.babel.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ const umdConfig = Object.assign({}, baseConfig, {
1313
library: "netlifyIdentity",
1414
libraryTarget: "umd",
1515
libraryExport: "default"
16-
}
17-
})
16+
},
17+
devtool: "hidden-source-map"
18+
});
1819

19-
umdConfig.plugins.splice(2,1) // Remove html plugin
20+
umdConfig.plugins.splice(2, 1); // Remove html plugin
2021

21-
module.exports = umdConfig
22+
module.exports = umdConfig;

0 commit comments

Comments
 (0)