Merge pull request #258 from msgpack/gfx/target-2020

gfx · web-flow · commit 33ed0a394aa7 · 2025-02-07T19:29:18.000+09:00
target=ES2020, dropping target=ES5 from dist
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,9 @@ benchmark/sandbox.ts
 # v8 profiler logs
 isolate-*.log
 
+# tsimp
+.tsimp/
+
 # deno
 deno.lock
 
diff --git a/README.md b/README.md
@@ -632,11 +632,11 @@ Note that `JSON` cases use `Buffer` to emulate I/O where a JavaScript string mus
 
 The NPM package distributed in npmjs.com includes both ES2015+ and ES5 files:
 
-* `dist/` is compiled into ES2019 with CommomJS, provided for NodeJS v10
-* `dist.es5+umd/` is compiled into ES5 with UMD
-  * `dist.es5+umd/msgpack.min.js` - the minified file
-  * `dist.es5+umd/msgpack.js` - the non-minified file
-* `dist.es5+esm/` is compiled into ES5 with ES modules, provided for webpack-like bundlers and NodeJS's ESM-mode
+* `dist/` is compiled into ES2020 with CommomJS, provided for NodeJS v10
+* `dist.umd/` is compiled into ES5 with UMD
+  * `dist.umd/msgpack.min.js` - the minified file
+  * `dist.umd/msgpack.js` - the non-minified file
+* `dist.esm/` is compiled into ES2020 with ES modules, provided for webpack-like bundlers and NodeJS's ESM-mode
 
 If you use NodeJS and/or webpack, their module resolvers use the suitable one automatically.
 
