Make images smaller using best-in-class codecs, right in the browser.
JavaScript
Create CSS typings before build. Fixes #251. (#350)
Jake Archibald428b7d976dd5
diff --git a/.travis.yml b/.travis.ymlindex b35d2658..334fe174 100644--- a/.travis.yml+++ b/.travis.yml@@ -4,4 +4,4 @@ node_js:- 10- 8cache: npm-script: npm run build || npm run build # scss ts definitions need to be generated before an actual build+script: npm run builddiff --git a/README.md b/README.mdindex aefb0ee2..1f32797f 100644--- a/README.md+++ b/README.md@@ -22,9 +22,6 @@ npm installnpm run build```-You'll get an error on first build because of [a stupid bug we haven't fixed-yet](https://github.com/GoogleChromeLabs/squoosh/issues/251).-You can run the development server with:```shdiff --git a/config/add-css-types.js b/config/add-css-types.jsnew file mode 100644index 00000000..fcfeab01--- /dev/null+++ b/config/add-css-types.js@@ -0,0 +1,74 @@+const DtsCreator = require('typed-css-modules');+const chokidar = require('chokidar');+const util = require('util');+const sass = require('node-sass');++const sassRender = util.promisify(sass.render);++async function sassToCss(path) {+ const result = await sassRender({ file: path });+ return result.css;+}++/**+ * @typedef {Object} Opts+ * @property {boolean} watch Watch for changes+ */+/**+ * Create typing files for CSS & SCSS.+ *+ * @param {string[]} rootPaths Paths to search within+ * @param {Opts} [opts={}] Options.+ */+function addCssTypes(rootPaths, opts = {}) {+ return new Promise((resolve) => {+ const { watch = false } = opts;++ const paths = [];+ const preReadyPromises = [];+ let ready = false;++ for (const rootPath of rootPaths) {+ // Look for scss & css in each path.+ paths.push(rootPath + '/**/*.scss');+ paths.push(rootPath + '/**/*.css');+ }++ // For simplicity, the watcher is used even if we're not watching.+ // If we're not watching, we stop the watcher after the initial files are found.+ const watcher = chokidar.watch(paths, {+ // Avoid processing already-processed files.+ ignored: '*.d.*',+ // Without this, travis and netlify builds never complete. I'm not sure why, but it might be+ // related to https://github.com/paulmillr/chokidar/pull/758+ persistent: watch,+ });++ function change(path) {+ const promise = (async function() {+ const creator = new DtsCreator({ camelCase: true });+ const result = path.endsWith('.scss') ?+ await creator.create(path, await sassToCss(path)) :+ await creator.create(path);++ await result.writeFile();+ })();++ if (!ready) preReadyPromises.push(promise);+ }++ watcher.on('change', change);+ watcher.on('add', change);++ // 'ready' is when events have been fired for file discovery.+ watcher.on('ready', () => {+ ready = true;+ // Wait for the current set of processing to finish.+ Promise.all(preReadyPromises).then(resolve);+ // And if we're not watching, close the watcher.+ if (!watch) watcher.close();+ });+ })+}++module.exports = addCssTypes;diff --git a/package-lock.json b/package-lock.jsonindex db8c965a..1256f480 100644--- a/package-lock.json+++ b/package-lock.json@@ -2130,7 +2130,7 @@},"camelcase-keys": {"version": "2.1.0",- "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz","integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=","dev": true,"requires": {@@ -2421,12 +2421,6 @@"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=","dev": true},- "colour": {- "version": "0.7.1",- "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",- "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=",- "dev": true- },"combined-stream": {"version": "1.0.7","resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",@@ -2915,6 +2909,57 @@"source-list-map": "^2.0.0"}},+ "css-modules-loader-core": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz",+ "integrity": "sha1-WQhmgpShvs0mGuCkziGwtVHyHRY=",+ "dev": true,+ "requires": {+ "icss-replace-symbols": "1.1.0",+ "postcss": "6.0.1",+ "postcss-modules-extract-imports": "1.1.0",+ "postcss-modules-local-by-default": "1.2.0",+ "postcss-modules-scope": "1.1.0",+ "postcss-modules-values": "1.3.0"+ },+ "dependencies": {+ "has-flag": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",+ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",+ "dev": true+ },+ "postcss": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",+ "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",+ "dev": true,+ "requires": {+ "chalk": "^1.1.3",+ "source-map": "^0.5.6",+ "supports-color": "^3.2.3"+ }+ },+ "postcss-modules-extract-imports": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",+ "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",+ "dev": true,+ "requires": {+ "postcss": "^6.0.1"+ }+ },+ "supports-color": {+ "version": "3.2.3",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",+ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",+ "dev": true,+ "requires": {+ "has-flag": "^1.0.0"+ }+ }+ }+ },"css-select": {"version": "1.2.0","resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",@@ -7125,6 +7170,12 @@"integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=","dev": true},+ "is-there": {+ "version": "4.4.3",+ "resolved": "https://registry.npmjs.org/is-there/-/is-there-4.4.3.tgz",+ "integrity": "sha1-osSTZsakh/cZ28rYDL3iEkjSwY0=",+ "dev": true+ },"is-typedarray": {"version": "1.0.0","resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",@@ -9717,7 +9768,7 @@},"meow": {"version": "3.7.0",- "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",+ "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz","integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=","dev": true,"requires": {@@ -9735,7 +9786,7 @@"dependencies": {"minimist": {"version": "1.2.0",- "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz","integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=","dev": true}@@ -10101,7 +10152,7 @@"dependencies": {"semver": {"version": "5.3.0",- "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz","integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=","dev": true}@@ -12575,7 +12626,7 @@"dependencies": {"source-map": {"version": "0.4.4",- "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz","integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=","dev": true,"requires": {@@ -13458,7 +13509,7 @@},"tar": {"version": "2.2.1",- "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",+ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz","integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=","dev": true,"requires": {@@ -14238,49 +14289,259 @@"mime-types": "~2.1.18"}},- "typedarray": {- "version": "0.0.6",- "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",- "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",- "dev": true- },- "typescript": {- "version": "3.1.6",- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",- "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",- "dev": true- },- "typings-for-css-modules-loader": {- "version": "1.7.0",- "resolved": "https://registry.npmjs.org/typings-for-css-modules-loader/-/typings-for-css-modules-loader-1.7.0.tgz",- "integrity": "sha512-Mp7zDrcUmbUKl3JTLamTsMX+lntMotEm5I05j2RHB5EHb0WL1dAXlynpdlGR5Ye/QTvtL5w+RGB2jP32YoUpZw==",+ "typed-css-modules": {+ "version": "0.3.7",+ "resolved": "https://registry.npmjs.org/typed-css-modules/-/typed-css-modules-0.3.7.tgz",+ "integrity": "sha512-KR1VG/U0rgFWaiQtXKtFMgKaurs80nvlBvZ7BfuYGLldw6kss/97sd+aMG4CI73BbujvefG7DBjnsBqq2Aowcw==","dev": true,"requires": {- "colour": "0.7.1",- "graceful-fs": "4.1.4",- "loader-utils": "0.2.16"+ "camelcase": "^4.1.0",+ "chalk": "^2.1.0",+ "chokidar": "^2.0.3",+ "css-modules-loader-core": "^1.1.0",+ "glob": "^7.1.2",+ "is-there": "^4.4.2",+ "mkdirp": "^0.5.1",+ "yargs": "^8.0.2"},"dependencies": {- "graceful-fs": {- "version": "4.1.4",- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz",- "integrity": "sha1-7widKIDwM7ARgjzlyPrnmNp3Xb0=",+ "ansi-regex": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=","dev": true},- "loader-utils": {- "version": "0.2.16",- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz",- "integrity": "sha1-8IYyBm7YKCg13/iN+1JwR2Wt7m0=",+ "ansi-styles": {+ "version": "3.2.1",+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==","dev": true,"requires": {- "big.js": "^3.1.3",- "emojis-list": "^2.0.0",- "json5": "^0.5.0",- "object-assign": "^4.0.1"+ "color-convert": "^1.9.0"+ }+ },+ "camelcase": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",+ "dev": true+ },+ "chalk": {+ "version": "2.4.1",+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",+ "dev": true,+ "requires": {+ "ansi-styles": "^3.2.1",+ "escape-string-regexp": "^1.0.5",+ "supports-color": "^5.3.0"+ }+ },+ "cross-spawn": {+ "version": "5.1.0",+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",+ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",+ "dev": true,+ "requires": {+ "lru-cache": "^4.0.1",+ "shebang-command": "^1.2.0",+ "which": "^1.2.9"+ }+ },+ "execa": {+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",+ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",+ "dev": true,+ "requires": {+ "cross-spawn": "^5.0.1",+ "get-stream": "^3.0.0",+ "is-stream": "^1.1.0",+ "npm-run-path": "^2.0.0",+ "p-finally": "^1.0.0",+ "signal-exit": "^3.0.0",+ "strip-eof": "^1.0.0"+ }+ },+ "get-stream": {+ "version": "3.0.0",+ "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",+ "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",+ "dev": true+ },+ "is-fullwidth-code-point": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",+ "dev": true+ },+ "load-json-file": {+ "version": "2.0.0",+ "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",+ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",+ "dev": true,+ "requires": {+ "graceful-fs": "^4.1.2",+ "parse-json": "^2.2.0",+ "pify": "^2.0.0",+ "strip-bom": "^3.0.0"+ }+ },+ "mem": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",+ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",+ "dev": true,+ "requires": {+ "mimic-fn": "^1.0.0"+ }+ },+ "os-locale": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",+ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",+ "dev": true,+ "requires": {+ "execa": "^0.7.0",+ "lcid": "^1.0.0",+ "mem": "^1.1.0"+ }+ },+ "parse-json": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",+ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",+ "dev": true,+ "requires": {+ "error-ex": "^1.2.0"+ }+ },+ "path-type": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",+ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",+ "dev": true,+ "requires": {+ "pify": "^2.0.0"+ }+ },+ "pify": {+ "version": "2.3.0",+ "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",+ "dev": true+ },+ "read-pkg": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",+ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",+ "dev": true,+ "requires": {+ "load-json-file": "^2.0.0",+ "normalize-package-data": "^2.3.2",+ "path-type": "^2.0.0"+ }+ },+ "read-pkg-up": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",+ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",+ "dev": true,+ "requires": {+ "find-up": "^2.0.0",+ "read-pkg": "^2.0.0"+ }+ },+ "string-width": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",+ "dev": true,+ "requires": {+ "is-fullwidth-code-point": "^2.0.0",+ "strip-ansi": "^4.0.0"+ }+ },+ "strip-ansi": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",+ "dev": true,+ "requires": {+ "ansi-regex": "^3.0.0"+ }+ },+ "strip-bom": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",+ "dev": true+ },+ "supports-color": {+ "version": "5.5.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",+ "dev": true,+ "requires": {+ "has-flag": "^3.0.0"+ }+ },+ "which-module": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",+ "dev": true+ },+ "y18n": {+ "version": "3.2.1",+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",+ "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",+ "dev": true+ },+ "yargs": {+ "version": "8.0.2",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",+ "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",+ "dev": true,+ "requires": {+ "camelcase": "^4.1.0",+ "cliui": "^3.2.0",+ "decamelize": "^1.1.1",+ "get-caller-file": "^1.0.1",+ "os-locale": "^2.0.0",+ "read-pkg-up": "^2.0.0",+ "require-directory": "^2.1.1",+ "require-main-filename": "^1.0.1",+ "set-blocking": "^2.0.0",+ "string-width": "^2.0.0",+ "which-module": "^2.0.0",+ "y18n": "^3.2.1",+ "yargs-parser": "^7.0.0"+ }+ },+ "yargs-parser": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",+ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",+ "dev": true,+ "requires": {+ "camelcase": "^4.1.0"}}}},+ "typedarray": {+ "version": "0.0.6",+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",+ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",+ "dev": true+ },+ "typescript": {+ "version": "3.1.6",+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",+ "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",+ "dev": true+ },"uglify-js": {"version": "3.4.9","resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",diff --git a/package.json b/package.jsonindex 2e7f4ee5..645e5d67 100644--- a/package.json+++ b/package.json@@ -21,6 +21,7 @@"@webcomponents/custom-elements": "^1.2.1","@webpack-cli/serve": "^0.1.2","assets-webpack-plugin": "^3.9.7",+ "chokidar": "^2.0.4","classnames": "^2.2.6","clean-webpack-plugin": "^1.0.0","comlink": "^3.0.3",@@ -56,8 +57,8 @@"tslint-config-airbnb": "^5.11.0","tslint-config-semistandard": "^7.0.0","tslint-react": "^3.6.0",+ "typed-css-modules": "^0.3.7","typescript": "^3.1.6",- "typings-for-css-modules-loader": "^1.7.0","url-loader": "^1.1.2","webpack": "^4.25.1","webpack-bundle-analyzer": "^3.0.3",diff --git a/webpack.config.js b/webpack.config.jsindex ffa99f8c..c4511162 100644--- a/webpack.config.js+++ b/webpack.config.js@@ -15,6 +15,7 @@ const WorkerPlugin = require('worker-plugin');const AutoSWPlugin = require('./config/auto-sw-plugin');const CrittersPlugin = require('critters-webpack-plugin');const AssetTemplatePlugin = require('./config/asset-template-plugin');+const addCssTypes = require('./config/add-css-types');function readJson (filename) {return JSON.parse(fs.readFileSync(filename));@@ -22,7 +23,7 @@ function readJson (filename) {const VERSION = readJson('./package.json').version;-module.exports = function (_, env) {+module.exports = async function (_, env) {const isProd = env.mode === 'production';const nodeModules = path.join(__dirname, 'node_modules');const componentStyleDirs = [@@ -32,6 +33,8 @@ module.exports = function (_, env) {path.join(__dirname, 'src/lib'),];+ await addCssTypes(componentStyleDirs, { watch: !isProd });+return {mode: isProd ? 'production' : 'development',entry: {@@ -109,9 +112,7 @@ module.exports = function (_, env) {// In production, CSS is extracted to files on disk. In development, it's inlined into JS:isProd ? MiniCssExtractPlugin.loader : 'style-loader',{- // This is a fork of css-loader that auto-generates .d.ts files for CSS module imports.- // The result is a definition file with the exported String classname mappings.- loader: 'typings-for-css-modules-loader',+ loader: 'css-loader',options: {modules: true,localIdentName: isProd ? '[hash:base64:5]' : '[local]__[hash:base64:5]',