Merge branch 'master' into improve-pattern-path-error-message

package.json

@@ -59,32 +59,32 @@
   "devDependencies": {
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-commonjs": "^22.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@rollup/plugin-typescript": "^8.3.3",
     "@rollup/pluginutils": "^4.2.1",
-    "@types/estree": "0.0.51",
+    "@types/estree": "0.0.52",
     "@types/node": "^10.17.60",
     "@types/signal-exit": "^3.0.1",
     "@types/yargs-parser": "^20.2.2",
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.30.5",
     "acorn": "^8.7.1",
     "acorn-jsx": "^5.3.2",
     "acorn-walk": "^8.2.0",
     "buble": "^0.20.0",
     "chokidar": "^3.5.3",
-    "colorette": "^2.0.17",
-    "core-js": "^3.22.8",
+    "colorette": "^2.0.19",
+    "core-js": "^3.23.3",
     "date-time": "^4.0.0",
     "es5-shim": "^4.6.7",
     "es6-shim": "^0.35.6",
-    "eslint": "^8.17.0",
+    "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "execa": "^5.1.1",
     "fixturify": "^2.1.1",
     "fs-extra": "^10.1.0",
@@ -96,12 +96,12 @@
     "magic-string": "^0.26.2",
     "mocha": "^9.2.2",
     "nyc": "^15.1.0",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "pretty-bytes": "^5.6.0",
     "pretty-ms": "^7.0.1",
     "requirejs": "^2.3.6",
-    "rollup": "^2.75.6",
-    "rollup-plugin-license": "^2.8.0",
+    "rollup": "^2.75.7",
+    "rollup-plugin-license": "^2.8.1",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-thatworks": "^1.0.4",
@@ -111,9 +111,9 @@
     "source-map-support": "^0.5.21",
     "sourcemap-codec": "^1.4.8",
     "systemjs": "^6.12.1",
-    "terser": "^5.14.0",
+    "terser": "^5.14.1",
     "tslib": "^2.4.0",
-    "typescript": "^4.7.3",
+    "typescript": "^4.7.4",
     "weak-napi": "^2.0.2",
     "yargs-parser": "^20.2.9"
   },

test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js

@@ -1,5 +1,9 @@
-define(['./main2'], (function (main) { 'use strict';
+define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict';
 
+	function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+	var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
+
+	console.log(commonjs, require$$0__default["default"]);
 
 }));

test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js

@@ -1,4 +1,10 @@
 'use strict';
 
-require('./main2.js');
+var commonjs = require('./commonjs.js');
+var require$$0 = require('external');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
+
+console.log(commonjs, require$$0__default["default"]);

test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/main.js

@@ -1 +1,4 @@
-import './main2.js';
+import commonjs from './commonjs.js';
+import require$$0 from 'external';
+
+console.log(commonjs, require$$0);

test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js

@@ -1,10 +1,15 @@
-System.register(['./main2.js'], (function () {
+System.register(['./commonjs.js', 'external'], (function () {
 	'use strict';
+	var commonjs, require$$0;
 	return {
-		setters: [function () {}],
+		setters: [function (module) {
+			commonjs = module["default"];
+		}, function (module) {
+			require$$0 = module["default"];
+		}],
 		execute: (function () {
 
-
+			console.log(commonjs, require$$0);
 
 		})
 	};

test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js

@@ -1,5 +1,9 @@
-define(['./main2'], (function (main) { 'use strict';
+define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict';
 
+	function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+	var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
+
+	console.log(commonjs, require$$0__default["default"]);
 
 }));

test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js

@@ -1,4 +1,10 @@
 'use strict';
 
-require('./main2.js');
+var commonjs = require('./commonjs.js');
+var require$$0 = require('external');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
+
+console.log(commonjs, require$$0__default["default"]);

test/chunking-form/samples/preserve-modules-commonjs/_expected/es/main.js

@@ -1 +1,4 @@
-import './main2.js';
+import commonjs from './commonjs.js';
+import require$$0 from 'external';
+
+console.log(commonjs, require$$0);

test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js

@@ -1,10 +1,15 @@
-System.register(['./main2.js'], (function () {
+System.register(['./commonjs.js', 'external'], (function () {
 	'use strict';
+	var commonjs, require$$0;
 	return {
-		setters: [function () {}],
+		setters: [function (module) {
+			commonjs = module["default"];
+		}, function (module) {
+			require$$0 = module["default"];
+		}],
 		execute: (function () {
 
-
+			console.log(commonjs, require$$0);
 
 		})
 	};

test/cli/samples/plugin/advanced-esm/_expected/cjs.js

@@ -17,5 +17,4 @@ var print = function(value) {
   }, Foo;
 }();
 
-console.log("esm-test: main.js"), new Foo(123).output(), console.log("esm-test: main.js?commonjs-entry"), 
-exports.Bar = Foo;
+console.log("esm-test: main.js"), new Foo(123).output(), exports.Bar = Foo;

test/cli/samples/plugin/advanced-esm/_expected/es.js

@@ -13,6 +13,6 @@ var print = function(value) {
   }, Foo;
 }();
 
-console.log("esm-test: main.js"), new Foo(123).output(), console.log("esm-test: main.js?commonjs-entry");
+console.log("esm-test: main.js"), new Foo(123).output();
 
 export { Foo as Bar };