Skip to content

Commit 70bdef5

Browse files
authored
Merge branch 'master' into minify-options
2 parents 6aed797 + 037b521 commit 70bdef5

18 files changed

Lines changed: 4372 additions & 3745 deletions

.idea/workspace.xml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ custom:
136136
- echo hello > test
137137
rawFileExtensions: # An array of file extensions to import using the Webpack raw-loader.
138138
- csv # Defaults to ['pem', 'txt']
139+
experiments: # Give the ability to activate and try out experimental features of Webpack
139140
140141
```
141142

package-lock.json

Lines changed: 4343 additions & 3645 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "serverless-bundle",
3-
"version": "5.3.0",
3+
"version": "5.4.0",
44
"description": "An extension of the serverless-webpack plugin that bundles your ES6 + TypeScript Node.js Lambda functions.",
55
"main": "index.js",
66
"scripts": {

src/config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ module.exports = {
2929
externals: ["knex", "sharp"],
3030
// Set default file extensions to use the raw-loader with
3131
rawFileExtensions: ["pem", "txt"],
32-
minifyOptions: {}
32+
minifyOptions: {},
33+
experiments: {},
3334
},
3435
};

src/webpack.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const nodeVersion = config.nodeVersion;
3434
const externals = config.options.externals;
3535
const copyFiles = config.options.copyFiles;
3636
const concatText = config.options.concatText;
37+
const experiments = config.options.experiments;
3738
const esbuildNodeVersion = "node" + nodeVersion;
3839
const forceExclude = config.options.forceExclude;
3940
const ignorePackages = config.options.ignorePackages;
@@ -480,6 +481,7 @@ module.exports = {
480481
],
481482
},
482483
plugins: plugins(),
484+
experiments,
483485
node: {
484486
__dirname: false,
485487
},

tests/base/package-lock.json

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/typescript-project-references/lib-bar/package-lock.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/typescript-project-references/lib-bar/package.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/typescript-project-references/lib-bar/src/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)