Update to PureScript v0.15.0

.eslintrc.json

@@ -1,7 +1,7 @@
 {
-  "env": { "browser": true, "commonjs": true },
+  "env": { "browser": true },
   "extends": "eslint:recommended",
-  "parserOptions": { "ecmaVersion": 5 },
+  "parserOptions": { "ecmaVersion": 6, "sourceType": "module" },
   "rules": {
     "block-scoped-var": "error",
     "consistent-return": "error",

.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
       - name: Set up PureScript toolchain
         uses: purescript-contrib/setup-purescript@main
         with:
+          purescript: "unstable"
           purs-tidy: "latest"
 
       - name: Cache PureScript dependencies
@@ -49,8 +50,17 @@ jobs:
       - name: Build the project
         run: npm run build
 
-      - name: Run tests
-        run: npm run test
+#      - name: Run tests
+#        run: npm run test
 
       - name: Check formatting
         run: purs-tidy check src test
+
+      - name: Verify Bower & Pulp
+        run: |
+          npm install bower pulp@16.0.0-0
+          npx bower install
+          npx pulp build -- --censor-lib --strict
+          if [ -d "test" ]; then
+            npx pulp test
+          fi

CHANGELOG.md

@@ -5,6 +5,7 @@ Notable changes to this project are documented in this file. The format is based
 ## [Unreleased]
 
 Breaking changes:
+- Migrate FFI to ES modules (#48 by @JordanMartinez)
 
 New features:
 

bower.json

@@ -19,17 +19,17 @@
     "package.json"
   ],
   "dependencies": {
-    "purescript-arrays": "^6.0.0",
-    "purescript-effect": "^3.0.0",
-    "purescript-foreign": "^6.0.0",
-    "purescript-nullable": "^5.0.0",
-    "purescript-prelude": "^5.0.0",
-    "purescript-web-html": "^3.0.0",
-    "purescript-web-uievents": "^3.0.0"
+    "purescript-arrays": "master",
+    "purescript-effect": "master",
+    "purescript-foreign": "master",
+    "purescript-nullable": "main",
+    "purescript-prelude": "master",
+    "purescript-web-html": "master",
+    "purescript-web-uievents": "master"
   },
   "devDependencies": {
     "ace-builds": "^1.2.6",
-    "purescript-console": "^5.0.0",
-    "purescript-refs": "^5.0.0"
+    "purescript-console": "master",
+    "purescript-refs": "master"
   }
 }

example/src/Main.js

@@ -1,11 +1,8 @@
-/* global window */
-"use strict";
-
-exports.rules = {
+export const rules = {
   "start": [{ token: "example", regex: "[a-z]*" }]
 };
 
-exports.onLoad = function (action) {
+export const onLoad = function (action) {
   return function () {
     window.addEventListener("load", function () {
       action();

packages.dhall

@@ -1,4 +1,4 @@
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c
+      https://raw.githubusercontent.com/purescript/package-sets/prepare-0.15/src/packages.dhall
 
 in  upstream

spago.dhall

@@ -11,7 +11,6 @@
   , "nullable"
   , "partial"
   , "prelude"
-  , "psci-support"
   , "refs"
   , "st"
   , "transformers"

src/Ace.js

@@ -1,29 +1,26 @@
-"use strict";
+import ace from "ace-builds";
+export {ace};
 
-var ace = require("ace-builds");
-
-exports.ace = ace;
-
-exports.editImpl = function (el, self) {
+export function editImpl(el, self) {
   return function () {
     return self.edit(el);
   };
-};
+}
 
-exports.editNodeImpl = function (el, self) {
+export function editNodeImpl(el, self) {
   return function () {
     return self.edit(el);
   };
-};
+}
 
-exports.createEditSessionForDocumentImpl = function (text, mode, self) {
+export function createEditSessionForDocumentImpl(text, mode, self) {
   return function () {
     return self.createEditSession(text, mode);
   };
-};
+}
 
-exports.createEditSessionImpl = function (text, mode, self) {
+export function createEditSessionImpl(text, mode, self) {
   return function () {
     return self.createEditSession(text, mode);
   };
-};
+}

src/Ace/Anchor.js

@@ -1,57 +1,55 @@
-"use strict";
+import ace from "ace-builds";
 
-var ace = require("ace-builds");
-
-exports.onChangeImpl = function (self, fn) {
+export function onChangeImpl(self, fn) {
   return function () {
     return self.on("change", function (e) {
       fn(e)();
     });
   };
-};
+}
 
-exports.getPosition = function (self) {
+export function getPosition(self) {
   return function () {
     return self.getPosition();
   };
-};
+}
 
-exports.getDocument = function (self) {
+export function getDocument(self) {
   return function () {
     return self.getDocument();
   };
-};
+}
 
-exports.setPositionImpl = function (row, column, noClip, self) {
+export function setPositionImpl(row, column, noClip, self) {
   return function () {
     return self.setPosition(row, column, noClip);
   };
-};
+}
 
-exports.detach = function (self) {
+export function detach(self) {
   return function () {
     self.detach();
   };
-};
+}
 
-exports.createImpl = function (doc, row, column) {
+export function createImpl(doc, row, column) {
   return function () {
     var Anchor = ace.require("ace/anchor").Anchor;
     return new Anchor(doc, row, column);
   };
-};
+}
 
-exports.getInsertRight = function (a) {
+export function getInsertRight(a) {
   return function () {
     return a.$insertRight;
   };
-};
+}
 
-exports.setInsertRight = function (val) {
+export function setInsertRight(val) {
   return function (a) {
     return function () {
       a.$insertRight = val;
       return {};
     };
   };
-};
+}

src/Ace/BackgroundTokenizer.js

@@ -1,60 +1,58 @@
-"use strict";
+import ace from "ace-builds";
 
-var ace = require("ace-builds");
-
-exports.onUpdateImpl = function (self, fn) {
+export function onUpdateImpl(self, fn) {
   return function () {
     return self.on("update", function (e) {
       fn(e)();
     });
   };
-};
+}
 
-exports.setTokenizerImpl = function (tokenizer, self) {
+export function setTokenizerImpl(tokenizer, self) {
   return function () {
     return self.setTokenizer(tokenizer);
   };
-};
+}
 
-exports.setDocumentImpl = function (doc, self) {
+export function setDocumentImpl(doc, self) {
   return function () {
     return self.setDocument(doc);
   };
-};
+}
 
-exports.fireUpdateEventImpl = function (firstRow, lastRow, self) {
+export function fireUpdateEventImpl(firstRow, lastRow, self) {
   return function () {
     return self.fireUpdateEvent(firstRow, lastRow);
   };
-};
+}
 
-exports.startImpl = function (startRow, self) {
+export function startImpl(startRow, self) {
   return function () {
     return self.start(startRow);
   };
-};
+}
 
-exports.stop = function (self) {
+export function stop(self) {
   return function () {
     return self.stop();
   };
-};
+}
 
-exports.getTokensImpl = function (row, self) {
+export function getTokensImpl(row, self) {
   return function () {
     return self.getTokens(row);
   };
-};
+}
 
-exports.getStateImpl = function (row, self) {
+export function getStateImpl(row, self) {
   return function () {
     return self.getState(row);
   };
-};
+}
 
-exports.createImpl = function (tokenizer, editor) {
+export function createImpl(tokenizer, editor) {
   return function () {
     var BackgroundTokenizer = ace.require("ace/background_tokenizer").BackgroundTokenizer;
     return new BackgroundTokenizer(tokenizer, editor);
   };
-};
+}

src/Ace/Config.js

@@ -1,10 +1,8 @@
-"use strict";
+import ace from "ace-builds";
 
-var ace = require("ace-builds");
-
-exports.setImpl = function (key, value) {
+export function setImpl(key, value) {
   return function () {
     ace.config.set(key, value);
     return ace;
   };
-};
+}