feat(ability): uses CSP build of sift.js

Fixes #234 BREAKING CHANGES
stalniy · Dec 9, 2019 · f238813 · f238813
1 parent fe9ade5
commit f238813
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 56 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "lint-staged": "^9.0.0",
     "rollup": "^1.1.2",
     "rollup-plugin-babel": "^4.3.2",
-    "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-node-resolve": "^5.0.0",
     "rollup-plugin-uglify": "^6.0.2",
     "semantic-release": "15.9.17",

diff --git a/packages/casl-ability/package-lock.json b/packages/casl-ability/package-lock.json
diff --git a/packages/casl-ability/package.json b/packages/casl-ability/package.json
@@ -15,9 +15,9 @@
     "access": "public"
   },
   "scripts": {
-    "build.es": "rollup -c ../../tools/rollup.es.js -e sift",
-    "build.umd": "rollup -c ../../tools/rollup.umd.js -e sift -n casl -g sift:sift",
-    "build.es5m": "rollup -c ../../tools/rollup.es5m.js -e sift",
+    "build.es": "rollup -c ../../tools/rollup.es.js -e sift/sift.csp.min",
+    "build.umd": "rollup -c ../../tools/rollup.umd.js -e sift/sift.csp.min -n casl -g sift/sift.csp.min:sift",
+    "build.es5m": "rollup -c ../../tools/rollup.es5m.js -e sift/sift.csp.min",
     "build.extra.es": "rollup -c ../../tools/rollup.es.js -i src/extra.js -o dist/es6/extra.js",
     "build.extra.es5m": "rollup -c ../../tools/rollup.es5m.js -i src/extra.js -o dist/es5m/extra.js",
     "build.extra.umd": "rollup -c ../../tools/rollup.umd.js -i src/extra.js -o dist/umd/extra.js -n casl.extra",
@@ -42,6 +42,6 @@
     "npm": "^6.0.0"
   },
   "dependencies": {
-    "sift": "^9.0.0"
+    "sift": "^9.0.1"
   }
 }
diff --git a/packages/casl-ability/src/rule.js b/packages/casl-ability/src/rule.js
@@ -1,4 +1,4 @@
-import sift from 'sift';
+import sift from 'sift/sift.csp.min';
 import { wrapArray } from './utils';
 
 const REGEXP_SPECIAL_CHARS = /[-/\\^$+?.()|[\]{}]/g;

diff --git a/tools/jest.config.js b/tools/jest.config.js
@@ -17,5 +17,8 @@ module.exports = {
   },
   setupFilesAfterEnv: [
     `${__dirname}/spec_helper.js`
-  ]
+  ],
+  globals: {
+    window: {}
+  }
 };
diff --git a/tools/rollup.es.js b/tools/rollup.es.js
@@ -10,11 +10,9 @@ export default {
     format: 'es'
   },
   plugins: [
-    babel({ rootMode: 'upward' }),
     resolve({
-      jsnext: true,
-      main: true,
-      browser: true,
+      mainFields: ['jsnext', 'main', 'browser'],
     }),
+    babel({ rootMode: 'upward' }),
   ]
 };
diff --git a/tools/rollup.umd.js b/tools/rollup.umd.js
@@ -1,6 +1,5 @@
 import babel from 'rollup-plugin-babel';
 import { uglify } from 'rollup-plugin-uglify';
-import commonjs from 'rollup-plugin-commonjs';
 import resolve from 'rollup-plugin-node-resolve';
 
 export default {
@@ -11,12 +10,9 @@ export default {
   },
   plugins: [
     resolve({
-      jsnext: true,
-      main: true,
-      browser: true
+      mainFields: ['jsnext', 'main', 'browser'],
     }),
     babel({ rootMode: 'upward' }),
-    commonjs(),
   ].concat(
     process.env.NODE_ENV === 'production' && !process.env.SKIP_MINIFY ? uglify() : []
   )