diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5cb30acb506..8c0af4fdfca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,24 +74,6 @@ jobs: npm run dist node scripts/cp-pkgs.js node scripts/verify-pkg-main.js - site-generator-test: - runs-on: ubuntu-latest - needs: install - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - # Node v8 is required. - node-version: 8 - - uses: actions/cache@v2 - with: - path: | - node_modules - packages/*/node_modules - !packages/*/node_modules/@material - key: ${{ runner.os }}-lerna-${{ hashFiles('package-lock.json', 'packages/**/package.json') }} - - run: npm run link - - run: npm run test:site unit-test: runs-on: ubuntu-latest needs: install diff --git a/.gitignore b/.gitignore index 8de4cabbef8..b36b81b2e08 100644 --- a/.gitignore +++ b/.gitignore @@ -21,9 +21,6 @@ packages/**/*.map packages/**/test/**.css packages/**/package-lock.json -# Material.io site generator test (`npm run test:site`) -.site-generator-tmp/ - # Used by internal sync & rewrite scripts .rewrite-tmp/ diff --git a/package.json b/package.json index cbc8f4ebcc7..d175802d2d7 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "build:esmodules": "tsc --project ./tsconfig.json --module esnext --outDir ./packages --importHelpers", "build:min": "mkdirp build && cross-env MDC_ENV=production webpack -p --mode=production --progress --colors --display=minimal", "clean": "node ./scripts/build/clean", - "clean:site": "node ./scripts/build/clean --site-generator-tmp", "dist": "npm run build && npm run build:min && npm run build:esmodules", "docgen": "npm run clean && npm run build:esmodules && tsc ./scripts/documentation/tsdoc.ts --resolveJsonModule && node ./scripts/documentation/tsdoc.js", "fix:js": "eslint --fix scripts webpack.config.js karma.conf.js", @@ -25,7 +24,6 @@ "test": "npm run test:unit && npm run test:dependency && npm run build && npm run clean", "test:sass": "jasmine --config=jasmine-node.json", "test:dependency": "./scripts/dependency-test.sh", - "test:site": "npm run clean:site && ./scripts/site-generator-test.sh", "test:unit": "karma start --single-run", "test:watch": "karma start --auto-watch", "version": "cat lerna.json | grep -e '^ \"version\": ' | awk '{print $2}' | sed 's/[\",]//g'" diff --git a/scripts/build/clean.js b/scripts/build/clean.js index 715fd6be010..ac1ca1171b2 100644 --- a/scripts/build/clean.js +++ b/scripts/build/clean.js @@ -7,7 +7,6 @@ const del = require('del'); const fs = require('fs'); const {sync: globSync} = require('glob'); -const SITE_GENERATOR = 'site-generator-tmp'; function main() { removeDirectory('build'); @@ -34,9 +33,4 @@ function removeFilesOfType(type) { }); } -if (process.argv.includes(`--${SITE_GENERATOR}`)) { - removeDirectory(`.${SITE_GENERATOR}`); -} else { - main(); -} - +main(); diff --git a/scripts/site-generator-test.sh b/scripts/site-generator-test.sh deleted file mode 100755 index 97a0ce978be..00000000000 --- a/scripts/site-generator-test.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -## -# Copyright 2018 Google Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -# - -set -e - -git clone https://github.com/material-components/material-components-site-generator.git .site-generator-tmp -cd .site-generator-tmp -yarn install -# Avoid Jekyll step which requires Ruby setup, just run JS portion to catch link/metadata errors -sed -e 's/buildJekyll();//' -e "s/require(.*check-deps');//" scripts/build > scripts/build.nojekyll -node scripts/build.nojekyll ..