Merge pull request #220 from citizennet/AS-2082/upgrade-parcel-to-v2

davezuch · web-flow · commit 39361dc2712a · 2022-01-26T18:52:06.000-07:00
AS-2082 Upgrade `parcel` to v2
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/ocelot
   docker:
-    - image: circleci/node:10.24-buster-browsers
+    - image: circleci/node:16.13-buster-browsers
   environment:
     RTS_ARGS: +RTS -N2 -RTS
 
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ generated-docs
 *.tix
 .spago
 .purs-repl
+.parcel-cache
 
 
 # Allow the CSS file only; Circle CI will overwrite whatever you
diff --git a/Makefile b/Makefile
@@ -107,4 +107,4 @@ test: $(BUILD_DIR)/test.out ## Build and run tests
 
 .PHONY: ui-guide
 ui-guide: build-css $(OUTPUT_DIR)/Main/index.js $(NODE_MODULES) | $(PARCEL_DIR) ## Build the UI Guide using ParcelJS for hot reloading (experimental, may not work on all environments)
-	npx parcel $(DIST_DIR)/parcel.html --out-dir $(PARCEL_DIR) --no-cache
+	npx parcel serve $(DIST_DIR)/parcel.html --dist-dir $(PARCEL_DIR) --no-cache
diff --git a/dist/parcel.html b/dist/parcel.html
@@ -7,7 +7,7 @@
   </head>
 
   <body>
-    <script src="main.js"></script>
+    <script src="main.js" type="module"></script>
   </body>
 
 </html>
diff --git a/package.json b/package.json
@@ -11,8 +11,7 @@
   },
   "devDependencies": {
     "browserify": "^16.5.1",
-    "parcel": "1.12.4",
-    "parcel-bundler": "1.12.3",
+    "parcel": "2.2.1",
     "purescript": "0.14.4",
     "purescript-psa": "0.8.2",
     "spago": "0.20.3"
@@ -21,5 +20,8 @@
     "big-integer": "^1.6.31",
     "request": "^2.88.0",
     "yarn": "^1.16.0"
+  },
+  "alias": {
+    "xhr2": false
   }
 }
diff --git a/yarn.lock b/yarn.lock
