From d2fb04c10302b9735fc349571f06ae3349d8071b Mon Sep 17 00:00:00 2001 From: martyall Date: Fri, 19 Apr 2024 22:56:22 -0700 Subject: [PATCH 1/3] change import --- src/Node/Buffer.js | 2 +- src/Node/Buffer/Constants.js | 2 +- src/Node/Buffer/Immutable.js | 2 +- src/Node/Encoding.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Node/Buffer.js b/src/Node/Buffer.js index 8e56130..df79282 100644 --- a/src/Node/Buffer.js +++ b/src/Node/Buffer.js @@ -1,4 +1,4 @@ -import { Buffer, transcode } from "node:buffer"; +import { Buffer, transcode } from "buffer"; export const allocUnsafeImpl = (size) => Buffer.allocUnsafe(size); export const allocUnsafeSlowImpl = (size) => Buffer.allocUnsafeSlow(size); diff --git a/src/Node/Buffer/Constants.js b/src/Node/Buffer/Constants.js index 12bbaa0..4d0c705 100644 --- a/src/Node/Buffer/Constants.js +++ b/src/Node/Buffer/Constants.js @@ -1,4 +1,4 @@ -import buffer from "node:buffer"; +import buffer from "buffer"; export const inspectMaxBytes = () => buffer.INSPECT_MAX_LENGTH; export const maxLength = buffer.constants.MAX_LENGTH; diff --git a/src/Node/Buffer/Immutable.js b/src/Node/Buffer/Immutable.js index aa7eb7a..5df84a3 100644 --- a/src/Node/Buffer/Immutable.js +++ b/src/Node/Buffer/Immutable.js @@ -1,4 +1,4 @@ -import { Buffer } from "node:buffer"; +import { Buffer } from "buffer"; import { inspect } from "util"; export const showImpl = inspect; diff --git a/src/Node/Encoding.js b/src/Node/Encoding.js index dcfecb9..482e563 100644 --- a/src/Node/Encoding.js +++ b/src/Node/Encoding.js @@ -1,3 +1,3 @@ -import { Buffer } from "node:buffer"; +import { Buffer } from "buffer"; export const byteLengthImpl = (str, enc) => Buffer.byteLength(str, enc); From 503cc9f7f573217d24b70f39357505619ac4351b Mon Sep 17 00:00:00 2001 From: martyall Date: Fri, 19 Apr 2024 23:00:22 -0700 Subject: [PATCH 2/3] change imports to drop node: prefix --- package.json | 12 +++--- packages.dhall | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ spago.dhall | 18 +++++++++ 3 files changed, 128 insertions(+), 7 deletions(-) create mode 100644 packages.dhall create mode 100644 spago.dhall diff --git a/package.json b/package.json index 7c23052..bf8c359 100644 --- a/package.json +++ b/package.json @@ -2,14 +2,12 @@ "name": "purescript-node-buffer", "private": true, "scripts": { - "clean": "rimraf output && rimraf .pulp-cache", - "build": "eslint src && pulp build -- --censor-lib --strict", - "test": "pulp test -- --censor-lib --strict" + "clean": "rm -rf output", + "build": "spago build", + "test": "spago test" }, "devDependencies": { - "eslint": "^7.15.0", - "pulp": "16.0.0-0", - "purescript-psa": "^0.8.2", - "rimraf": "^3.0.2" + "purescript": "^0.15.15", + "spago": "^0.21.0" } } diff --git a/packages.dhall b/packages.dhall new file mode 100644 index 0000000..7d8c202 --- /dev/null +++ b/packages.dhall @@ -0,0 +1,105 @@ +{- +Welcome to your new Dhall package-set! + +Below are instructions for how to edit this file for most use +cases, so that you don't need to know Dhall to use it. + +## Use Cases + +Most will want to do one or both of these options: +1. Override/Patch a package's dependency +2. Add a package not already in the default package set + +This file will continue to work whether you use one or both options. +Instructions for each option are explained below. + +### Overriding/Patching a package + +Purpose: +- Change a package's dependency to a newer/older release than the + default package set's release +- Use your own modified version of some dependency that may + include new API, changed API, removed API by + using your custom git repo of the library rather than + the package set's repo + +Syntax: +where `entityName` is one of the following: +- dependencies +- repo +- version +------------------------------- +let upstream = -- +in upstream + with packageName.entityName = "new value" +------------------------------- + +Example: +------------------------------- +let upstream = -- +in upstream + with halogen.version = "master" + with halogen.repo = "https://example.com/path/to/git/repo.git" + + with halogen-vdom.version = "v4.0.0" + with halogen-vdom.dependencies = [ "extra-dependency" ] # halogen-vdom.dependencies +------------------------------- + +### Additions + +Purpose: +- Add packages that aren't already included in the default package set + +Syntax: +where `` is: +- a tag (i.e. "v4.0.0") +- a branch (i.e. "master") +- commit hash (i.e. "701f3e44aafb1a6459281714858fadf2c4c2a977") +------------------------------- +let upstream = -- +in upstream + with new-package-name = + { dependencies = + [ "dependency1" + , "dependency2" + ] + , repo = + "https://example.com/path/to/git/repo.git" + , version = + "" + } +------------------------------- + +Example: +------------------------------- +let upstream = -- +in upstream + with benchotron = + { dependencies = + [ "arrays" + , "exists" + , "profunctor" + , "strings" + , "quickcheck" + , "lcg" + , "transformers" + , "foldable-traversable" + , "exceptions" + , "node-fs" + , "node-buffer" + , "node-readline" + , "datetime" + , "now" + ] + , repo = + "https://github.com/hdgarrood/purescript-benchotron.git" + , version = + "v7.0.0" + } +------------------------------- +-} +let upstream = + https://github.com/purescript/package-sets/releases/download/psc-0.15.15-20240419/packages.dhall + sha256:50c4ee579bf2c38671ac97df821c2cc4221fb3f6ad79c807bb6e4597ab6d1e95 + +in upstream diff --git a/spago.dhall b/spago.dhall new file mode 100644 index 0000000..f1a35bd --- /dev/null +++ b/spago.dhall @@ -0,0 +1,18 @@ +{ name = "node-buffer" +, dependencies = + [ "arraybuffer-types" + , "assert" + , "console" + , "effect" + , "foldable-traversable" + , "functions" + , "maybe" + , "nullable" + , "partial" + , "prelude" + , "st" + , "unsafe-coerce" + ] +, packages = ./packages.dhall +, sources = [ "src/**/*.purs", "test/**/*.purs" ] +} From 859fe570c437763b9848072a0a21f449b6dad6ca Mon Sep 17 00:00:00 2001 From: martyall Date: Fri, 19 Apr 2024 23:04:01 -0700 Subject: [PATCH 3/3] fix ci, add tidy --- .github/workflows/ci.yml | 9 +++------ package.json | 4 +++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a39bce1..7817b2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,18 +23,15 @@ jobs: - name: Install dependencies run: | - npm install -g bower npm install - bower install --production - name: Build source - run: npm run-script build + run: npm run build - name: Run tests run: | - bower install - npm run-script test --if-present + npm run test - name: Check formatting run: | - purs-tidy check src test + npm run tidy-check diff --git a/package.json b/package.json index bf8c359..284d025 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,12 @@ "scripts": { "clean": "rm -rf output", "build": "spago build", - "test": "spago test" + "test": "spago test", + "tidy-check": "purs-tidy check src test" }, "devDependencies": { "purescript": "^0.15.15", + "purs-tidy": "^0.11.0", "spago": "^0.21.0" } }