From 2d1c550bdc391c95551216da673571284bfc7d57 Mon Sep 17 00:00:00 2001 From: Amelie Date: Fri, 17 Dec 2021 15:50:46 -0500 Subject: [PATCH 1/2] fix: fixing build --- .DS_Store | Bin 6148 -> 0 bytes coop-webgl-gallery-2021/.env.development | 1 + coop-webgl-gallery-2021/.env.production | 1 + coop-webgl-gallery-2021/next.config.js | 1 + coop-webgl-gallery-2021/package-lock.json | 98 ++++++++++++++++-- coop-webgl-gallery-2021/package.json | 2 + coop-webgl-gallery-2021/src/data/settings.ts | 1 + .../src/pages/artwork-alastair/artwork.js | 2 +- .../artwork-alastair}/Camera.js | 4 +- .../artwork-alastair}/Experience.js | 2 +- .../artwork-alastair}/Renderer.js | 3 +- .../artwork-alastair}/Utils/Debug.js | 0 .../artwork-alastair}/Utils/EventEmitter.js | 0 .../artwork-alastair}/Utils/Resources.js | 2 +- .../artwork-alastair}/Utils/Sizes.js | 0 .../artwork-alastair}/Utils/Time.js | 0 .../artwork-alastair}/World/Background.js | 2 +- .../artwork-alastair}/World/Beads.js | 13 ++- .../artwork-alastair}/World/Environment.js | 3 +- .../artwork-alastair}/World/Floor.js | 2 +- .../artwork-alastair}/World/Waves.js | 5 +- .../artwork-alastair}/World/World.js | 0 .../World/shaders/beads/fragment.glsl.js | 0 .../World/shaders/beads/vertex.glsl.js | 0 .../World/shaders/waves/fragment.glsl.js | 0 .../World/shaders/waves/vertex.glsl.js | 0 .../artwork-alastair}/sources.js | 4 +- 27 files changed, 115 insertions(+), 31 deletions(-) delete mode 100644 .DS_Store rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Camera.js (91%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Experience.js (97%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Renderer.js (88%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Utils/Debug.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Utils/EventEmitter.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Utils/Resources.js (96%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Utils/Sizes.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/Utils/Time.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/Background.js (96%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/Beads.js (96%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/Environment.js (95%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/Floor.js (98%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/Waves.js (95%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/World.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/shaders/beads/fragment.glsl.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/shaders/beads/vertex.glsl.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/shaders/waves/fragment.glsl.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/World/shaders/waves/vertex.glsl.js (100%) rename coop-webgl-gallery-2021/src/{pages/artwork-alastair/Experience => webgl/artwork-alastair}/sources.js (95%) diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index cbc4dd52ba3d444dbb5cc9f616018c1745fc5f8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKK~BR!475uQLG7U@#4#TLQFs8M3NPpfAQT0pRH=Z1IFW~N;K)CC2VX&q*H)V- zfK(0@LbhbjuD#yuPO7*jA|5ZMBcdS@#ZbZCHp~|yanX+S%p*aTJ<4JZ zI0GAJ05w}A?kl==2AlzBV99`d9}=iwYFI0VPX|nB0e}(QK`@qHLUIzr)UZ}W1j3pM z)Ks<>gEbxg#MY&TwW6jITl2y8WVQ~4!_%>U5|$IEif)|&XQ0i%mQIIK|4+Z~|JzAE za|WD&f5iYt*(4j|N>*Dtmy=qXK+m8evaVKKreF|CG1f{c-h~E%Kal}2HLMlkf%qSR MK!Y1+V51Ct0#9OEtpET3 diff --git a/coop-webgl-gallery-2021/.env.development b/coop-webgl-gallery-2021/.env.development index cf06aed..3ace56a 100644 --- a/coop-webgl-gallery-2021/.env.development +++ b/coop-webgl-gallery-2021/.env.development @@ -12,6 +12,7 @@ NEXT_PUBLIC_BUILD_TIME="YYYY/MM/DD" NEXT_PUBLIC_PULL_REQUEST="" NEXT_PUBLIC_BUILD_ID="" NEXT_PUBLIC_GTM_ID="GTM-0000000" +NEXT_PUBLIC_URL="" OPTIMIZE_IMAGES=false diff --git a/coop-webgl-gallery-2021/.env.production b/coop-webgl-gallery-2021/.env.production index 09449d8..5eda8e0 100644 --- a/coop-webgl-gallery-2021/.env.production +++ b/coop-webgl-gallery-2021/.env.production @@ -12,5 +12,6 @@ NEXT_PUBLIC_BUILD_TIME=$CI_STRING_TIME NEXT_PUBLIC_PULL_REQUEST=$CI_PULL_REQUEST NEXT_PUBLIC_BUILD_ID=$CI_BUILD_ID NEXT_PUBLIC_GTM_ID=$GTM_ID +NEXT_PUBLIC_URL="/intern-webgl-gallery/coop-webgl-gallery-2021" OPTIMIZE_IMAGES=true diff --git a/coop-webgl-gallery-2021/next.config.js b/coop-webgl-gallery-2021/next.config.js index 5365c60..710c212 100644 --- a/coop-webgl-gallery-2021/next.config.js +++ b/coop-webgl-gallery-2021/next.config.js @@ -4,6 +4,7 @@ const withPWA = require('next-pwa'); const runtimeCaching = require('next-pwa/cache'); const withPlugins = require('next-compose-plugins'); const optimizedImages = require('next-optimized-images'); +const withTM = require('next-transpile-modules')(['three']); const optimizedImagesConfig = { inlineImageLimit: 1, diff --git a/coop-webgl-gallery-2021/package-lock.json b/coop-webgl-gallery-2021/package-lock.json index 2a867fc..585b58b 100644 --- a/coop-webgl-gallery-2021/package-lock.json +++ b/coop-webgl-gallery-2021/package-lock.json @@ -21,6 +21,7 @@ "lil-gui": "^0.15.0", "next": "^12.0.4", "next-pwa": "^5.4.0", + "next-transpile-modules": "^9.0.0", "no-op": "1.0.3", "normalize.css": "8.0.1", "react": "^17.0.2", @@ -2633,6 +2634,7 @@ "@hint/utils-fs": "^1.0.11", "@hint/utils-network": "^1.0.14", "@hint/utils-types": "^1.1.5", + "canvas": "^2.8.0", "jsdom": "^16.6.0", "mutationobserver-shim": "^0.3.7" }, @@ -9615,6 +9617,7 @@ "merge-source-map": "^1.1.0", "postcss": "^7.0.36", "postcss-selector-parser": "^6.0.2", + "prettier": "^1.18.2 || ^2.0.0", "source-map": "~0.6.1", "vue-template-es2015-compiler": "^1.9.0" }, @@ -13387,6 +13390,7 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", + "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -13652,6 +13656,7 @@ "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==", "dev": true, "dependencies": { + "colors": "^1.1.2", "object-assign": "^4.1.0", "string-width": "^4.2.0" }, @@ -13960,6 +13965,9 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -18049,7 +18057,6 @@ "version": "5.8.3", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", - "dev": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -18062,7 +18069,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, "engines": { "node": ">=6" } @@ -18429,6 +18435,25 @@ "integrity": "sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==", "dev": true, "hasInstallScript": true, + "dependencies": { + "esbuild-android-arm64": "0.13.15", + "esbuild-darwin-64": "0.13.15", + "esbuild-darwin-arm64": "0.13.15", + "esbuild-freebsd-64": "0.13.15", + "esbuild-freebsd-arm64": "0.13.15", + "esbuild-linux-32": "0.13.15", + "esbuild-linux-64": "0.13.15", + "esbuild-linux-arm": "0.13.15", + "esbuild-linux-arm64": "0.13.15", + "esbuild-linux-mips64le": "0.13.15", + "esbuild-linux-ppc64le": "0.13.15", + "esbuild-netbsd-64": "0.13.15", + "esbuild-openbsd-64": "0.13.15", + "esbuild-sunos-64": "0.13.15", + "esbuild-windows-32": "0.13.15", + "esbuild-windows-64": "0.13.15", + "esbuild-windows-arm64": "0.13.15" + }, "bin": { "esbuild": "bin/esbuild" }, @@ -18638,7 +18663,8 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1" + "optionator": "^0.8.1", + "source-map": "~0.6.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -20260,6 +20286,7 @@ "dev": true, "optional": true, "dependencies": { + "@types/yauzl": "^2.9.1", "debug": "^4.1.1", "get-stream": "^5.1.0", "yauzl": "^2.10.0" @@ -20576,6 +20603,9 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -22248,6 +22278,7 @@ "minimist": "^1.2.5", "neo-async": "^2.6.0", "source-map": "^0.6.1", + "uglify-js": "^3.1.4", "wordwrap": "^1.0.0" }, "bin": { @@ -23089,6 +23120,8 @@ "integrity": "sha512-SwkiiBAL0mNeoBIjdXXGb2wUzPWfJU5yTZQ6wK+8+epi60WwMQ0jd9X/1CfDGXLi1q7PP0bshdw2zjvoki8/Cg==", "dev": true, "dependencies": { + "@hint/configuration-development": "^8.3.1", + "@hint/configuration-web-recommended": "^8.2.6", "@hint/utils": "^7.0.13", "@hint/utils-debug": "^1.0.7", "@hint/utils-fs": "^1.0.11", @@ -26325,6 +26358,7 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -26622,6 +26656,7 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dependencies": { + "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { @@ -26917,6 +26952,9 @@ "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "dev": true, + "dependencies": { + "graceful-fs": "^4.1.9" + }, "optionalDependencies": { "graceful-fs": "^4.1.9" } @@ -27093,7 +27131,14 @@ "dev": true, "dependencies": { "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "needle": "^2.5.2", "parse-node-version": "^1.0.1", + "source-map": "~0.6.0", "tslib": "^2.3.0" }, "bin": { @@ -30777,6 +30822,7 @@ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "dev": true, "dependencies": { + "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -31253,6 +31299,17 @@ "@next/polyfill-module": "12.0.4", "@next/react-dev-overlay": "12.0.4", "@next/react-refresh-utils": "12.0.4", + "@next/swc-android-arm64": "12.0.4", + "@next/swc-darwin-arm64": "12.0.4", + "@next/swc-darwin-x64": "12.0.4", + "@next/swc-linux-arm-gnueabihf": "12.0.4", + "@next/swc-linux-arm64-gnu": "12.0.4", + "@next/swc-linux-arm64-musl": "12.0.4", + "@next/swc-linux-x64-gnu": "12.0.4", + "@next/swc-linux-x64-musl": "12.0.4", + "@next/swc-win32-arm64-msvc": "12.0.4", + "@next/swc-win32-ia32-msvc": "12.0.4", + "@next/swc-win32-x64-msvc": "12.0.4", "acorn": "8.5.0", "assert": "2.0.0", "browserify-zlib": "0.2.0", @@ -31711,6 +31768,15 @@ "next": "*" } }, + "node_modules/next-transpile-modules": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/next-transpile-modules/-/next-transpile-modules-9.0.0.tgz", + "integrity": "sha512-VCNFOazIAnXn1hvgYYSTYMnoWgKgwlYh4lm1pKbSfiB3kj5ZYLcKVhfh3jkPOg1cnd9DP+pte9yCUocdPEUBTQ==", + "dependencies": { + "enhanced-resolve": "^5.7.0", + "escalade": "^3.1.1" + } + }, "node_modules/next/node_modules/@babel/runtime": { "version": "7.15.4", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", @@ -31794,6 +31860,7 @@ "dependencies": { "anymatch": "~3.1.1", "braces": "~3.0.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -39416,6 +39483,7 @@ "dev": true, "dependencies": { "debuglog": "^1.0.1", + "graceful-fs": "^4.1.2", "read-package-json": "^2.0.0", "readdir-scoped-modules": "^1.0.0", "semver": "2 || 3 || 4 || 5", @@ -40707,6 +40775,9 @@ "version": "2.60.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.60.1.tgz", "integrity": "sha512-akwfnpjY0rXEDSn1UTVfKXJhPsEBu+imi1gqBA1ZkHGydUnkV/fWCC90P7rDaLEW8KTwBcS1G3N4893Ndz+jwg==", + "dependencies": { + "fsevents": "~2.3.2" + }, "bin": { "rollup": "dist/bin/rollup" }, @@ -41727,6 +41798,9 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -48658,6 +48732,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -49718,8 +49793,10 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dependencies": { + "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -64411,7 +64488,6 @@ "version": "5.8.3", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", - "dev": true, "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -64420,8 +64496,7 @@ "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" } } }, @@ -75267,6 +75342,15 @@ "minimist": "^1.2.5" } }, + "next-transpile-modules": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/next-transpile-modules/-/next-transpile-modules-9.0.0.tgz", + "integrity": "sha512-VCNFOazIAnXn1hvgYYSTYMnoWgKgwlYh4lm1pKbSfiB3kj5ZYLcKVhfh3jkPOg1cnd9DP+pte9yCUocdPEUBTQ==", + "requires": { + "enhanced-resolve": "^5.7.0", + "escalade": "^3.1.1" + } + }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", diff --git a/coop-webgl-gallery-2021/package.json b/coop-webgl-gallery-2021/package.json index 4c6e5d6..c74d67c 100644 --- a/coop-webgl-gallery-2021/package.json +++ b/coop-webgl-gallery-2021/package.json @@ -17,6 +17,7 @@ "build:ssr": "next build", "build:static": "next build && next export", "postbuild:static": "npm-run-all postcss next-sitemap", + "deploy": "npm-run-all build:static", "ci-prod-server": "serve out &", "next-sitemap": "next-sitemap", "postcss": "postcss ./out/**/*.css --use css-declaration-sorter --replace --no-map", @@ -54,6 +55,7 @@ "lil-gui": "^0.15.0", "next": "^12.0.4", "next-pwa": "^5.4.0", + "next-transpile-modules": "^9.0.0", "no-op": "1.0.3", "normalize.css": "8.0.1", "react": "^17.0.2", diff --git a/coop-webgl-gallery-2021/src/data/settings.ts b/coop-webgl-gallery-2021/src/data/settings.ts index 2dad427..a851c9c 100644 --- a/coop-webgl-gallery-2021/src/data/settings.ts +++ b/coop-webgl-gallery-2021/src/data/settings.ts @@ -4,3 +4,4 @@ export const resizeDebounceTime = 10; // in ms // head export const siteName = 'Jam3 Generator'; export const siteSlogan = 'The Relentless Pursuit of Better'; +export const baseUrl = process.env.NEXT_PUBLIC_URL || ''; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/artwork.js b/coop-webgl-gallery-2021/src/pages/artwork-alastair/artwork.js index be5f8a8..42519c0 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/artwork.js +++ b/coop-webgl-gallery-2021/src/pages/artwork-alastair/artwork.js @@ -1,6 +1,6 @@ import { useRef, useEffect } from 'react'; -import Experience from './Experience/Experience'; +import Experience from '../../webgl/artwork-alastair/Experience'; function Art() { const inputEl = useRef(null); diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Camera.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Camera.js similarity index 91% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Camera.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Camera.js index ac4e352..3d7c31d 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Camera.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Camera.js @@ -1,8 +1,6 @@ -import { PerspectiveCamera } from 'three/build/three.module'; +import { PerspectiveCamera, Vector3 } from 'three'; import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'; -import { Vector3 } from 'three/src/math/Vector3.js'; - import Experience from './Experience'; export default class Camera { diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Experience.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Experience.js similarity index 97% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Experience.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Experience.js index 63eafd1..141fa8e 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Experience.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Experience.js @@ -1,4 +1,4 @@ -import { Scene, Mesh } from 'three/build/three.module'; +import { Scene, Mesh } from 'three'; // import { OimoPhysics } from 'three/examples/jsm/physics/OimoPhysics.js'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Renderer.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Renderer.js similarity index 88% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Renderer.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Renderer.js index b2e920e..56ce2b0 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Renderer.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Renderer.js @@ -1,5 +1,4 @@ -import { WebGLRenderer } from 'three/build/three.module'; -import { sRGBEncoding, CineonToneMapping, PCFSoftShadowMap } from 'three/src/constants'; +import { WebGLRenderer, sRGBEncoding, CineonToneMapping, PCFSoftShadowMap } from 'three'; import Experience from './Experience'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Debug.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Debug.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Debug.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Debug.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/EventEmitter.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/EventEmitter.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/EventEmitter.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/EventEmitter.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Resources.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Resources.js similarity index 96% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Resources.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Resources.js index 1c01766..8c181d9 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Resources.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Resources.js @@ -1,4 +1,4 @@ -import { TextureLoader, CubeTextureLoader } from 'three/build/three.module'; +import { TextureLoader, CubeTextureLoader } from 'three'; import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'; import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader'; import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Sizes.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Sizes.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Sizes.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Sizes.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Time.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Time.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/Utils/Time.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/Utils/Time.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Background.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Background.js similarity index 96% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Background.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Background.js index efd27d8..2467563 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Background.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Background.js @@ -1,4 +1,4 @@ -import { SphereGeometry, Mesh, MeshBasicMaterial, BackSide } from 'three/build/three.module'; +import { SphereGeometry, Mesh, MeshBasicMaterial, BackSide } from 'three'; import Experience from '../Experience.js'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Beads.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Beads.js similarity index 96% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Beads.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Beads.js index 4674249..7a40788 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Beads.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Beads.js @@ -6,14 +6,13 @@ import { InstancedMesh, Mesh, MeshStandardMaterial, - DynamicDrawUsage + DynamicDrawUsage, + Vector2, + Matrix4, + Color, + BufferAttribute // Raycaster -} from 'three/build/three.module'; - -import { Vector2 } from 'three/src/math/Vector2.js'; -import { Matrix4 } from 'three/src/math/Matrix4.js'; -import { Color } from 'three/src/math/Color.js'; -import { BufferAttribute } from 'three/src/core/BufferAttribute.js'; +} from 'three'; import { DragControls } from 'three/examples/jsm/controls/DragControls'; import Experience from '../Experience.js'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Environment.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Environment.js similarity index 95% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Environment.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Environment.js index be62642..c6926f2 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Environment.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Environment.js @@ -1,5 +1,4 @@ -import { PointLight, Mesh, MeshStandardMaterial, SphereGeometry } from 'three/build/three.module'; -import { Fog } from 'three/src/scenes/Fog.js'; +import { PointLight, Mesh, MeshStandardMaterial, SphereGeometry, Fog } from 'three'; import { Lensflare, LensflareElement } from 'three/examples/jsm/objects/Lensflare.js'; import Experience from '../Experience.js'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Floor.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Floor.js similarity index 98% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Floor.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Floor.js index 762b515..3531003 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Floor.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Floor.js @@ -5,7 +5,7 @@ import { RepeatWrapping, Mesh, MeshStandardMaterial -} from 'three/build/three.module'; +} from 'three'; import Experience from '../Experience.js'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Waves.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Waves.js similarity index 95% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Waves.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Waves.js index ec87447..247f8e9 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/Waves.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/Waves.js @@ -1,7 +1,4 @@ -import { PlaneGeometry, BoxGeometry, SphereGeometry, Mesh, ShaderMaterial } from 'three/build/three.module'; - -import { Vector2 } from 'three/src/math/Vector2.js'; -import { Color } from 'three/src/math/Color.js'; +import { PlaneGeometry, BoxGeometry, SphereGeometry, Mesh, ShaderMaterial, Vector2, Color } from 'three'; import Experience from '../Experience.js'; diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/World.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/World.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/World.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/World.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/beads/fragment.glsl.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/beads/fragment.glsl.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/beads/fragment.glsl.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/beads/fragment.glsl.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/beads/vertex.glsl.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/beads/vertex.glsl.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/beads/vertex.glsl.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/beads/vertex.glsl.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/waves/fragment.glsl.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/waves/fragment.glsl.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/waves/fragment.glsl.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/waves/fragment.glsl.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/waves/vertex.glsl.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/waves/vertex.glsl.js similarity index 100% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/World/shaders/waves/vertex.glsl.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/World/shaders/waves/vertex.glsl.js diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/sources.js b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/sources.js similarity index 95% rename from coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/sources.js rename to coop-webgl-gallery-2021/src/webgl/artwork-alastair/sources.js index 34e6d7d..7a6fd84 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/Experience/sources.js +++ b/coop-webgl-gallery-2021/src/webgl/artwork-alastair/sources.js @@ -1,4 +1,6 @@ -const path_start = `../../assets/static-alastair/`; +import { baseUrl } from '../../data/settings'; + +const path_start = `${baseUrl}/assets/static-alastair/`; export default [ //===== TEXTURES ===== From 0fdca9fd799c651ee313add4f285002b3dca853b Mon Sep 17 00:00:00 2001 From: Amelie Date: Fri, 17 Dec 2021 16:35:13 -0500 Subject: [PATCH 2/2] fix: finishing deployment --- coop-webgl-gallery-2021/.env.development | 2 +- coop-webgl-gallery-2021/.env.production | 2 +- coop-webgl-gallery-2021/.nojekyll | 0 coop-webgl-gallery-2021/next.config.js | 2 +- coop-webgl-gallery-2021/package-lock.json | 383 +++++++++++++++++- coop-webgl-gallery-2021/package.json | 3 +- .../pages/artwork-alastair/index.module.scss | 2 +- 7 files changed, 382 insertions(+), 12 deletions(-) create mode 100644 coop-webgl-gallery-2021/.nojekyll diff --git a/coop-webgl-gallery-2021/.env.development b/coop-webgl-gallery-2021/.env.development index 3ace56a..13590d7 100644 --- a/coop-webgl-gallery-2021/.env.development +++ b/coop-webgl-gallery-2021/.env.development @@ -3,7 +3,7 @@ BUNDLE_ANALYZE=false ENABLE_PWA=false # custom env key -NEXT_PUBLIC_WEBSITE_SITE_URL="https://localhost:3000" +NEXT_PUBLIC_WEBSITE_SITE_URL="https://jam3.github.io/intern-webgl-gallery" NEXT_PUBLIC_ENVIRONMENT="local" NEXT_PUBLIC_COMMIT_ID="commit-id" NEXT_PUBLIC_PR_NUMBER="major" diff --git a/coop-webgl-gallery-2021/.env.production b/coop-webgl-gallery-2021/.env.production index 5eda8e0..0b14b1b 100644 --- a/coop-webgl-gallery-2021/.env.production +++ b/coop-webgl-gallery-2021/.env.production @@ -12,6 +12,6 @@ NEXT_PUBLIC_BUILD_TIME=$CI_STRING_TIME NEXT_PUBLIC_PULL_REQUEST=$CI_PULL_REQUEST NEXT_PUBLIC_BUILD_ID=$CI_BUILD_ID NEXT_PUBLIC_GTM_ID=$GTM_ID -NEXT_PUBLIC_URL="/intern-webgl-gallery/coop-webgl-gallery-2021" +NEXT_PUBLIC_URL="/intern-webgl-gallery" OPTIMIZE_IMAGES=true diff --git a/coop-webgl-gallery-2021/.nojekyll b/coop-webgl-gallery-2021/.nojekyll new file mode 100644 index 0000000..e69de29 diff --git a/coop-webgl-gallery-2021/next.config.js b/coop-webgl-gallery-2021/next.config.js index 710c212..a2d81aa 100644 --- a/coop-webgl-gallery-2021/next.config.js +++ b/coop-webgl-gallery-2021/next.config.js @@ -4,7 +4,6 @@ const withPWA = require('next-pwa'); const runtimeCaching = require('next-pwa/cache'); const withPlugins = require('next-compose-plugins'); const optimizedImages = require('next-optimized-images'); -const withTM = require('next-transpile-modules')(['three']); const optimizedImagesConfig = { inlineImageLimit: 1, @@ -48,6 +47,7 @@ const nextJSConfig = { sassOptions: { includePaths: [path.join(__dirname, 'src/styles')] }, + basePath: process.env.NEXT_PUBLIC_URL, webpack: function (config, options) { config.module.rules.push({ test: /\.svg$/, diff --git a/coop-webgl-gallery-2021/package-lock.json b/coop-webgl-gallery-2021/package-lock.json index 585b58b..ec5d5cd 100644 --- a/coop-webgl-gallery-2021/package-lock.json +++ b/coop-webgl-gallery-2021/package-lock.json @@ -16,6 +16,7 @@ "default-passive-events": "2.0.0", "focus-visible": "5.2.0", "get-scroll": "2.0.1", + "gh-pages": "^3.2.3", "gsap": "3.8.0", "js-cookie": "^3.0.0", "lil-gui": "^0.15.0", @@ -17843,6 +17844,11 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" }, + "node_modules/email-addresses": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz", + "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==" + }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -20654,7 +20660,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=", - "dev": true, "engines": { "node": ">=4" } @@ -21783,6 +21788,219 @@ "assert-plus": "^1.0.0" } }, + "node_modules/gh-pages": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.3.tgz", + "integrity": "sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==", + "dependencies": { + "async": "^2.6.1", + "commander": "^2.18.0", + "email-addresses": "^3.0.1", + "filenamify": "^4.3.0", + "find-cache-dir": "^3.3.1", + "fs-extra": "^8.1.0", + "globby": "^6.1.0" + }, + "bin": { + "gh-pages": "bin/gh-pages.js", + "gh-pages-clean": "bin/gh-pages-clean.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gh-pages/node_modules/array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dependencies": { + "array-uniq": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gh-pages/node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/gh-pages/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "node_modules/gh-pages/node_modules/filenamify": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", + "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "dependencies": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.1", + "trim-repeated": "^1.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gh-pages/node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, + "node_modules/gh-pages/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/gh-pages/node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/gh-pages/node_modules/globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dependencies": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gh-pages/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dependencies": { + "graceful-fs": "^4.1.6" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/gh-pages/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/gh-pages/node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gh-pages/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gh-pages/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/gh-pages/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gh-pages/node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/gh-pages/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/gh-pages/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/gifsicle": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-4.0.1.tgz", @@ -44005,7 +44223,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", - "dev": true, "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -47121,7 +47338,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", - "dev": true, "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -64319,6 +64535,11 @@ } } }, + "email-addresses": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz", + "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==" + }, "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -66405,8 +66626,7 @@ "filename-reserved-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", - "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=", - "dev": true + "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=" }, "filenamify": { "version": "2.1.0", @@ -67314,6 +67534,157 @@ "assert-plus": "^1.0.0" } }, + "gh-pages": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-3.2.3.tgz", + "integrity": "sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==", + "requires": { + "async": "^2.6.1", + "commander": "^2.18.0", + "email-addresses": "^3.0.1", + "filenamify": "^4.3.0", + "find-cache-dir": "^3.3.1", + "fs-extra": "^8.1.0", + "globby": "^6.1.0" + }, + "dependencies": { + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "requires": { + "array-uniq": "^1.0.1" + } + }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "filenamify": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", + "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "requires": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.1", + "trim-repeated": "^1.0.0" + } + }, + "find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "requires": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + } + } + }, "gifsicle": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-4.0.1.tgz", @@ -84601,7 +84972,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", - "dev": true, "requires": { "escape-string-regexp": "^1.0.2" } @@ -87053,7 +87423,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", - "dev": true, "requires": { "escape-string-regexp": "^1.0.2" } diff --git a/coop-webgl-gallery-2021/package.json b/coop-webgl-gallery-2021/package.json index c74d67c..08a8fb6 100644 --- a/coop-webgl-gallery-2021/package.json +++ b/coop-webgl-gallery-2021/package.json @@ -17,7 +17,7 @@ "build:ssr": "next build", "build:static": "next build && next export", "postbuild:static": "npm-run-all postcss next-sitemap", - "deploy": "npm-run-all build:static", + "deploy": "npm run build:static && touch ./out/.nojekyll && gh-pages -d out -t true", "ci-prod-server": "serve out &", "next-sitemap": "next-sitemap", "postcss": "postcss ./out/**/*.css --use css-declaration-sorter --replace --no-map", @@ -50,6 +50,7 @@ "default-passive-events": "2.0.0", "focus-visible": "5.2.0", "get-scroll": "2.0.1", + "gh-pages": "^3.2.3", "gsap": "3.8.0", "js-cookie": "^3.0.0", "lil-gui": "^0.15.0", diff --git a/coop-webgl-gallery-2021/src/pages/artwork-alastair/index.module.scss b/coop-webgl-gallery-2021/src/pages/artwork-alastair/index.module.scss index 7b8c8c4..e23aab0 100644 --- a/coop-webgl-gallery-2021/src/pages/artwork-alastair/index.module.scss +++ b/coop-webgl-gallery-2021/src/pages/artwork-alastair/index.module.scss @@ -52,7 +52,7 @@ width: px(50); height: px(50); border-radius: 50%; - background: #000000; + background: #000; display: flex; align-items: center; }