From 76ce73ac01aed694bdf2dff168093ac169ead83f Mon Sep 17 00:00:00 2001 From: Chase Coalwell Date: Wed, 6 Mar 2019 16:06:18 -0800 Subject: [PATCH 1/3] bump dev dependencies --- .../bugfix-dev dependencies-23e6494b.json | 5 +++++ dist-tools/webpack.config.rn-core.js | 2 +- dist-tools/webpack.config.rn-dep.js | 2 +- dist-tools/webpack.config.rn.js | 4 ++-- package.json | 15 ++++++++------- test/mocha.opts | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 .changes/next-release/bugfix-dev dependencies-23e6494b.json diff --git a/.changes/next-release/bugfix-dev dependencies-23e6494b.json b/.changes/next-release/bugfix-dev dependencies-23e6494b.json new file mode 100644 index 0000000000..bd9d24a63d --- /dev/null +++ b/.changes/next-release/bugfix-dev dependencies-23e6494b.json @@ -0,0 +1,5 @@ +{ + "type": "bugfix", + "category": "dev dependencies", + "description": "bump versions of cucumber, karma, mocha and webpack" +} \ No newline at end of file diff --git a/dist-tools/webpack.config.rn-core.js b/dist-tools/webpack.config.rn-core.js index 8184257583..f6295834b6 100644 --- a/dist-tools/webpack.config.rn-core.js +++ b/dist-tools/webpack.config.rn-core.js @@ -25,7 +25,7 @@ module.exports = { loaders: [ { test: /\.json$/, - loaders: ['json'] + loaders: ['json-loader'] } ] } diff --git a/dist-tools/webpack.config.rn-dep.js b/dist-tools/webpack.config.rn-dep.js index ed6057d929..74742a84ef 100644 --- a/dist-tools/webpack.config.rn-dep.js +++ b/dist-tools/webpack.config.rn-dep.js @@ -24,7 +24,7 @@ module.exports = { loaders: [ { test: /\.json$/, - loaders: ['json'] + loaders: ['json-loader'] } ] } diff --git a/dist-tools/webpack.config.rn.js b/dist-tools/webpack.config.rn.js index 605ec8062d..b8acff3584 100644 --- a/dist-tools/webpack.config.rn.js +++ b/dist-tools/webpack.config.rn.js @@ -13,7 +13,7 @@ module.exports = { library: 'AWS' }, resolve: { - packageAlias: 'react-native' + aliasFields: ['react-native'] }, module: { /** @@ -27,7 +27,7 @@ module.exports = { loaders: [ { test: /\.json$/, - loaders: ['json'] + loaders: ['json-loader'] } ] } diff --git a/package.json b/package.json index 75f4e3c96a..4ad77dfa30 100644 --- a/package.json +++ b/package.json @@ -19,23 +19,24 @@ "codecov": "^1.0.1", "coffee-script": "1.6.3", "coffeeify": "*", - "cucumber": "0.5.x", + "coffeescript": "^2.3.2", + "cucumber": "^5.1.0", "eslint": "^5.8.0", "hash-test-vectors": "^1.3.2", "insert-module-globals": "^7.0.0", "istanbul": "*", "jasmine": "^2.5.3", "jasmine-core": "^2.5.2", - "json-loader": "^0.5.4", - "karma": "^2.0.0", + "json-loader": "^0.5.7", + "karma": "^4.0.1", "karma-chrome-launcher": "2.2.0", "karma-jasmine": "^1.1.0", - "mocha": "^3.0.0", + "mocha": "^4.0.0", "repl.history": "*", "semver": "*", "typescript": "2.0.8", "uglify-js": "2.x", - "webpack": "^1.15.0" + "webpack": "^3.0.0" }, "dependencies": { "buffer": "4.9.1", @@ -124,7 +125,7 @@ "unit": "mocha -- test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront test/dynamodb test/polly test/rds test/publisher test/event-stream", "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --reporter=lcovonly -- test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront test/dynamodb test/polly test/rds test/publisher test/event-stream", "browsertest": "rake browser:test && karma start", - "buildertest": "mocha --compilers coffee:coffee-script -s 1000 -t 10000 dist-tools/test", + "buildertest": "mocha --require coffee-script -s 1000 -t 10000 dist-tools/test/*.coffee", "integration": "cucumber.js", "lint": "eslint lib test dist-tools/*.js", "console": "./scripts/console", @@ -143,4 +144,4 @@ "helper-test": "mocha scripts/lib/test-helper.spec.js", "csm-functional-test": "mocha test/publisher/functional_test" } -} \ No newline at end of file +} diff --git a/test/mocha.opts b/test/mocha.opts index 761cbfabd5..38043fe787 100644 --- a/test/mocha.opts +++ b/test/mocha.opts @@ -1,4 +1,4 @@ --reporter dot --ui bdd --timeout 4000 ---no-exit +--exit From 45044330fdaf95cfab1fb64c7c549c562e7ab4af Mon Sep 17 00:00:00 2001 From: Chase Coalwell Date: Tue, 19 Mar 2019 09:20:05 -0700 Subject: [PATCH 2/3] older cucumber, mocha for compatability, bump to webpack 4 --- dist-tools/webpack.config.rn-core.js | 8 +++----- dist-tools/webpack.config.rn-dep.js | 7 ++----- dist-tools/webpack.config.rn.js | 7 ++----- package.json | 7 ++++--- test/mocha.opts | 2 +- 5 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dist-tools/webpack.config.rn-core.js b/dist-tools/webpack.config.rn-core.js index f6295834b6..4d888509d5 100644 --- a/dist-tools/webpack.config.rn-core.js +++ b/dist-tools/webpack.config.rn-core.js @@ -1,6 +1,7 @@ // import path for resolving file paths var path = require('path'); module.exports = { + mode: 'none', // Specify the entry point for our app. entry: [ path.join(__dirname, '..', 'lib', 'core.js'), @@ -22,11 +23,8 @@ module.exports = { * where a json file is being imported, it will use * the json-loader. */ - loaders: [ - { - test: /\.json$/, - loaders: ['json-loader'] - } + rules: [ + { test: /\.json&/, use: 'json-loader' } ] } }; diff --git a/dist-tools/webpack.config.rn-dep.js b/dist-tools/webpack.config.rn-dep.js index 74742a84ef..d24207c2b2 100644 --- a/dist-tools/webpack.config.rn-dep.js +++ b/dist-tools/webpack.config.rn-dep.js @@ -21,11 +21,8 @@ module.exports = { * where a json file is being imported, it will use * the json-loader. */ - loaders: [ - { - test: /\.json$/, - loaders: ['json-loader'] - } + rules: [ + { test: /\.json&/, use: 'json-loader' } ] } }; diff --git a/dist-tools/webpack.config.rn.js b/dist-tools/webpack.config.rn.js index b8acff3584..d61a7f4a42 100644 --- a/dist-tools/webpack.config.rn.js +++ b/dist-tools/webpack.config.rn.js @@ -24,11 +24,8 @@ module.exports = { * where a json file is being imported, it will use * the json-loader. */ - loaders: [ - { - test: /\.json$/, - loaders: ['json-loader'] - } + rules: [ + { test: /\.json&/, use: 'json-loader' } ] } }; diff --git a/package.json b/package.json index 4ad77dfa30..59ceb45d97 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "coffee-script": "1.6.3", "coffeeify": "*", "coffeescript": "^2.3.2", - "cucumber": "^5.1.0", + "cucumber": "^1.0.0", "eslint": "^5.8.0", "hash-test-vectors": "^1.3.2", "insert-module-globals": "^7.0.0", @@ -31,12 +31,13 @@ "karma": "^4.0.1", "karma-chrome-launcher": "2.2.0", "karma-jasmine": "^1.1.0", - "mocha": "^4.0.0", + "mocha": "^3.0.0", "repl.history": "*", "semver": "*", "typescript": "2.0.8", "uglify-js": "2.x", - "webpack": "^3.0.0" + "webpack": "^4.0.0", + "webpack-cli": "^3.3.0" }, "dependencies": { "buffer": "4.9.1", diff --git a/test/mocha.opts b/test/mocha.opts index 38043fe787..761cbfabd5 100644 --- a/test/mocha.opts +++ b/test/mocha.opts @@ -1,4 +1,4 @@ --reporter dot --ui bdd --timeout 4000 ---exit +--no-exit From 03235c97db1708ee37f2ab7de95beeaf9129a5c1 Mon Sep 17 00:00:00 2001 From: Chase Coalwell Date: Tue, 19 Mar 2019 09:52:28 -0700 Subject: [PATCH 3/3] enable webpack production mode --- dist-tools/webpack.config.rn-core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist-tools/webpack.config.rn-core.js b/dist-tools/webpack.config.rn-core.js index 4d888509d5..a756dc1c4a 100644 --- a/dist-tools/webpack.config.rn-core.js +++ b/dist-tools/webpack.config.rn-core.js @@ -1,7 +1,7 @@ // import path for resolving file paths var path = require('path'); module.exports = { - mode: 'none', + mode: 'production', // Specify the entry point for our app. entry: [ path.join(__dirname, '..', 'lib', 'core.js'),