Merge pull request #353 from concord-consortium/187028887-fix-release

Fix release process, handle data assets correctly, rm old favicons
concord-consortium · Feb 12, 2024 · cdbaf93 · cdbaf93
2 parents 248d568 + 39790e7
commit cdbaf93
Show file tree

Hide file tree

Showing 42 changed files with 54 additions and 273 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/tecrock-simulation/package.json b/packages/tecrock-simulation/package.json
@@ -100,7 +100,6 @@
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
     "canvas": "^2.11.2",
-    "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "cypress": "^13.6.2",
     "cypress-image-snapshot": "^4.0.1",

diff --git a/packages/tecrock-simulation/public/android-chrome-192x192.png b/packages/tecrock-simulation/public/android-chrome-192x192.png
diff --git a/packages/tecrock-simulation/public/android-chrome-512x512.png b/packages/tecrock-simulation/public/android-chrome-512x512.png
diff --git a/packages/tecrock-simulation/public/apple-touch-icon.png b/packages/tecrock-simulation/public/apple-touch-icon.png
diff --git a/packages/tecrock-simulation/public/browserconfig.xml b/packages/tecrock-simulation/public/browserconfig.xml
diff --git a/packages/tecrock-simulation/public/favicon-16x16.png b/packages/tecrock-simulation/public/favicon-16x16.png
diff --git a/packages/tecrock-simulation/public/favicon-32x32.png b/packages/tecrock-simulation/public/favicon-32x32.png
diff --git a/packages/tecrock-simulation/public/mstile-150x150.png b/packages/tecrock-simulation/public/mstile-150x150.png
diff --git a/packages/tecrock-simulation/public/site.webmanifest b/packages/tecrock-simulation/public/site.webmanifest
diff --git a/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected] b/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected]
diff --git a/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected] b/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected]
diff --git a/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected] b/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected]
diff --git a/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected] b/...imulation/public/data/[email protected] → ...k-simulation/src/data/[email protected]
diff --git a/...a/[email protected] → ...a/[email protected] b/...a/[email protected] → ...a/[email protected]
diff --git a/...rock-simulation/public/data/benchmark.png → ...tecrock-simulation/src/data/benchmark.png b/...rock-simulation/public/data/benchmark.png → ...tecrock-simulation/src/data/benchmark.png
diff --git a/...n/public/data/continentOceanCollision.png → ...tion/src/data/continentOceanCollision.png b/...n/public/data/continentOceanCollision.png → ...tion/src/data/continentOceanCollision.png
diff --git a/...ion/public/data/continentalCollision1.png → ...lation/src/data/continentalCollision1.png b/...ion/public/data/continentalCollision1.png → ...lation/src/data/continentalCollision1.png
diff --git a/...n/public/data/continentalCollision1v2.png → ...tion/src/data/continentalCollision1v2.png b/...n/public/data/continentalCollision1v2.png → ...tion/src/data/continentalCollision1v2.png
diff --git a/...ion/public/data/continentalCollision2.png → ...lation/src/data/continentalCollision2.png b/...ion/public/data/continentalCollision2.png → ...lation/src/data/continentalCollision2.png
diff --git a/...ion/public/data/continentalCollision3.png → ...lation/src/data/continentalCollision3.png b/...ion/public/data/continentalCollision3.png → ...lation/src/data/continentalCollision3.png
diff --git a/...ion/public/data/continentalCollision4.png → ...lation/src/data/continentalCollision4.png b/...ion/public/data/continentalCollision4.png → ...lation/src/data/continentalCollision4.png
diff --git a/...ulation/public/data/divergentBoundary.png → ...simulation/src/data/divergentBoundary.png b/...ulation/public/data/divergentBoundary.png → ...simulation/src/data/divergentBoundary.png
diff --git a/...lation/public/data/divergentBoundary2.png → ...imulation/src/data/divergentBoundary2.png b/...lation/public/data/divergentBoundary2.png → ...imulation/src/data/divergentBoundary2.png
diff --git a/.../tecrock-simulation/public/data/earth.png → ...ges/tecrock-simulation/src/data/earth.png b/.../tecrock-simulation/public/data/earth.png → ...ges/tecrock-simulation/src/data/earth.png
diff --git a/...imulation/public/data/islandCollision.png → ...k-simulation/src/data/islandCollision.png b/...imulation/public/data/islandCollision.png → ...k-simulation/src/data/islandCollision.png
diff --git a/...rock-simulation/public/data/mountains.jpg → ...tecrock-simulation/src/data/mountains.jpg b/...rock-simulation/public/data/mountains.jpg → ...tecrock-simulation/src/data/mountains.jpg
diff --git a/...simulation/public/data/plateDivision1.png → ...ck-simulation/src/data/plateDivision1.png b/...simulation/public/data/plateDivision1.png → ...ck-simulation/src/data/plateDivision1.png
diff --git a/...simulation/public/data/plateDivision2.png → ...ck-simulation/src/data/plateDivision2.png b/...simulation/public/data/plateDivision2.png → ...ck-simulation/src/data/plateDivision2.png
diff --git a/...ock-simulation/public/data/plateMerge.png → ...ecrock-simulation/src/data/plateMerge.png b/...ock-simulation/public/data/plateMerge.png → ...ecrock-simulation/src/data/plateMerge.png
diff --git a/...ecrock-simulation/public/data/plates2.png → ...s/tecrock-simulation/src/data/plates2.png b/...ecrock-simulation/public/data/plates2.png → ...s/tecrock-simulation/src/data/plates2.png
diff --git a/...ecrock-simulation/public/data/plates3.png → ...s/tecrock-simulation/src/data/plates3.png b/...ecrock-simulation/public/data/plates3.png → ...s/tecrock-simulation/src/data/plates3.png
diff --git a/...ecrock-simulation/public/data/plates4.png → ...s/tecrock-simulation/src/data/plates4.png b/...ecrock-simulation/public/data/plates4.png → ...s/tecrock-simulation/src/data/plates4.png
diff --git a/...ecrock-simulation/public/data/plates5.png → ...s/tecrock-simulation/src/data/plates5.png b/...ecrock-simulation/public/data/plates5.png → ...s/tecrock-simulation/src/data/plates5.png
diff --git a/...-simulation/public/data/plates5Uneven.png → ...ock-simulation/src/data/plates5Uneven.png b/...-simulation/public/data/plates5Uneven.png → ...ock-simulation/src/data/plates5Uneven.png
diff --git a/...ock-simulation/public/data/subduction.png → ...ecrock-simulation/src/data/subduction.png b/...ock-simulation/public/data/subduction.png → ...ecrock-simulation/src/data/subduction.png
diff --git a/.../tecrock-simulation/public/data/test1.png → ...ges/tecrock-simulation/src/data/test1.png b/.../tecrock-simulation/public/data/test1.png → ...ges/tecrock-simulation/src/data/test1.png
diff --git a/...ulation/public/data/transformBoundary.png → ...simulation/src/data/transformBoundary.png b/...ulation/public/data/transformBoundary.png → ...simulation/src/data/transformBoundary.png
diff --git a/packages/tecrock-simulation/src/index.html b/packages/tecrock-simulation/src/index.html
@@ -5,14 +5,6 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
   <title>Tectonic Explorer</title>
