GREAT WEBSITE MIGRATION OF 2019

.gitignore

@@ -1,5 +1,10 @@
+# Hugo default output directory
+/public
+# Hugo generated resources directory. Note: if the generated files
+# were checked into the repo, could improve build times. But since
+# we rebuild as part of CI/CD deployments, we just don't check-in.
+/resources
+
 .DS_Store
-/resources/
-/public/
 node_modules
 *.map

.travis.yml

@@ -4,11 +4,11 @@ branches:
   only:
   - master
   - production
+  - fusion
 before_install:
-# Use travisqueue to manage build concurrency.
-- ./scripts/travisqueue.sh install
-- ./scripts/travisqueue.sh start
 # Download and install required tools.
+# Install assume-role tool for use when deploying
+- go get -u github.com/remind101/assume-role
 # AWS CLI
 - pip install --upgrade --user awscli
 # pulumi
@@ -25,7 +25,6 @@ before_install:
 script:
 - echo "TRAVIS_EVENT_TYPE=${TRAVIS_EVENT_TYPE}"
 - make travis_${TRAVIS_EVENT_TYPE}
-after_script:
-- ./scripts/travisqueue.sh finish
-notifications:
-  webhooks: https://ufci1w66n3.execute-api.us-west-2.amazonaws.com/stage/travis
+# TODO: Reenable once kinks worked out.
+# notifications:
+#   webhooks: https://ufci1w66n3.execute-api.us-west-2.amazonaws.com/stage/travis

CONTRIBUTING.md

@@ -16,15 +16,15 @@
 We generally use Hugo's [`relref` shortcode](https://gohugo.io/content-management/shortcodes/#ref-and-relref) when linking to other pages. Examples:
 
 ```markdown
-[Install]({{< relref "/reference/install.md" >}})
-[Outputs]({{< relref "programming-model.md#stack-outputs" >}})
+[Install]({{< relref "/docs/reference/install.md" >}})
+[Outputs]({{< relref "/docs/reference/programming-model.md#stack-outputs" >}})
 ```
 
 Which, on a page inside the `./content/reference` directory, will generate:
 
 ```html
-<a href="/reference/install/">Install</a>
-<a href="/reference/programming-model/#stack-outputs">Outputs</a>
+<a href="/docs/reference/install/">Install</a>
+<a href="/docs/reference/programming-model/#stack-outputs">Outputs</a>
 ```
 
 

Makefile

@@ -7,7 +7,7 @@ all: banner generate build
 .PHONY: banner
 banner:
 	@echo -e "\033[1;37m=========================\033[0m"
-	@echo -e "\033[1;37mPulumi Documentation Site\033[0m"
+	@echo -e "\033[1;37mPulumi Website           \033[0m"
 	@echo -e "\033[1;37m=========================\033[0m"
 
 .PHONY: ensure
@@ -24,14 +24,14 @@ generate:
 	@echo -e "\033[0;32mGENERATE:\033[0m"
 	./scripts/run_typedoc.sh
 	./scripts/generate_python_docs.sh
-	pulumi gen-markdown ./content/reference/cli
+	pulumi gen-markdown ./content/docs/reference/cli
 
 .PHONY: build
 build:
 	@echo -e "\033[0;32mBUILD:\033[0m"
 	hugo
-	node ./scripts/build-search-index.js < ./public/search-data/index.json > ./public/search-index.json
-	rm -rf ./public/search-data
+	node ./scripts/build-search-index.js < ./public/docs/search-data/index.json > ./public/docs/search-index.json
+	rm -rf ./public/docs/search-data
 
 .PHONY: test
 test:
@@ -44,11 +44,13 @@ test:
 	#       although valid and publicly available, is reported as a broken link.
 	# Fixes for the former two are tracked by https://github.com/pulumi/docs/issues/568.
 	./node_modules/.bin/blc http://localhost:1313 -r \
-		--exclude "/reference/pkg" \
-		--exclude "/reference/changelog" \
+		--exclude "/docs/reference/pkg" \
+		--exclude "/docs/reference/changelog" \
 		--exclude "https://github.com/pulumi/docs/edit/master" \
-		--exclude "https://www.linkedin.com/company/pulumi/" \
-		--exclude "https://marketplace.visualstudio.com/items?itemName=pulumi.build-and-release-task"
+		--exclude "https://www.linkedin.com/" \
+		--exclude "https://marketplace.visualstudio.com/items?itemName=pulumi.build-and-release-task" \
+		--exclude "https://blog.mapbox.com/" \
+		--exclude "https://github.com/pulls?"
 
 .PHONY: validate
 validate:
@@ -57,65 +59,53 @@ validate:
 	$(MAKE) test
 	pkill -f hugo
 
-.PHONY: preview
-preview:
-	@echo -e "\033[0;32mPREVIEW:\033[0m"
-ifeq ($(TRAVIS_BRANCH),master)
-	./scripts/preview.sh staging
-endif
-ifeq ($(TRAVIS_BRANCH),production)
-	./scripts/preview.sh production
-endif
-
-.PHONY: deploy
-deploy:
-	@echo -e "\033[0;32mDEPLOY:\033[0m"
-ifeq ($(TRAVIS_BRANCH),master)
-	./scripts/update.sh staging
-endif
-ifeq ($(TRAVIS_BRANCH),production)
-	./scripts/update.sh production
-endif
-
 .PHONY: travis_push
 travis_push::
 	$(MAKE) banner
 	$(MAKE) ensure
