diff --git a/.gitignore b/.gitignore index 8614524c..caea2ef2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ node_modules /built +/demo/built /coverage /examples/webpack/bundle.js **/__diff_output__/ diff --git a/config/webpack.bundle-analyzer.js b/config/webpack.bundle-analyzer.js deleted file mode 100644 index c38c6fe8..00000000 --- a/config/webpack.bundle-analyzer.js +++ /dev/null @@ -1,11 +0,0 @@ -const BundleAnalyzerPlugin = require("webpack-bundle-analyzer") - .BundleAnalyzerPlugin; - -const merge = require("webpack-merge"); -const prod = require("./webpack.prod.js"); - -const config = merge(prod, { - plugins: [new BundleAnalyzerPlugin()] -}); - -module.exports = config; diff --git a/config/webpack.common.js b/demo/config/webpack.common.js similarity index 90% rename from config/webpack.common.js rename to demo/config/webpack.common.js index 848ecafe..f6433f94 100644 --- a/config/webpack.common.js +++ b/demo/config/webpack.common.js @@ -56,17 +56,17 @@ module.exports = { background_color: "#ffffff", // eslint-disable-line camelcase icons: [ { - src: path.resolve("./images/manifest/icon-192x192.png"), + src: path.resolve("./demo/images/manifest/icon-192x192.png"), sizes: "192x192", type: "image/png" }, { - src: path.resolve("./images/manifest/icon-512x512.png"), + src: path.resolve("./demo/images/manifest/icon-512x512.png"), sizes: "512x512", type: "image/png" }, { - src: path.resolve("./images/manifest/icon.svg"), + src: path.resolve("./demo/images/manifest/icon.svg"), sizes: "513x513", type: "image/svg+xml" } @@ -82,6 +82,7 @@ module.exports = { entry: { webamp: ["./js/index.js"] }, + context: path.resolve(__dirname, "../"), output: { filename: "[name]-[hash].js", chunkFilename: "[name]-[hash].js", diff --git a/config/webpack.dev.js b/demo/config/webpack.dev.js similarity index 80% rename from config/webpack.dev.js rename to demo/config/webpack.dev.js index 33c72391..3c749788 100644 --- a/config/webpack.dev.js +++ b/demo/config/webpack.dev.js @@ -13,7 +13,11 @@ module.exports = merge(common, { ) }), new CopyWebpackPlugin([ - { from: "js/dev-service-worker.js", to: "service-worker.js", force: true } + { + from: "./js/dev-service-worker.js", + to: "service-worker.js", + force: true + } ]) ] }); diff --git a/config/webpack.prod.js b/demo/config/webpack.prod.js similarity index 100% rename from config/webpack.prod.js rename to demo/config/webpack.prod.js diff --git a/css/page.css b/demo/css/page.css similarity index 100% rename from css/page.css rename to demo/css/page.css diff --git a/images/favicon.ico b/demo/images/favicon.ico similarity index 100% rename from images/favicon.ico rename to demo/images/favicon.ico diff --git a/images/manifest/icon-144x144.png b/demo/images/manifest/icon-144x144.png similarity index 100% rename from images/manifest/icon-144x144.png rename to demo/images/manifest/icon-144x144.png diff --git a/images/manifest/icon-192x192.png b/demo/images/manifest/icon-192x192.png similarity index 100% rename from images/manifest/icon-192x192.png rename to demo/images/manifest/icon-192x192.png diff --git a/images/manifest/icon-48x48.png b/demo/images/manifest/icon-48x48.png similarity index 100% rename from images/manifest/icon-48x48.png rename to demo/images/manifest/icon-48x48.png diff --git a/images/manifest/icon-512x512.png b/demo/images/manifest/icon-512x512.png similarity index 100% rename from images/manifest/icon-512x512.png rename to demo/images/manifest/icon-512x512.png diff --git a/images/manifest/icon-72x72.png b/demo/images/manifest/icon-72x72.png similarity index 100% rename from images/manifest/icon-72x72.png rename to demo/images/manifest/icon-72x72.png diff --git a/images/manifest/icon-96x96.png b/demo/images/manifest/icon-96x96.png similarity index 100% rename from images/manifest/icon-96x96.png rename to demo/images/manifest/icon-96x96.png diff --git a/images/manifest/icon.svg b/demo/images/manifest/icon.svg similarity index 100% rename from images/manifest/icon.svg rename to demo/images/manifest/icon.svg diff --git a/images/preview.png b/demo/images/preview.png similarity index 100% rename from images/preview.png rename to demo/images/preview.png diff --git a/images/share/butterchurn-bg.png b/demo/images/share/butterchurn-bg.png similarity index 100% rename from images/share/butterchurn-bg.png rename to demo/images/share/butterchurn-bg.png diff --git a/images/share/eye.svg b/demo/images/share/eye.svg similarity index 100% rename from images/share/eye.svg rename to demo/images/share/eye.svg diff --git a/images/share/github.svg b/demo/images/share/github.svg similarity index 100% rename from images/share/github.svg rename to demo/images/share/github.svg diff --git a/images/share/info.svg b/demo/images/share/info.svg similarity index 100% rename from images/share/info.svg rename to demo/images/share/info.svg diff --git a/images/share/mail.svg b/demo/images/share/mail.svg similarity index 100% rename from images/share/mail.svg rename to demo/images/share/mail.svg diff --git a/images/share/twitter.svg b/demo/images/share/twitter.svg similarity index 100% rename from images/share/twitter.svg rename to demo/images/share/twitter.svg diff --git a/index.html b/demo/index.html similarity index 95% rename from index.html rename to demo/index.html index 03f58825..c067adbf 100755 --- a/index.html +++ b/demo/index.html @@ -69,13 +69,13 @@

- + - + - +

- - diff --git a/js/skinExplorer.js b/js/skinExplorer.js deleted file mode 100644 index 45d55d12..00000000 --- a/js/skinExplorer.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from "react"; -import { render } from "react-dom"; -import { skinUrl } from "./config"; -import skinParser from "./skinParser"; - -const SkinTable = props => ( - - {Object.keys(props.images) - .sort() - .map(key => ( - - - - - ))} -
{key} - -
-); - -const parse = async () => { - const skinData = await skinParser((await fetch(skinUrl)).arrayBuffer()); - render(, document.getElementById("skin")); -}; - -parse(); diff --git a/netlify.toml b/netlify.toml index af6ecd9f..e22a005b 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,6 +1,6 @@ [build] command = "npm run build && npm run build-library" - publish = "built" + publish = "demo/built" # A short URL for listeners of https://changelog.com/podcast/291 [[redirects]] diff --git a/package.json b/package.json index ed3cdc12..74179012 100644 --- a/package.json +++ b/package.json @@ -12,13 +12,12 @@ "scripts": { "lint": "eslint .", "type-check": "tsc", - "build": "webpack --config=config/webpack.prod.js", + "build": "webpack --config=demo/config/webpack.prod.js", "build-library": "webpack --config=config/webpack.library.js", - "analyze": "webpack --config=config/webpack.bundle-analyzer.js", "prepublishOnly": "npm run build-library", "serve": "http-server ./built", - "start": "webpack-dev-server --open --config=config/webpack.dev.js", - "stats": "webpack --config=config/webpack.prod.js --json > stats.json", + "start": "webpack-dev-server --open --config=demo/config/webpack.dev.js", + "stats": "webpack --config=demo/config/webpack.prod.js --json > stats.json", "stats-library": "webpack --config=config/webpack.library.js --json > stats.json", "weight": "npm run build-library > /dev/null && gzip-size built/webamp.bundle.min.js", "test": "jest --projects config/jest.unit.js config/jest.eslint.js",