From 2e89cca2299661a6c69dec175c0b9938c60cc66c Mon Sep 17 00:00:00 2001 From: Peter T Bosse II Date: Thu, 26 Apr 2018 15:16:04 -0400 Subject: [PATCH] v2018.4.26-12 --- lerna.json | 2 +- packages/amory/package.json | 4 +-- packages/animated-transition/package.json | 2 +- packages/eslint-config/package.json | 2 +- packages/gatsby-image/package.json | 2 +- packages/gatsby-plugin-pug/package.json | 2 +- .../gatsby-plugin-react-helmet/package.json | 2 +- packages/gatsby-plugin-styletron/package.json | 2 +- .../gatsby-source-filesystem/package.json | 2 +- packages/gatsby/package.json | 2 +- packages/gatsby/patches-next/9-jsdir-2.diff | 26 +++++++++---------- packages/git-setup/package.json | 2 +- packages/http-server/package.json | 2 +- packages/merge-json/package.json | 2 +- packages/prettier-eslint/package.json | 2 +- packages/queue/package.json | 2 +- packages/sort-json/package.json | 2 +- packages/uncssstyle/package.json | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lerna.json b/lerna.json index c9d54bed..fd0f2734 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "packages": [ "packages/*" ], - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/amory/package.json b/packages/amory/package.json index 6a7c10ec..abb9da2a 100644 --- a/packages/amory/package.json +++ b/packages/amory/package.json @@ -1,11 +1,11 @@ { "name": "amory", - "version": "2018.4.26-11", + "version": "2018.4.26-12", "main": "index.js", "author": "Peter T Bosse II (http://ptb2.me/)", "license": "Apache-2.0", "dependencies": { - "@ptb/queue": "^2018.4.26-11", + "@ptb/queue": "^2018.4.26-12", "tapable": "^1.0.0" } } diff --git a/packages/animated-transition/package.json b/packages/animated-transition/package.json index 5c19117a..48b0e51c 100644 --- a/packages/animated-transition/package.json +++ b/packages/animated-transition/package.json @@ -29,5 +29,5 @@ "build": "babel src --out-dir . --ignore __tests__", "watch": "babel -w src --out-dir . --ignore __tests__" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 91935543..365f8fed 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -28,5 +28,5 @@ "postinstall": "npx npm-run-all 'postinstall:*'", "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/gatsby-image/package.json b/packages/gatsby-image/package.json index 3bcfdac8..78823765 100644 --- a/packages/gatsby-image/package.json +++ b/packages/gatsby-image/package.json @@ -47,5 +47,5 @@ "prepare": "cross-env NODE_ENV=production npm run build", "watch": "babel -w src/index.js --out-file index.js --ignore __tests__" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/gatsby-plugin-pug/package.json b/packages/gatsby-plugin-pug/package.json index b843d247..b18f423e 100644 --- a/packages/gatsby-plugin-pug/package.json +++ b/packages/gatsby-plugin-pug/package.json @@ -22,5 +22,5 @@ "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'", "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/gatsby-plugin-react-helmet/package.json b/packages/gatsby-plugin-react-helmet/package.json index 85f87f18..25f7ef26 100644 --- a/packages/gatsby-plugin-react-helmet/package.json +++ b/packages/gatsby-plugin-react-helmet/package.json @@ -15,5 +15,5 @@ "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'", "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/gatsby-plugin-styletron/package.json b/packages/gatsby-plugin-styletron/package.json index 3335cec7..4ca022fb 100644 --- a/packages/gatsby-plugin-styletron/package.json +++ b/packages/gatsby-plugin-styletron/package.json @@ -30,5 +30,5 @@ "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'", "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/gatsby-source-filesystem/package.json b/packages/gatsby-source-filesystem/package.json index 8a769757..8ee1aa3c 100644 --- a/packages/gatsby-source-filesystem/package.json +++ b/packages/gatsby-source-filesystem/package.json @@ -44,5 +44,5 @@ "prepare": "cross-env NODE_ENV=production npm run build", "watch": "babel -w src --out-dir . --ignore __tests__" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 681ca4e1..a45ceb80 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -21,5 +21,5 @@ "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'", "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/gatsby/patches-next/9-jsdir-2.diff b/packages/gatsby/patches-next/9-jsdir-2.diff index 281cc1e8..8c50a42d 100644 --- a/packages/gatsby/patches-next/9-jsdir-2.diff +++ b/packages/gatsby/patches-next/9-jsdir-2.diff @@ -19,19 +19,6 @@ }) }) ).filter(s => isString(s)) ---- node_modules/gatsby/dist/utils/webpack.config.js -+++ node_modules/gatsby/dist/utils/webpack.config.js -@@ -119,8 +119,8 @@ - return { - filename: `[name]-[chunkhash].js`, - chunkFilename: `[name]-[chunkhash].js`, -- path: directoryPath(`public`), -- publicPath: program.prefixPaths ? `${store.getState().config.pathPrefix}/` : `/` -+ path: directoryPath(`public/js`), -+ publicPath: program.prefixPaths ? `${store.getState().config.pathPrefix}/js/` : `/js/` - }; - - default: @@ -222,24 +222,6 @@ ) }) @@ -57,3 +44,16 @@ styles .slice(0) .reverse() +--- node_modules/gatsby/dist/utils/webpack.config.js ++++ node_modules/gatsby/dist/utils/webpack.config.js +@@ -119,8 +119,8 @@ + return { + filename: `[name]-[chunkhash].js`, + chunkFilename: `[name]-[chunkhash].js`, +- path: directoryPath(`public`), +- publicPath: program.prefixPaths ? `${store.getState().config.pathPrefix}/` : `/` ++ path: directoryPath(`public/js`), ++ publicPath: program.prefixPaths ? `${store.getState().config.pathPrefix}/js/` : `/js/` + }; + + default: \ No newline at end of file diff --git a/packages/git-setup/package.json b/packages/git-setup/package.json index 0bf725a0..16b2c18e 100644 --- a/packages/git-setup/package.json +++ b/packages/git-setup/package.json @@ -10,5 +10,5 @@ "postinstall": "npx npm-run-all 'postinstall:*'", "postinstall:setup": "source autokeep.command 0 && cd ../../../ && autokeep" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/http-server/package.json b/packages/http-server/package.json index a4163a35..ff1150f2 100644 --- a/packages/http-server/package.json +++ b/packages/http-server/package.json @@ -13,5 +13,5 @@ "postinstall": "npx npm-run-all 'postinstall:*'", "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/merge-json/package.json b/packages/merge-json/package.json index 58e45e45..d19a315e 100644 --- a/packages/merge-json/package.json +++ b/packages/merge-json/package.json @@ -15,5 +15,5 @@ "access": "public" }, "repository": "https://github.com/ptb/amory/tree/master/packages/merge-json", - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/prettier-eslint/package.json b/packages/prettier-eslint/package.json index c33e3dda..ad947532 100644 --- a/packages/prettier-eslint/package.json +++ b/packages/prettier-eslint/package.json @@ -15,5 +15,5 @@ "postinstall": "npx npm-run-all 'postinstall:*'", "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/queue/package.json b/packages/queue/package.json index 97afa7fe..204d3da2 100644 --- a/packages/queue/package.json +++ b/packages/queue/package.json @@ -11,5 +11,5 @@ "access": "public" }, "repository": "https://github.com/ptb/amory/tree/master/packages/queue", - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/sort-json/package.json b/packages/sort-json/package.json index efc6315a..ff1269c8 100644 --- a/packages/sort-json/package.json +++ b/packages/sort-json/package.json @@ -14,5 +14,5 @@ "postinstall": "npx npm-run-all 'postinstall:*'", "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'" }, - "version": "2018.4.26-11" + "version": "2018.4.26-12" } diff --git a/packages/uncssstyle/package.json b/packages/uncssstyle/package.json index 2683a944..c07fb961 100644 --- a/packages/uncssstyle/package.json +++ b/packages/uncssstyle/package.json @@ -6,5 +6,5 @@ "access": "public" }, "repository": "https://github.com/ptb/amory/tree/master/packages/uncssstyle", - "version": "2018.4.26-11" + "version": "2018.4.26-12" }