Merge pull request #470 from pmndrs/dev

Version 6.30.2

Author: vanruesc

esbuild.mjs

@@ -1,15 +1,13 @@
 import { createRequire } from "module";
 import { glsl } from "esbuild-plugin-glsl";
-import tsPaths from "esbuild-ts-paths";
 import glob from "tiny-glob";
 import esbuild from "esbuild";
 
 const require = createRequire(import.meta.url);
 const pkg = require("./package");
 
 const minify = process.argv.includes("-m");
-const watch = process.argv.includes("-w");
-const plugins = [glsl({ minify }), tsPaths()];
+const plugins = [glsl({ minify })];
 const external = ["three", "spatial-controls", "tweakpane"];
 
 const date = new Date();
@@ -20,42 +18,29 @@ const banner = `/**
  * @license ${pkg.license}
  */`;
 
-await esbuild.build({
+const workers = {
 	entryPoints: await glob("src/**/worker.js"),
 	outExtension: { ".js": ".txt" },
 	outdir: "tmp",
 	target: "es6",
 	logLevel: "info",
 	format: "iife",
 	bundle: true,
-	minify,
-	watch
-}).catch(() => process.exit(1));
+	minify
+};
 
-await esbuild.build({
+const demo = {
 	entryPoints: ["demo/src/index.js"],
 	outdir: "public/demo",
 	target: "es6",
 	logLevel: "info",
 	format: "iife",
 	bundle: true,
 	plugins,
-	minify,
-	watch
-}).catch(() => process.exit(1));
-
-await esbuild.build({
-	entryPoints: ["manual/assets/js/libs/vendor.js"],
-	outdir: "manual/assets/js/dist/libs",
-	globalName: "VENDOR",
-	target: "es6",
-	logLevel: "info",
-	format: "iife",
-	bundle: true,
 	minify
-}).catch(() => process.exit(1));
+};
 
-await esbuild.build({
+const manual = {
 	entryPoints: ["manual/assets/js/src/index.js"]
 		.concat(await glob("manual/assets/js/src/demos/*.js")),
 	outdir: "manual/assets/js/dist",
@@ -65,9 +50,36 @@ await esbuild.build({
 	bundle: true,
 	external,
 	plugins,
-	minify,
-	watch
-}).catch(() => process.exit(1));
+	minify
+};
+
+await esbuild.build({
+	entryPoints: ["manual/assets/js/libs/vendor.js"],
+	outdir: "manual/assets/js/dist/libs",
+	globalName: "VENDOR",
+	target: "es6",
+	logLevel: "info",
+	format: "iife",
+	bundle: true,
+	minify
+});
+
+if(process.argv.includes("-w")) {
+
+	const ctxWorkers = await esbuild.context(workers);
+	const ctxDemo = await esbuild.context(demo);
+	const ctxManual = await esbuild.context(manual);
+	await ctxWorkers.watch();
+	await ctxDemo.watch();
+	await ctxManual.watch();
+
+} else {
+
+	await esbuild.build(workers);
+	await esbuild.build(demo);
+	await esbuild.build(manual);
+
+}
 
 await esbuild.build({
 	entryPoints: ["src/index.js"],
@@ -79,7 +91,7 @@ await esbuild.build({
 	bundle: true,
 	external,
 	plugins
-}).catch(() => process.exit(1));
+});
 
 await esbuild.build({
 	entryPoints: ["src/index.js"],
@@ -91,11 +103,11 @@ await esbuild.build({
 	bundle: true,
 	external,
 	plugins
-}).catch(() => process.exit(1));
+});
 
 // @todo Remove in next major release.
 const globalName = pkg.name.replace(/-/g, "").toUpperCase();
-const requireShim = `if(typeof window==="object"&&!window.require)window.require=()=>window.THREE;`;
+const requireShim = "if(typeof window===\"object\"&&!window.require)window.require=()=>window.THREE;";
 const footer = `if(typeof module==="object"&&module.exports)module.exports=${globalName};`;
 
 await esbuild.build({
@@ -110,7 +122,7 @@ await esbuild.build({
 	globalName,
 	external,
 	plugins
-}).catch(() => process.exit(1));
+});
 
 await esbuild.build({
 	entryPoints: ["src/index.js"],
@@ -125,4 +137,4 @@ await esbuild.build({
 	external,
 	plugins,
 	minify
-}).catch(() => process.exit(1));
+});

manual/.stylelintrc.json

@@ -9,25 +9,18 @@
 		"scss/operator-no-newline-after": null,
 		"order/properties-alphabetical-order": true,
 		"color-function-notation": null,
-		"color-hex-case": "upper",
 		"color-hex-length": null,
 		"color-named": null,
 		"declaration-empty-line-before": null,
-		"function-parentheses-space-inside": null,
-		"indentation": "tab",
-		"max-line-length": 120,
 		"max-nesting-depth": null,
 		"no-descending-specificity": null,
 		"no-empty-source": null,
 		"no-invalid-position-at-import-rule": null,
-		"number-no-trailing-zeros": null,
 		"rule-empty-line-before": null,
 		"selector-class-pattern": null,
-		"selector-list-comma-newline-after": null,
 		"selector-max-compound-selectors": null,
 		"selector-max-id": null,
 		"selector-no-qualifying-type": null,
-		"shorthand-property-no-redundant-values": null,
-		"string-quotes": "double"
+		"shorthand-property-no-redundant-values": null
 	}
 }

