diff --git a/src/packages/dev-toolkit/package-lock.json b/src/packages/dev-toolkit/package-lock.json index 8cc2a961..7c5488d6 100644 --- a/src/packages/dev-toolkit/package-lock.json +++ b/src/packages/dev-toolkit/package-lock.json @@ -1,6 +1,6 @@ { "name": "dev-toolkit", - "version": "7.1.0", + "version": "7.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/packages/dev-toolkit/package.json b/src/packages/dev-toolkit/package.json index 2ca24e62..e06d20a8 100644 --- a/src/packages/dev-toolkit/package.json +++ b/src/packages/dev-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "dev-toolkit", - "version": "7.1.0", + "version": "7.1.1", "description": "Universal Development Toolkit for React Veterans", "main": "dev-toolkit.js", "files": [ diff --git a/src/templates/minimal/package.json b/src/templates/minimal/package.json index 862924bd..4d291231 100644 --- a/src/templates/minimal/package.json +++ b/src/templates/minimal/package.json @@ -12,7 +12,7 @@ "dependencies": { "babel-preset-dev-toolkit": "^1.0.5", "cross-env": "^5.1.5", - "dev-toolkit": "^7.1.0", + "dev-toolkit": "^7.1.1", "express": "^4.16.3", "react": "^16.3.2", "react-dom": "^16.3.2" diff --git a/src/templates/serverless/package.json b/src/templates/serverless/package.json index 49dd261e..99153264 100644 --- a/src/templates/serverless/package.json +++ b/src/templates/serverless/package.json @@ -15,7 +15,7 @@ "babel-preset-dev-toolkit": "^1.0.5", "clear-module": "^2.1.0", "cross-env": "^5.1.5", - "dev-toolkit": "^7.1.0", + "dev-toolkit": "^7.1.1", "express": "^4.16.3", "express-handlebars": "^3.0.0", "react": "^16.3.2", diff --git a/src/templates/standard/dev-toolkit.config.js b/src/templates/standard/dev-toolkit.config.js index 9bdc5e7f..e4599bbe 100644 --- a/src/templates/standard/dev-toolkit.config.js +++ b/src/templates/standard/dev-toolkit.config.js @@ -4,12 +4,15 @@ module.exports = { sharedEnvs: ['MY_CUSTOM_ENV'], }, - // Use custom webpack configuration here + // Use custom webpack configuration here. Available `options` for each function: + // { projectRoot, creatingBuild, namingConvention, assetsPath, publicPath, babelrc } webpack: { - loaders: function(options) { + // Extend existing webpack rules (formerly called loaders) + rules: function rules(options) { return []; }, - plugins: function(options) { + // Extend existing webpack plugins + plugins: function plugins(options) { return []; }, }, diff --git a/src/templates/standard/package.json b/src/templates/standard/package.json index 3096400b..1779a0f1 100644 --- a/src/templates/standard/package.json +++ b/src/templates/standard/package.json @@ -36,7 +36,7 @@ "babel-preset-dev-toolkit": "^1.0.5", "better-npm-run": "^0.1.0", "clear-module": "^2.1.0", - "dev-toolkit": "^7.1.0", + "dev-toolkit": "^7.1.1", "express": "^4.16.3", "express-handlebars": "^3.0.0", "react": "^16.3.2", diff --git a/src/templates/with-eslint/dev-toolkit.config.js b/src/templates/with-eslint/dev-toolkit.config.js index 9bdc5e7f..e4599bbe 100644 --- a/src/templates/with-eslint/dev-toolkit.config.js +++ b/src/templates/with-eslint/dev-toolkit.config.js @@ -4,12 +4,15 @@ module.exports = { sharedEnvs: ['MY_CUSTOM_ENV'], }, - // Use custom webpack configuration here + // Use custom webpack configuration here. Available `options` for each function: + // { projectRoot, creatingBuild, namingConvention, assetsPath, publicPath, babelrc } webpack: { - loaders: function(options) { + // Extend existing webpack rules (formerly called loaders) + rules: function rules(options) { return []; }, - plugins: function(options) { + // Extend existing webpack plugins + plugins: function plugins(options) { return []; }, }, diff --git a/src/templates/with-eslint/package.json b/src/templates/with-eslint/package.json index cf083ce3..2c9a486a 100644 --- a/src/templates/with-eslint/package.json +++ b/src/templates/with-eslint/package.json @@ -43,7 +43,7 @@ "babel-preset-dev-toolkit": "^1.0.5", "better-npm-run": "^0.1.0", "clear-module": "^2.1.0", - "dev-toolkit": "^7.1.0", + "dev-toolkit": "^7.1.1", "express": "^4.16.3", "express-handlebars": "^3.0.0", "react": "^16.3.2", diff --git a/src/templates/with-sass/dev-toolkit.config.js b/src/templates/with-sass/dev-toolkit.config.js index 1190a98a..91d9cbdf 100644 --- a/src/templates/with-sass/dev-toolkit.config.js +++ b/src/templates/with-sass/dev-toolkit.config.js @@ -25,9 +25,11 @@ module.exports = { cssChunkNaming: cssChunkNaming, includePaths: includePaths, - // Exports for dev-toolkit to pick up + // Use custom webpack configuration here. Available `options` for each function: + // { projectRoot, creatingBuild, namingConvention, assetsPath, publicPath, babelrc } webpack: { - rules: function(options) { + // Extend existing webpack rules (formerly called loaders) + rules: function rules(options) { return [ { test: /\.scss$/, @@ -46,8 +48,9 @@ module.exports = { ]; }, + // Extend existing webpack plugins // Generate a single css-file on build from all extracted files - plugins: function(options) { + plugins: function plugins(options) { const cssFileToGenerate = options.namingConvention + '.css'; return options.creatingBuild ? [new ExtractTextPlugin({ filename: cssFileToGenerate, allChunks: true })] diff --git a/src/templates/with-sass/package.json b/src/templates/with-sass/package.json index ab766818..3fd23d56 100644 --- a/src/templates/with-sass/package.json +++ b/src/templates/with-sass/package.json @@ -19,7 +19,7 @@ "cross-env": "^5.1.5", "css-loader": "^0.28.11", "css-modules-require-hook": "^4.2.3", - "dev-toolkit": "^7.1.0", + "dev-toolkit": "^7.1.1", "express": "^4.16.3", "express-handlebars": "^3.0.0", "extract-text-webpack-plugin": "^4.0.0-beta.0",