diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a87702ed..492373788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ + +## [0.0.4](https://github.com/algolia/docsearch/compare/v0.0.3...v0.0.4) (2015-12-16) + + + + ## [0.0.3](https://github.com/algolia/docsearch/compare/v0.0.2...v0.0.3) (2015-12-16) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 37f49969d..0aa47acad 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "docsearch.js", - "version": "0.0.3", + "version": "0.0.4", "npm-shrinkwrap-version": "200.4.0", "node-version": "v4.2.2", "dependencies": { @@ -10184,31 +10184,113 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-factory/-/to-factory-1.0.0.tgz" }, - "uglifyjs": { - "version": "2.4.10", - "resolved": "https://registry.npmjs.org/uglifyjs/-/uglifyjs-2.4.10.tgz", + "uglify-js": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz", "dependencies": { "async": { "version": "0.2.10", "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" }, "source-map": { - "version": "0.1.34", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", - "dependencies": { - "amdefine": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" - } - } + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz" }, "uglify-to-browserify": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" }, "yargs": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz" + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "dependencies": { + "center-align": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.2.tgz", + "dependencies": { + "align-text": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz", + "dependencies": { + "kind-of": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", + "dependencies": { + "is-buffer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz" + } + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" + }, + "repeat-string": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz" + } + } + }, + "lazy-cache": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz" + } + } + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "dependencies": { + "align-text": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.3.tgz", + "dependencies": { + "kind-of": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz", + "dependencies": { + "is-buffer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.0.tgz" + } + } + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" + }, + "repeat-string": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz" + } + } + } + } + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + } + } + }, + "decamelize": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz" + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + } + } } } }, diff --git a/package.json b/package.json index 89d321d09..2faa6506a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docsearch.js", - "version": "0.0.3", + "version": "0.0.4", "description": "Add an autocomplete dropdown to your documentation", "main": "dist/npm/index.js", "scripts": { @@ -48,7 +48,7 @@ "postcss-cli": "^2.3.2", "pretty-bytes": "^2.0.1", "semver": "^5.1.0", - "uglifyjs": "^2.4.10", + "uglify-js": "^2.6.1", "webpack": "^1.12.2", "webpack-dev-server": "^1.12.1" }, diff --git a/scripts/build-js b/scripts/build-js index ece1c8908..ed8898f51 100755 --- a/scripts/build-js +++ b/scripts/build-js @@ -8,15 +8,18 @@ DIST_DIR_CDN="dist/cdn" DIST_DIR_NPM="dist/npm" DIST_FILE="$DIST_DIR_CDN/${NAME}.js" DIST_FILE_MIN="$DIST_DIR_CDN/${NAME}.min.js" -DIST_FILE_SOURCEMAP="$DIST_DIR_CDN/${NAME}.min.map" +DIST_FILE_SOURCEMAP="$DIST_DIR_CDN/${NAME}.js.map" +DIST_FILE_SOURCEMAP_MIN="$DIST_DIR_CDN/${NAME}.min.js.map" mkdir -p "$DIST_DIR_CDN" "$DIST_DIR_NPM" # docsearch.js as one ES5 file + minified version and source maps webpack --config webpack.config.jsdelivr.babel.js echo "$LICENSE" | cat - "${DIST_FILE}" > /tmp/out && mv /tmp/out "${DIST_FILE}" + uglifyjs "${DIST_FILE}" \ - --source-map "${DIST_FILE_SOURCEMAP}" \ + --in-source-map "${DIST_FILE_SOURCEMAP}" \ + --source-map "${DIST_FILE_SOURCEMAP_MIN}" \ --preamble "$LICENSE" \ -c warnings=false \ -m \ diff --git a/src/lib/version.js b/src/lib/version.js index 204805135..e1ac92388 100644 --- a/src/lib/version.js +++ b/src/lib/version.js @@ -1 +1 @@ -export default '0.0.3'; +export default '0.0.4'; diff --git a/webpack.config.jsdelivr.babel.js b/webpack.config.jsdelivr.babel.js index 83cd5167e..3055c9d36 100644 --- a/webpack.config.jsdelivr.babel.js +++ b/webpack.config.jsdelivr.babel.js @@ -1,5 +1,9 @@ +import webpack from 'webpack'; +import {join} from 'path'; + export default { entry: './index.js', + devtool: 'source-map', output: { path: './dist/cdn', filename: 'docsearch.js', @@ -11,6 +15,18 @@ export default { test: /\.js$/, exclude: /node_modules/, loader: 'babel' }] }, - externals: [], - plugins: [] + resolve: { + fallback: [join(__dirname, '..', 'node_modules')] + }, + // same issue, for loaders like babel + resolveLoader: { + fallback: [join(__dirname, '..', 'node_modules')] + }, + plugins: [ + new webpack.DefinePlugin({ + 'process.env': { + NODE_ENV: JSON.stringify(process.env.NODE_ENV) + } + }) + ] }; diff --git a/webpack.dev.config.babel.js b/webpack.dev.config.babel.js index 7b7fe43c9..f9ed4e1dd 100644 --- a/webpack.dev.config.babel.js +++ b/webpack.dev.config.babel.js @@ -1,3 +1,5 @@ +import {join} from 'path'; + export default { entry: './dev/app.js', devtool: 'source-map', @@ -14,5 +16,15 @@ export default { contentBase: 'dev/', host: '0.0.0.0', compress: true - } + }, + // when module not found, find locally first + // helps fixing the npm link not working with webpack + // http://stackoverflow.com/a/33722844/147079 + resolve: { + fallback: [join(__dirname, '..', 'node_modules')] + }, + // same issue, for loaders like babel + resolveLoader: { + fallback: [join(__dirname, '..', 'node_modules')] + }, };