Skip to content

Commit

Permalink
Merge branch 'master' of github.com:parcel-bundler/parcel
Browse files Browse the repository at this point in the history
  • Loading branch information
devongovett committed Mar 6, 2019
2 parents 981218d + 2a55296 commit ba1ffd1
Show file tree
Hide file tree
Showing 165 changed files with 3,683 additions and 1,578 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.json
Expand Up @@ -13,5 +13,8 @@
"globals": {
"parcelRequire": true,
"define": true
},
"rules": {
"no-return-await": "error"
}
}
4 changes: 2 additions & 2 deletions CHANGELOG.md
Expand Up @@ -14,7 +14,7 @@ and parcel adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
- Add support for HMR with elm-hot [Details](https://github.com/parcel-bundler/parcel/pull/2388)
- Log dev server access for log level verbose or more [Details](https://github.com/parcel-bundler/parcel/pull/2402)
- Process array of assets for JSON-LD [Details](https://github.com/parcel-bundler/parcel/pull/2319)
- Extract workerfarm into seperate package [Details](https://github.com/parcel-bundler/parcel/pull/2162)
- Extract workerfarm into separate package [Details](https://github.com/parcel-bundler/parcel/pull/2162)
- Extract Logger into its own package [Details](https://github.com/parcel-bundler/parcel/pull/2165)
- Extract watcher into its own package [Details](https://github.com/parcel-bundler/parcel/pull/2176)
- Merge fs-watcher-child into Parcel's monorepo [Details](https://github.com/parcel-bundler/parcel/pull/2197)
Expand Down Expand Up @@ -538,7 +538,7 @@ and parcel adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

- Opencollective [Details](https://github.com/parcel-bundler/parcel/commit/0f554dc2f5c8f2557ec84eee5301b90ffb279764)
- Use `JSON5` to parse config files [Details](https://github.com/parcel-bundler/parcel/commit/bd458660ce38e7a1d25bd9758084acc24418e054)
- Move JSAsset options gathering into seperate function [Details](https://github.com/parcel-bundler/parcel/commit/333c3aa5d20f98a5f3c52635751032d12854c13c)
- Move JSAsset options gathering into separate function [Details](https://github.com/parcel-bundler/parcel/commit/333c3aa5d20f98a5f3c52635751032d12854c13c)

### Fixed

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -36,7 +36,7 @@ or with npm:
npm install -g parcel-bundler
```

2. Parcel can take any type of file as an entry point, but an HTML or JavaScript file is a good place to start. If you link your main JavaScript file in the HTML using a relative path, Parcel will also process it for you, and replace the reference with a URL to the output file.
2. Parcel can take any type of file as an entry point, but a HTML or JavaScript file is a good place to start. If you link your main JavaScript file in the HTML using a relative path, Parcel will also process it for you, and replace the reference with a URL to the output file.

```html
<html>
Expand All @@ -46,7 +46,7 @@ npm install -g parcel-bundler
</html>
```

3. Parcel has a development server built in, which will automatically rebuild your app as you change files and supports hot module replacement for fast development. Just point it at your entry file:
3. Parcel has a development server built in which will automatically rebuild your app as you change files and supports hot module replacement for fast development. Just point it at your entry file:

```shell
parcel index.html
Expand Down
3 changes: 3 additions & 0 deletions packages/core/fs/package.json
Expand Up @@ -11,6 +11,9 @@
"engines": {
"node": ">= 6.0.0"
},
"publishConfig": {
"access": "public"
},
"scripts": {
"test": "echo this package has no tests yet",
"test-ci": "yarn build && yarn test",
Expand Down
7 changes: 6 additions & 1 deletion packages/core/integration-tests/test/bundler.js
@@ -1,7 +1,12 @@
const assert = require('assert');
const sinon = require('sinon');
const path = require('path');
const {assertBundleTree, bundle, bundler, nextBundle} = require('./utils');
const {
assertBundleTree,
bundle,
bundler,
nextBundle
} = require('@parcel/test-utils');

describe('bundler', function() {
it('should bundle once before exporting middleware', async function() {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/integration-tests/test/contentHashing.js
@@ -1,7 +1,7 @@
const assert = require('assert');
const path = require('path');
const fs = require('@parcel/fs');
const {bundle, rimraf, ncp} = require('./utils');
const {bundle, rimraf, ncp} = require('@parcel/test-utils');

describe('content hashing', function() {
beforeEach(async function() {
Expand Down

0 comments on commit ba1ffd1

Please sign in to comment.