Skip to content

Commit e3370c5

Browse files
authored
Merge pull request #502 from pmndrs/dev
Version 6.32.0
2 parents a368e9d + 99cda7c commit e3370c5

File tree

122 files changed

+471
-507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+471
-507
lines changed

esbuild.mjs renamed to esbuild.js

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ const banner = `/**
1919
*/`;
2020

2121
const workers = {
22-
entryPoints: await glob("src/**/worker.js"),
22+
entryPoints: await glob("./src/**/worker.js"),
2323
outExtension: { ".js": ".txt" },
24-
outdir: "tmp",
25-
target: "es6",
24+
outdir: "./tmp",
25+
target: "es2019",
2626
logLevel: "info",
2727
format: "iife",
2828
bundle: true,
2929
minify
3030
};
3131

3232
const demo = {
33-
entryPoints: ["demo/src/index.js"],
34-
outdir: "public/demo",
33+
entryPoints: ["./demo/src/index.js"],
34+
outdir: "./public/demo",
3535
target: "es6",
3636
logLevel: "info",
3737
format: "iife",
@@ -41,9 +41,9 @@ const demo = {
4141
};
4242

4343
const manual = {
44-
entryPoints: ["manual/assets/js/src/index.js"]
45-
.concat(await glob("manual/assets/js/src/demos/*.js")),
46-
outdir: "manual/assets/js/dist",
44+
entryPoints: ["./manual/assets/js/src/index.js"]
45+
.concat(await glob("./manual/assets/js/src/demos/*.js")),
46+
outdir: "./manual/assets/js/dist",
4747
logLevel: "info",
4848
format: "iife",
4949
target: "es6",
@@ -54,8 +54,8 @@ const manual = {
5454
};
5555

5656
await esbuild.build({
57-
entryPoints: ["manual/assets/js/libs/vendor.js"],
58-
outdir: "manual/assets/js/dist/libs",
57+
entryPoints: ["./manual/assets/js/libs/vendor.js"],
58+
outdir: "./manual/assets/js/dist/libs",
5959
globalName: "VENDOR",
6060
target: "es6",
6161
logLevel: "info",
@@ -82,8 +82,8 @@ if(process.argv.includes("-w")) {
8282
}
8383

8484
await esbuild.build({
85-
entryPoints: ["src/index.js"],
86-
outfile: `build/${pkg.name}.esm.js`,
85+
entryPoints: ["./src/index.js"],
86+
outfile: "./build/index.js",
8787
banner: { js: banner },
8888
logLevel: "info",
8989
format: "esm",
@@ -93,45 +93,46 @@ await esbuild.build({
9393
plugins
9494
});
9595

96+
// @todo Remove in next major release.
97+
9698
await esbuild.build({
97-
entryPoints: ["src/index.js"],
98-
outfile: `build/${pkg.name}.mjs`,
99+
entryPoints: ["./src/index.js"],
100+
outfile: "./build/index.cjs",
99101
banner: { js: banner },
100102
logLevel: "info",
101-
format: "esm",
103+
format: "cjs",
102104
target: "es2019",
103105
bundle: true,
104106
external,
105107
plugins
106108
});
107109

108-
// @todo Remove in next major release.
109110
const globalName = pkg.name.replace(/-/g, "").toUpperCase();
110111
const requireShim = "if(typeof window===\"object\"&&!window.require)window.require=()=>window.THREE;";
111112
const footer = `if(typeof module==="object"&&module.exports)module.exports=${globalName};`;
112113

113114
await esbuild.build({
114-
entryPoints: ["src/index.js"],
115-
outfile: `build/${pkg.name}.js`,
115+
entryPoints: ["./src/index.js"],
116+
outfile: `./build/${pkg.name}.js`,
116117
banner: { js: `${banner}\n${requireShim}` },
117118
footer: { js: footer },
118119
logLevel: "info",
119120
format: "iife",
120-
target: "es6",
121+
target: "es2019",
121122
bundle: true,
122123
globalName,
123124
external,
124125
plugins
125126
});
126127

127128
await esbuild.build({
128-
entryPoints: ["src/index.js"],
129-
outfile: `build/${pkg.name}.min.js`,
129+
entryPoints: ["./src/index.js"],
130+
outfile: `./build/${pkg.name}.min.js`,
130131
banner: { js: `${banner}\n${requireShim}` },
131132
footer: { js: footer },
132133
logLevel: "info",
133134
format: "iife",
134-
target: "es6",
135+
target: "es2019",
135136
bundle: true,
136137
globalName,
137138
external,

package.json

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
{
22
"name": "postprocessing",
3-
"version": "6.31.2",
4-
"description": "A post processing library that provides the means to implement image filter effects for three.js.",
3+
"version": "6.32.0",
4+
"description": "A post processing library for three.js.",
55
"homepage": "https://github.com/pmndrs/postprocessing",
6-
"sideEffects": false,
76
"license": "Zlib",
8-
"main": "build/postprocessing.js",
9-
"module": "build/postprocessing.esm.js",
10-
"types": "types/postprocessing.d.ts",
7+
"type": "module",
8+
"sideEffects": false,
9+
"main": "./build/index.cjs",
10+
"module": "./build/index.js",
11+
"types": "./types/index.d.ts",
1112
"exports": {
1213
".": {
13-
"types": "./types/postprocessing.d.ts",
14-
"import": "./build/postprocessing.esm.js",
15-
"require": "./build/postprocessing.js"
16-
},
17-
"./module": {
18-
"types": "./types/postprocessing.d.ts",
19-
"import": "./build/postprocessing.mjs"
14+
"types": "./types/index.d.ts",
15+
"import": "./build/index.js",
16+
"require": "./build/index.cjs"
2017
}
2118
},
2219
"keywords": [
@@ -46,17 +43,17 @@
4643
"url": "https://github.com/pmndrs/postprocessing/issues"
4744
},
4845
"files": [
49-
"build",
50-
"types"
46+
"./build",
47+
"./types"
5148
],
5249
"engines": {
5350
"node": ">= 0.13.2"
5451
},
5552
"scripts": {
5653
"ava": "ava",
5754
"build:css": "sass --no-source-map -I manual/assets/css/src/values manual/assets/css/src:manual/assets/css/dist",
58-
"build:js": "node esbuild.mjs",
59-
"build:js:min": "node esbuild.mjs -m",
55+
"build:js": "node esbuild",
56+
"build:js:min": "node esbuild -m",
6057
"clean": "del-cli build tmp manual/resources manual/assets/**/dist public",
6158
"copy": "copyfiles -u 2 \"demo/static/**/*\" public/demo",
6259
"deploy": "run-s copy postcss hugo gzip",
@@ -74,12 +71,12 @@
7471
"watch": "run-p watch:* start",
7572
"watch:css": "sass --no-source-map -I manual/assets/css/src/values manual/assets/css/src:manual/assets/css/dist -w",
7673
"watch:eslint": "esw -w --ext .js --color src demo/src manual/assets/js/src",
77-
"watch:js": "node esbuild.mjs -w"
74+
"watch:js": "node esbuild -w"
7875
},
7976
"ava": {
8077
"failFast": true,
8178
"files": [
82-
"test/**/*"
79+
"./test/**/*"
8380
]
8481
},
8582
"eslintConfig": {

0 commit comments

Comments
 (0)