-ifeq ($(TRAVIS_BRANCH),master)
-	HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
+# NB. Delete fusion once dust settles.
+ifeq ($(TRAVIS_BRANCH),fusion)
+	HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
+	$(MAKE) validate
+	./scripts/run-pulumi.sh update staging
+else ifeq ($(TRAVIS_BRANCH),master)
+	HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
+	$(MAKE) validate
+	./scripts/run-pulumi.sh update staging
+else ifeq ($(TRAVIS_BRANCH),production)
+	HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build
+	$(MAKE) validate
+	./scripts/run-pulumi.sh update production
 else
 	$(MAKE) build
+	$(MAKE) validate
 endif
-	$(MAKE) deploy
 
 .PHONY: travis_pull_request
 travis_pull_request::
 	$(MAKE) banner
 	$(MAKE) ensure
-ifeq ($(TRAVIS_BRANCH),master)
-	HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
+# NB. Delete fusion once dust settles.
+ifeq ($(TRAVIS_BRANCH),fusion)
+	HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
+	$(MAKE) validate
+	./scripts/run-pulumi.sh preview staging
+else ifeq ($(TRAVIS_BRANCH),master)
+	HUGO_BASEURL=https://www-staging.pulumi.com/ $(MAKE) build
+	$(MAKE) validate
+	./scripts/run-pulumi.sh preview staging
+else ifeq ($(TRAVIS_BRANCH),production)
+	HUGO_BASEURL=https://www.pulumi.com/ $(MAKE) build
+	$(MAKE) validate
+	./scripts/run-pulumi.sh preview production
 else
 	$(MAKE) build
-endif
 	$(MAKE) validate
-	$(MAKE) preview
+endif
 
 .PHONY: travis_cron
 travis_cron::
 	$(MAKE) banner
 	$(MAKE) ensure
-ifeq ($(TRAVIS_BRANCH),master)
-	HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
-else
-	$(MAKE) build
-endif
-
-.PHONY: travis_api
-travis_api::
-	$(MAKE) banner
-	$(MAKE) ensure
-ifeq ($(TRAVIS_BRANCH),master)
-	HUGO_BASEURL=https://staging.pulumi.io/ $(MAKE) build
-else
 	$(MAKE) build
-endif
+	$(MAKE) validate

assets/config/postcss.config.js

@@ -0,0 +1,24 @@
+/**
+ * Configuration file for PostCSS. This is only used as part of the Hugo pipeline
+ * build process for our Sass files, since we run the resulting CSS through PostCSS
+ * at the end to do more transformations.
+ */
+module.exports = {
+    plugins: [
+        // TailwindCSS
+        require("tailwindcss")("./assets/config/tailwind.config.js"),
+
+        // Apply vendor prefixes for CSS features that aren't
+        // fully supported yet.
+        require("autoprefixer")({
+            overrideBrowserslist: [
+                "last 2 versions"
+            ]
+        }),
+
+        // Minify the CSS even further. (It works!)
+        require('cssnano')({
+            preset: 'default',
+        })
+    ]
+};

assets/config/tailwind.config.js

@@ -0,0 +1,81 @@
+
+// Tailwind configuration. Changes to this file require a dev-server restart.
+//
+// Configuration docs:
+// https://tailwindcss.com/docs/configuration
+//
+// Default configuration:
+// https://github.com/tailwindcss/tailwindcss/blob/master/stubs/defaultConfig.stub.js
+
+const defaultTheme = require('tailwindcss/defaultTheme');
+
+const brand = {
+    purple: "#512668",
+    orange: "#ee975c",
+    green: "#2fc89f",
+    blue: "#52a6da",
+}
+
+const purple = {
+    100: "#ddcae8",
+    200: "#9c76b3",
+    300: "#83549c",
+    400: "#6c348a",
+    500: brand.purple,
+    600: "#421d57",
+    700: "#371a47",
+    800: "#2a1337",
+    900: "#180b1f",
+}
+
+// TBD: Orange and green scales. (Using defaults for now.)
+
+const blue = {
+    100: "#c4eeff",
+    200: "#abe7ff",
+    300: "#94e1ff",
+    400: "#63d0ff",
+    500: brand.blue,
+    600: "#3182ce",
+    700: "#1873bd",
+    800: "#0a4970",
+    900: "#0f2e3b",
+}
+
+const orange = defaultTheme.colors.orange;
+const green = defaultTheme.colors.green;
+const gray = defaultTheme.colors.gray;
+
+module.exports = {
+    theme: {
+
+        extend: {
+
+            fontFamily: {
+                display: [
+                    "Ubuntu",
+                    ...defaultTheme.fontFamily.sans,
+                ],
+                body: [
+                    "Open Sans",
+                    ...defaultTheme.fontFamily.sans,
+                ],
+            },
+
+            colors: {
+                purple,
+                blue,
+                orange,
+                green,
+                gray,
+            },
+        },
+    },
+
+    variants: {
+        margin: [
+            "responsive",
+            "hover",
+        ]
+    }
+}

assets/js/carousel.js

@@ -0,0 +1,35 @@
+(function($) {
+
+    // The home-page carousel. Items cycle every four seconds. Clicking a label stops the
+    // cycling and shows the selected item.
+
+    var carouselIndex = 1;
+
+    var carouselInterval = window.setInterval(function() {
+        showCarouselItem(carouselIndex);
+        carouselIndex++;
+
+        if (carouselIndex > 2) {
+            carouselIndex = 0;
+        }
+    }, 4000);
+
+    $(".carousel-item-label").click(function() {
+        clearInterval(carouselInterval);
+
+        var i = $(".carousel-item-label").index(this);
+        showCarouselItem(i);
+    });
+
+    function showCarouselItem(i) {
+        $(".carousel-item")
+            .css("opacity", 0)
+            .eq(i)
+            .css("opacity", 1);
+
+        $(".carousel-item-label")
+            .removeClass("border-b-2")
+            .eq(i)
+            .addClass("border-b-2");
+    }
+})(jQuery);