From f23881322b585b9487153295d355341968b349c5 Mon Sep 17 00:00:00 2001 From: Sergii Date: Mon, 9 Dec 2019 21:57:05 +0200 Subject: [PATCH] feat(ability): uses CSP build of sift.js Fixes #234 BREAKING CHANGES --- package-lock.json | 37 ------------------------- package.json | 1 - packages/casl-ability/package-lock.json | 6 ++-- packages/casl-ability/package.json | 8 +++--- packages/casl-ability/src/rule.js | 2 +- tools/jest.config.js | 5 +++- tools/rollup.es.js | 6 ++-- tools/rollup.umd.js | 6 +--- 8 files changed, 15 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index f11c28aa0..e6cafeb50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8776,15 +8776,6 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, - "is-reference": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz", - "integrity": "sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==", - "dev": true, - "requires": { - "@types/estree": "0.0.39" - } - }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -10553,15 +10544,6 @@ "integrity": "sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA==", "dev": true }, - "magic-string": { - "version": "0.25.4", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.4.tgz", - "integrity": "sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==", - "dev": true, - "requires": { - "sourcemap-codec": "^1.4.4" - } - }, "make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -16230,19 +16212,6 @@ "rollup-pluginutils": "^2.8.1" } }, - "rollup-plugin-commonjs": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz", - "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==", - "dev": true, - "requires": { - "estree-walker": "^0.6.1", - "is-reference": "^1.1.2", - "magic-string": "^0.25.2", - "resolve": "^1.11.0", - "rollup-pluginutils": "^2.8.1" - } - }, "rollup-plugin-node-resolve": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz", @@ -17440,12 +17409,6 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, - "sourcemap-codec": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz", - "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==", - "dev": true - }, "spawn-error-forwarder": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz", diff --git a/package.json b/package.json index 6d7c4cbeb..33b5b4ac5 100644 --- 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 index c4c054dcd..687eaf8cb 100644 --- a/packages/casl-ability/package-lock.json +++ b/packages/casl-ability/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "sift": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/sift/-/sift-9.0.0.tgz", - "integrity": "sha512-jAd/cPlBHqfTORB0VV+Dilu+Vhw5Cmvp1C5lXPMce3V3jX5GW/9DpaV3HnGia2PUV+AQ5NRT0VDIQmsb72sE/g==" + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-9.0.1.tgz", + "integrity": "sha512-ZRyi5qJu3HWM3pSLYCXWGuV0XTaIGqFaGpmH8eHjHOT0Sl2EBMCi+L8pybt4G/HSHDEVdzILE4HqYFaFZRaSaA==" } } } diff --git a/packages/casl-ability/package.json b/packages/casl-ability/package.json index b4912acbd..9673459c5 100644 --- 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 index cf2741443..7ec3cd8d8 100644 --- 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 index 04643ed0f..cc995c0f3 100644 --- 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 index bdb5eee33..df7c062e4 100644 --- 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 index f6fe45ee9..9cafd0a12 100644 --- 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() : [] )