Merge pull request #762 from rikhoffbauer/761-pnpm-build-fails-with-exit-code-1

make this package an ES module

Closes: #761

Author: rikhoffbauer

.eslintrc.js .eslintrc.cjs.eslintrc.js renamed to .eslintrc.cjs

@@ -5,19 +5,28 @@ on: [push, pull_request]
 jobs:
     release:
         name: Release
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         if: "!contains(github.event.head_commit.message, '[skip ci]')"
         steps:
             - name: Checkout
               uses: actions/checkout@v3
-            - name: Setup pnpm
-              uses: pnpm/[email protected]
+            - name: Install pnpm
+              uses: pnpm/action-setup@v2
+              id: pnpm-install
               with:
-                  version: "6.11.0-0"
-            - uses: actions/setup-node@v3
+                  version: "7.29.1"
+                  run_install: false
+            - name: Setup nodejs
+              uses: actions/setup-node@v3
               with:
-                  node-version: "14"
-                  cache: "pnpm"
+                  node-version: "19"
+            #- name: Setup pnpm cache
+              #uses: actions/cache@v3
+              #with:
+                  #path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+                  #key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+                  #restore-keys: |
+                      #${{ runner.os }}-pnpm-store-
             - name: Install dependencies
               run: pnpm install
             - name: Build
@@ -29,3 +38,4 @@ jobs:
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+

.github/workflows/release.yml

@@ -1,3 +1,3 @@
 syncher 0.0.44
-nodejs 16.18.0
-pnpm 6.11.0-0
+nodejs 19.7.0
+pnpm 7.29.1

.tool-versions

@@ -20,6 +20,7 @@
     "main": "dist/index.js",
     "module": "dist/index.es.js",
     "jsnext:main": "dist/index.es.js",
+    "type": "module",
     "types": "dist/index.d.ts",
     "typings": "./dist/index.d.ts",
     "files": [

package.json

@@ -6,7 +6,7 @@ import { terser } from "rollup-plugin-terser";
 import typescript from "rollup-plugin-typescript2";
 import url from "rollup-plugin-url";
 
-import pkg from "./package.json";
+import pkg from "./package.json" assert { type: "json" };
 
 export default {
     input: "src/index.ts",
@@ -30,7 +30,6 @@ export default {
         resolve(),
         typescript({
             clean: true,
-            rollupCommonJSResolveHack: true,
             exclude: ["*.d.ts", "**/*.d.ts"],
         }),
         commonjs(),

rollup.config.js

@@ -101,12 +101,27 @@ const create = <Role extends string, Permission extends string, User>() => {
     };
 
     const NotAllowedTo = ({
-        yes,
-        no,
-        ...props
-    }: AllowedToProps<Permission>) => (
-        <AllowedTo no={yes} yes={no} {...props} />
-    );
+        perform = [],
+        children,
+        yes: Yes,
+        no: No,
+        data,
+    }: AllowedToProps<Permission>) => {
+        const ctx = useAbac();
+
+        if (ctx === AbacContextDefaults) {
+            console.error(
+                `Can't render <AllowedTo />, wrap your app with an <AbacProvider />.`,
+            );
+            return null;
+        }
+
+        if (!ctx.userHasPermissions(ensureArray(perform), data)) {
+            return Yes ? <Yes /> : <React.Fragment>{children}</React.Fragment>;
+        }
+
+        return No ? <No /> : null;
+    };
 
     const secured =
         <Props, Data>({

src/create.tsx

@@ -1,16 +1,18 @@
-const Environment = require("jest-environment-jsdom-global")
+import Environment from "jest-environment-jsdom-global";
+import { TextEncoder } from "util";
 
 /**
  * A custom environment to set the TextEncoder
  */
-module.exports = class CustomTestEnvironment extends Environment {
+class CustomTestEnvironment extends Environment {
     constructor({ globalConfig, projectConfig }, context) {
         super({ globalConfig, projectConfig }, context);
 
         if (typeof this.global.TextEncoder === 'undefined') {
-            const { TextEncoder } = require('util');
             this.global.TextEncoder = TextEncoder;
         }
     }
 };
 
+export default CustomTestEnvironment;
+