-  <!-- favicon metadata - generated using https://realfavicongenerator.net -->
-  <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
-  <link rel="manifest" href="site.webmanifest">
-  <meta name="msapplication-TileColor" content="#da532c">
-  <meta name="theme-color" content="#ffffff">
-  <!--end of favicon metadata -->
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700;900&display=swap" rel="stylesheet">

diff --git a/packages/tecrock-simulation/src/plates-view/plate-mesh.ts b/packages/tecrock-simulation/src/plates-view/plate-mesh.ts
@@ -18,6 +18,7 @@ import FieldStore from "../stores/field-store";
 import { Rock } from "../plates-model/rock-properties";
 import { getRockPatternImgSrc } from "../colors/rock-colors";
 import { MAX_NORMALIZED_AGE } from "../plates-model/field";
+import mountainsImg from "../data/mountains.jpg";
 
 const MIN_SPEED_TO_RENDER_POLE = 0.002;
 // Render every nth velocity arrow (performance).
@@ -40,7 +41,7 @@ const LAYER_DIFF = 0.004;
 const EARTHQUAKES_LAYER_DIFF = 1 * LAYER_DIFF;
 const VOLCANIC_ERUPTIONS_LAYER_DIFF = 2 * LAYER_DIFF;
 
-const SHARED_BUMP_MAP = new THREE.TextureLoader().load("data/mountains.jpg");
+const SHARED_BUMP_MAP = new THREE.TextureLoader().load(mountainsImg);
 SHARED_BUMP_MAP.colorSpace = THREE.NoColorSpace;
 
 // If there's a new rock type added, it needs to be included in the map below and the plate-mesh-fragment.glsl file