diff --git a/example/fetch-example.html b/example/fetch-example.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8">
-  <script src="../dist.es5+umd/msgpack.min.js"></script>
+  <script src="../dist.umd/msgpack.min.js"></script>
   <style>
     main {
       width: 80%;
diff --git a/example/umd-example.html b/example/umd-example.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="../dist.es5+umd/msgpack.min.js"></script>
+    <script src="../dist.umd/msgpack.min.js"></script>
     <style>
       main {
         width: 80%;
@@ -11,9 +11,9 @@
   </head>
   <body>
     <main>
-      <h1>AMD for @msgpack/msgpack</h1>
+      <h1>UMD for @msgpack/msgpack</h1>
       <pre><code>&lt;script src="https://unpkg.com/@msgpack/msgpack"&gt;&lt;/script&gt;</code></pre>
-      <script src="./amd-example.js"></script>
+      <script src="./umd-example.js"></script>
     </main>
   </body>
 </html>
diff --git a/example/umd-example.js b/example/umd-example.js
diff --git a/mod.ts b/mod.ts
@@ -1 +1 @@
-export * from "./dist.es5+esm/index.mjs";
+export * from "./dist.esm/index.mjs";
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,14 +5,14 @@
   "author": "The MessagePack community",
   "license": "ISC",
   "main": "./dist/index.js",
-  "module": "./dist.es5+esm/index.mjs",
-  "cdn": "./dist.es5+umd/msgpack.min.js",
-  "unpkg": "./dist.es5+umd/msgpack.min.js",
+  "module": "./dist.esm/index.mjs",
+  "cdn": "./dist.umd/msgpack.min.js",
+  "unpkg": "./dist.umd/msgpack.min.js",
   "types": "./dist/index.d.ts",
   "sideEffects": false,
   "scripts": {
     "build": "npm publish --dry-run",
-    "prepare": "npm run clean && webpack --bail && tsc --build tsconfig.dist.json tsconfig.dist.es5+esm.json && ts-node tools/esmify.ts dist.es5+esm/*.js dist.es5+esm/*/*.js",
+    "prepare": "npm run clean && webpack --bail && tsc --build tsconfig.dist.json tsconfig.dist.esm.json && ts-node tools/esmify.ts dist.esm/*.js dist.esm/*/*.js",
     "prepublishOnly": "npm run test:dist",
     "clean": "rimraf build dist dist.*",
     "test": "mocha 'test/**/*.test.ts'",
@@ -50,7 +50,6 @@
     "node": ">= 18"
   },
   "devDependencies": {
-    "@bitjourney/check-es-version-webpack-plugin": "latest",
     "@eslint/compat": "latest",
     "@eslint/eslintrc": "latest",
     "@eslint/js": "latest",
@@ -90,7 +89,7 @@
     "mod.ts",
     "src/**/*.*",
     "dist/**/*.*",
-    "dist.es5+umd/**/*.*",
-    "dist.es5+esm/**/*.*"
+    "dist.umd/**/*.*",
+    "dist.esm/**/*.*"
   ]
 }
diff --git a/tsconfig.dist.esm.json b/tsconfig.dist.esm.json
@@ -1,10 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es5",
-    "module": "es2015",
-    "downlevelIteration": true,
-    "outDir": "./dist.es5+esm",
+    "module": "es2020",
+    "outDir": "./dist.esm",
     "declaration": false,
     "noEmitOnError": true,
     "incremental": false
diff --git a/tsconfig.dist.json b/tsconfig.dist.json
@@ -1,7 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es2019",
     "outDir": "./dist",
     "declaration": true,
     "noEmitOnError": true,
diff --git a/tsconfig.dist.webpack.json b/tsconfig.dist.webpack.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.es5.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "esnext",
     "noEmitOnError": true,
diff --git a/tsconfig.es5.json b/tsconfig.es5.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     /* Basic Options */
-    "target": "ES2019", /* NodeJS v12 compatible */
+    "target": "ES2020", /* the baseline */
     "module": "CommonJS",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     "lib": ["ES2024", "dom"],                             /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
diff --git a/tsconfig.test-karma.json b/tsconfig.test-karma.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.es5.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "esnext",
     "outDir": "./build/karma",
diff --git a/webpack.config.mjs b/webpack.config.mjs
@@ -2,18 +2,16 @@ import path from "node:path";
 import url from "node:url";
 import webpack from "webpack";
 import _ from "lodash";
-// @ts-expect-error
-import { CheckEsVersionPlugin } from "@bitjourney/check-es-version-webpack-plugin";
 
 const dirname = path.dirname(url.fileURLToPath(import.meta.url));
 
 const config = {
   mode: "production",
 
   entry: "./src/index.ts",
-  target: ["web", "es5"],
+  target: ["web", "es2020"],
   output: {
-    path: path.resolve(dirname, "dist.es5+umd"),
+    path: path.resolve(dirname, "dist.umd"),
     library: "MessagePack",
     libraryTarget: "umd",
     globalObject: "this",
@@ -35,9 +33,6 @@ const config = {
   },
 
   plugins: [
-    new CheckEsVersionPlugin({
-      esVersion: 5, // for IE11 support
-    }),
     new webpack.DefinePlugin({
       "process.env.TEXT_ENCODING": "undefined",
       "process.env.TEXT_DECODER": "undefined",
@@ -55,7 +50,7 @@ const config = {
   devtool: "source-map",
 };
 
-// eslint-disable-next-line import/no-default-export
+
 export default [
   ((config) => {
     config.output.filename = "msgpack.min.js";

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export * from "./dist.es5+esm/index.mjs";`
	`1`	`+export * from "./dist.esm/index.mjs";`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "./tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "target": "es2019",`
`5`	`4`	`"outDir": "./dist",`
`6`	`5`	`"declaration": true,`
`7`	`6`	`"noEmitOnError": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "./tsconfig.es5.json",`
	`2`	`+ "extends": "./tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"module": "esnext",`
`5`	`5`	`"noEmitOnError": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`/* Basic Options */`
`4`		`- "target": "ES2019", /* NodeJS v12 compatible */`
	`4`	`+ "target": "ES2020", /* the baseline */`
`5`	`5`	`"module": "CommonJS", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */`
`6`	`6`	`"lib": ["ES2024", "dom"], /* Specify library files to be included in the compilation. */`
`7`	`7`	`// "allowJs": true, /* Allow javascript files to be compiled. */`