manual/assets/css/src/screen/default/layout/_progress.scss

@@ -2,15 +2,12 @@
 
 .progress {
 	align-items: center;
-	bottom: 0;
 	display: flex;
 	flex-direction: column;
+	inset: 0 0 0 0;
 	justify-content: center;
-	left: 0;
 	pointer-events: none;
 	position: absolute;
-	right: 0;
-	top: 0;
 	user-select: none;
 	z-index: layers.$foreground;
 }

package.json

@@ -1,24 +1,24 @@
 {
 	"name": "postprocessing",
-	"version": "6.30.1",
+	"version": "6.30.2",
 	"description": "A post processing library that provides the means to implement image filter effects for three.js.",
 	"homepage": "https://github.com/pmndrs/postprocessing",
+	"sideEffects": false,
+	"license": "Zlib",
 	"main": "build/postprocessing.js",
 	"module": "build/postprocessing.esm.js",
+	"types": "types/postprocessing.d.ts",
 	"exports": {
 		".": {
+			"types": "./types/postprocessing.d.ts",
 			"import": "./build/postprocessing.esm.js",
-			"require": "./build/postprocessing.js",
-			"types": "./types/postprocessing.d.ts"
+			"require": "./build/postprocessing.js"
 		},
 		"./module": {
-			"import": "./build/postprocessing.mjs",
-			"types": "./types/postprocessing.d.ts"
+			"types": "./types/postprocessing.d.ts",
+			"import": "./build/postprocessing.mjs"
 		}
 	},
-	"types": "types/postprocessing.d.ts",
-	"sideEffects": false,
-	"license": "Zlib",
 	"keywords": [
 		"rendering",
 		"image",
@@ -86,7 +86,7 @@
 		"extends": "aether"
 	},
 	"peerDependencies": {
-		"three": ">= 0.138.0 < 0.151.0"
+		"three": ">= 0.138.0 < 0.152.0"
 	},
 	"devDependencies": {
 		"@tweakpane/core": "1.x.x",
@@ -99,9 +99,8 @@
 		"cssnano": "5.x.x",
 		"dat.gui": "0.x.x",
 		"del-cli": "5.x.x",
-		"esbuild": "0.16.x",
+		"esbuild": "0.17.x",
 		"esbuild-plugin-glsl": "1.x.x",
-		"esbuild-ts-paths": "1.x.x",
 		"esdoc": "1.x.x",
 		"esdoc-importpath-plugin": "1.x.x",
 		"esdoc-standard-plugin": "1.x.x",