diff --git a/.eslintrc.js b/.eslintrc.js index a44327d9..b35e55a4 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ /* @flow */ module.exports = { - 'extends': './node_modules/grumbler-scripts/config/.eslintrc-browser.js', + 'extends': './node_modules/@krakenjs/grumbler-scripts/config/.eslintrc-browser.js', 'globals': { 'Promise': false, diff --git a/.flowconfig b/.flowconfig index cc397301..d36b64e9 100644 --- a/.flowconfig +++ b/.flowconfig @@ -9,7 +9,7 @@ [include] [libs] flow-typed -node_modules/grumbler-scripts/declarations.js +node_modules/@krakenjs/grumbler-scripts/declarations.js node_modules/@krakenjs/zoid/src/declarations.js node_modules/@krakenjs/post-robot/src/declarations.js node_modules/@paypal/sdk-client/src/declarations.js diff --git a/babel.config.json b/babel.config.json index 4b925deb..92ad6f61 100644 --- a/babel.config.json +++ b/babel.config.json @@ -1,3 +1,3 @@ { - "extends": "grumbler-scripts/config/.babelrc-node" + "extends": "@krakenjs/grumbler-scripts/config/.babelrc-node" } \ No newline at end of file diff --git a/fastpublish.sh b/fastpublish.sh index 9eef5425..66268503 100755 --- a/fastpublish.sh +++ b/fastpublish.sh @@ -16,7 +16,7 @@ if ! git diff-index --quiet --cached HEAD; then fi; rm -rf node_modules/zoid node_modules/post-robot node_modules/zalgo-promise node_modules/beaver-logger node_modules/cross-domain-safe-weakmap node_modules/cross-domain-utils node_modules/grumbler-scripts -npm install zoid post-robot zalgo-promise beaver-logger cross-domain-safe-weakmap cross-domain-utils grumbler-scripts +npm install zoid post-robot zalgo-promise beaver-logger cross-domain-safe-weakmap cross-domain-utils @krakenjs/grumbler-scripts npm run flow; npm run lint; diff --git a/karma.conf.js b/karma.conf.js index d391307d..56548cdb 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,7 +1,7 @@ /* @flow */ /* eslint import/no-default-export: off */ -import { getKarmaConfig } from 'grumbler-scripts/config/karma.conf'; +import { getKarmaConfig } from '@krakenjs/grumbler-scripts/config/karma.conf'; import { WEBPACK_CONFIG_TEST } from './webpack.config'; diff --git a/package.json b/package.json index 311c6ad5..1121823c 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,12 @@ "license": "Apache-2.0", "readmeFilename": "README.md", "devDependencies": { + "@krakenjs/grumbler-scripts": "^6.0.2", + "@krakenjs/sync-browser-mocks": "^3.0.0", "babel-core": "^7.0.0-bridge.0", "conventional-changelog-cli": "^2.0.11", "flow-bin": "0.135.0", "fs-extra": "^4.0.2", - "grumbler-scripts": "^5.0.0", "imagemagick": "^0.1.3", "imgur": "^0.2.1", "memory-fs": "^0.4.1", @@ -64,8 +65,7 @@ "mocketeer": "^0.3.0", "pixelmatch": "^4.0.2", "pngjs": "^3.3.0", - "serve": "^10.1.2", - "sync-browser-mocks": "^2.0.0" + "serve": "^10.1.2" }, "dependencies": { "@paypal/sdk-client": "^4.0.166", diff --git a/scripts/preversion.sh b/scripts/preversion.sh index 111e7feb..603c449e 100755 --- a/scripts/preversion.sh +++ b/scripts/preversion.sh @@ -14,7 +14,7 @@ if ! git diff-index --quiet --cached HEAD; then fi; # Re-install just the basics -modules='zoid post-robot zalgo-promise beaver-logger cross-domain-safe-weakmap cross-domain-utils belter grumbler-scripts @paypal/sdk-client @paypal/sdk-constants'; +modules='@krakenjs/zoid @krakenjs/post-robot @krakenjs/zalgo-promise @krakenjs/beaver-logger @krakenjs/cross-domain-safe-weakmap @krakenjs/cross-domain-utils @krakenjs/belter @krakenjs/grumbler-scripts @paypal/sdk-client @paypal/sdk-constants'; for module in $modules; do rm -rf "node_modules/$module"; diff --git a/webpack.config.js b/webpack.config.js index af38766f..3dadcd48 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,8 +1,8 @@ /* @flow */ /* eslint import/no-nodejs-modules: off, import/no-default-export: off */ -import type { WebpackConfig } from 'grumbler-scripts/config/types'; -import { getWebpackConfig } from 'grumbler-scripts/config/webpack.config'; +import type { WebpackConfig } from '@krakenjs/grumbler-scripts/config/types'; +import { getWebpackConfig } from '@krakenjs/grumbler-scripts/config/webpack.config'; import { testGlobals } from './test/globals'; import globals from './globals';