Merge branch 'v2' into semver

Author: aminya

.flowconfig

@@ -35,4 +35,4 @@ untyped-import
 untyped-type-import
 
 [version]
-0.150.0
+0.151.0

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Please be polite and take the time to write a well-worded question so our commun
 
 In order to make it easier to get familiar with the codebase we labeled simpler issues using [Good First Issue](https://github.com/parcel-bundler/parcel/issues?q=is%3Aopen+is%3Aissue+label%3A%22%E2%9C%A8+Parcel+2%22+label%3A%22%3Ababy%3A+Good+First+Issue%22) and [Help Wanted](https://github.com/parcel-bundler/parcel/issues?q=is%3Aopen+is%3Aissue+label%3A%22%E2%9C%A8+Parcel+2%22+label%3A%22%3Apray%3A+Help+Wanted%22).
 
-Before starting make sure you have the following requirements installed: [git](https://git-scm.com), [Node](https://nodejs.org) and [Yarn](https://yarnpkg.com).
+Before starting make sure you have the following requirements installed: [git](https://git-scm.com), [Node](https://nodejs.org), [Yarn](https://yarnpkg.com) and [Rust](https://www.rust-lang.org/tools/install).
 
 The process starts by [forking](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo) the project and setup a new branch to work in. It's important that the changes are made in separated branches in order to ensure a pull request only includes the commits related to a bug or feature.
 
@@ -24,6 +24,7 @@ Clone the forked repository locally and install the dependencies:
 git clone https://github.com/USERNAME/parcel.git
 cd parcel
 yarn install
+yarn build-native
 ```
 
 In the folder `packages/example`, create a temporary example to debug. You can start by copying the `simple` example and try to reproduce the bug.

Cargo.lock

@@ -40,7 +40,7 @@
     "cross-env": "^7.0.0",
     "doctoc": "^1.4.0",
     "eslint": "^7.20.0",
-    "flow-bin": "0.150.0",
+    "flow-bin": "0.151.0",
     "glob": "^7.1.6",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",

package.json

@@ -30,7 +30,7 @@
     "@parcel/logger": "2.0.0-beta.2",
     "@parcel/package-manager": "2.0.0-beta.2",
     "@parcel/plugin": "2.0.0-beta.2",
-    "@parcel/source-map": "2.0.0-alpha.4.21",
+    "@parcel/source-map": "2.0.0-rc.1.0",
     "@parcel/types": "2.0.0-beta.2",
     "@parcel/utils": "2.0.0-beta.2",
     "@parcel/workers": "2.0.0-beta.2",

packages/core/core/package.json

@@ -110,7 +110,7 @@ export default class CommittedAsset {
         if (mapBuffer) {
           // Get sourcemap from flatbuffer
           let map = new SourceMap(this.options.projectRoot);
-          map.addBufferMappings(mapBuffer);
+          map.addBuffer(mapBuffer);
           return map;
         }
       })();

packages/core/core/src/CommittedAsset.js

@@ -263,7 +263,7 @@ export default class UncommittedAsset {
       if (mapBuffer) {
         // Get sourcemap from flatbuffer
         let map = new SourceMap(this.options.projectRoot);
-        map.addBufferMappings(mapBuffer);
+        map.addBuffer(mapBuffer);
         this.map = map;
       }
     }

packages/core/core/src/UncommittedAsset.js

@@ -34,6 +34,7 @@ import invariant from 'assert';
 import ParcelConfigSchema from '../ParcelConfig.schema';
 import {optionsProxy} from '../utils';
 import ParcelConfig from '../ParcelConfig';
+import {createBuildCache} from '../buildCache';
 
 type ConfigMap<K, V> = {[K]: V, ...};
 
@@ -97,12 +98,7 @@ export default function createParcelConfigRequest(): ParcelConfigRequest {
   };
 }
 
-const parcelConfigCache = new Map();
-
-export function clearParcelConfigCache() {
-  parcelConfigCache.clear();
-}
-
+const parcelConfigCache = createBuildCache();
 export function getCachedParcelConfig(
   result: ConfigAndCachePath,
   options: ParcelOptions,

packages/core/core/src/requests/ParcelConfigRequest.js

@@ -304,8 +304,8 @@ describe('css', () => {
     assert.equal(map.file, 'index.css.map');
     assert.equal(map.mappings, 'AAAA,OACA,WACA,CCFA,OACA,SACA');
     assert.deepEqual(map.sources, [
-      './integration/cssnano/local.css',
-      './integration/cssnano/index.css',
+      'integration/cssnano/local.css',
+      'integration/cssnano/index.css',
     ]);
   });
 

packages/core/integration-tests/test/css.js

@@ -39,6 +39,10 @@ describe('html', function() {
         name: 'index.html',
         assets: ['index.html'],
       },
+      {
+        name: 'index.html',
+        assets: ['index.html'],
+      },
       {
         type: 'png',
         assets: ['100x100.png'],
@@ -67,8 +71,7 @@ describe('html', function() {
       'utf8',
     );
     for (let file of files) {
-      let ext = file.match(/\.([0-9a-z]+)(?:[?#]|$)/i)[0];
-      if (file !== 'index.html' && ext !== '.map') {
+      if (file !== 'index.html' && path.extname(file) !== '.map') {
         assert(html.includes(file));
       }
     }

packages/core/integration-tests/test/html.js

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Foo page</title>
+</head>
+<body>
+    <div>Some foo page...</div>
+</body>
+</html>

packages/core/integration-tests/test/integration/html/foo/index.html

@@ -11,7 +11,7 @@
 
 <body>
   <h1>Hello world</h1>
-  <p>Linking to <a href="other.html">another page</a></p>
+  <p>Linking to <a href="other.html">another page</a> and <a href="foo/index.html">another page</a></p>
   <a href="#hash_link">Hash link</a>
   <a href="mailto:[email protected]">Mailto link</a>
   <a href="tel:+33636757575">Tel link</a>

packages/core/integration-tests/test/integration/html/index.html

@@ -0,0 +1,3 @@
+const a = { a: 2 };
+
+module.exports = <div v="1" {...a}></div>;

packages/core/integration-tests/test/integration/jsx-spread/index.jsx

@@ -0,0 +1,3 @@
+{
+  "browserslist": "Chrome 70"
+}