diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..368fe859 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v8.12.0 diff --git a/package.json b/package.json index 7c716c0f..c9db7135 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,8 @@ "transpile:server:dev": "babel server/render/src -w -d server/render/build", "transpile:client": "babel client/src -d client/build", "transpile:client:dev": "babel client/src -w -d client/build", - "transpile:client_custom": "babel client_custom/src -d client_custom/build", - "transpile:client_custom:dev": "babel client_custom/src -w -d client_custom/build" + "transpile:client_custom": "babel site/client_custom/src -d site/client_custom/build", + "transpile:client_custom:dev": "babel site/client_custom/src -w -d site/client_custom/build" }, "repository": { "type": "git", diff --git a/server/chainquery/bundle.debug.js b/server/chainquery/bundle.debug.js index 10b027d8..cdc0f06d 100644 --- a/server/chainquery/bundle.debug.js +++ b/server/chainquery/bundle.debug.js @@ -240,7 +240,7 @@ const logger = require('winston'); const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } -} = require('../../config/siteConfig'); // TODO: Fix paths for rollup +} = require('../../site/config/siteConfig'); // TODO: Fix paths for rollup const getterMethods$3 = { generated_extension() { @@ -1066,7 +1066,7 @@ const { database, username, password, -} = require('../../config/chainqueryConfig'); // TODO: Make '@config/siteConfig' work outside Webpack for testing/dev +} = require('../../site/config/chainqueryConfig'); // TODO: Make '@config/siteConfig' work outside Webpack for testing/dev if (!database || !username || !password) { logger$2.warn('missing database, user, or password from chainqueryConfig'); diff --git a/server/chainquery/bundle.js b/server/chainquery/bundle.js index 18fbb6bb..2b51ddb8 100644 --- a/server/chainquery/bundle.js +++ b/server/chainquery/bundle.js @@ -240,7 +240,7 @@ const logger = require('winston'); const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } -} = require('../../config/siteConfig'); // TODO: Fix paths for rollup +} = require('../../site/config/siteConfig'); // TODO: Fix paths for rollup const getterMethods$3 = { generated_extension() { @@ -1076,7 +1076,7 @@ const { database, username, password, -} = require('../../config/chainqueryConfig'); // TODO: Make '@config/siteConfig' work outside Webpack for testing/dev +} = require('../../site/config/chainqueryConfig'); // TODO: Make '@config/siteConfig' work outside Webpack for testing/dev if (!database || !username || !password) { logger$2.warn('missing database, user, or password from chainqueryConfig'); diff --git a/server/chainquery/index.js b/server/chainquery/index.js index fd1c2a81..ddfa4951 100644 --- a/server/chainquery/index.js +++ b/server/chainquery/index.js @@ -66,7 +66,7 @@ const { database, username, password, -} = require('../../config/chainqueryConfig'); // TODO: Make '@config/siteConfig' work outside Webpack for testing/dev +} = require('../../site/config/chainqueryConfig'); // TODO: Make '@config/siteConfig' work outside Webpack for testing/dev if (!database || !username || !password) { logger.warn('missing database, user, or password from chainqueryConfig'); diff --git a/server/chainquery/models/ClaimModel.js b/server/chainquery/models/ClaimModel.js index 0008f457..0b00052b 100644 --- a/server/chainquery/models/ClaimModel.js +++ b/server/chainquery/models/ClaimModel.js @@ -3,7 +3,7 @@ const logger = require('winston'); const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } -} = require('../../config/siteConfig'); // TODO: Fix paths for rollup +} = require('../../site/config/siteConfig'); // TODO: Fix paths for rollup const getterMethods = { generated_extension() { diff --git a/client_custom/scss/.gitkeep b/site/client_custom/scss/.gitkeep similarity index 100% rename from client_custom/scss/.gitkeep rename to site/client_custom/scss/.gitkeep diff --git a/client_custom/scss/body/_body.scss b/site/client_custom/scss/body/_body.scss similarity index 100% rename from client_custom/scss/body/_body.scss rename to site/client_custom/scss/body/_body.scss diff --git a/client_custom/src/components/.gitkeep b/site/client_custom/src/components/.gitkeep similarity index 100% rename from client_custom/src/components/.gitkeep rename to site/client_custom/src/components/.gitkeep diff --git a/client_custom/src/containers/.gitkeep b/site/client_custom/src/containers/.gitkeep similarity index 100% rename from client_custom/src/containers/.gitkeep rename to site/client_custom/src/containers/.gitkeep diff --git a/client_custom/src/pages/.gitkeep b/site/client_custom/src/pages/.gitkeep similarity index 100% rename from client_custom/src/pages/.gitkeep rename to site/client_custom/src/pages/.gitkeep diff --git a/config/.gitkeep b/site/config/.gitkeep similarity index 100% rename from config/.gitkeep rename to site/config/.gitkeep diff --git a/utils/createModuleAliases.js b/utils/createModuleAliases.js index 1fae4c7a..9a8a5434 100644 --- a/utils/createModuleAliases.js +++ b/utils/createModuleAliases.js @@ -1,8 +1,8 @@ const { statSync, existsSync, readdirSync } = require('fs'); const { join, resolve } = require('path'); const DEFAULT_ROOT = 'client/build'; -const CUSTOM_ROOT = 'client_custom/build'; -const CUSTOM_SCSS_ROOT = 'client_custom/scss'; +const CUSTOM_ROOT = 'site/client_custom/build'; +const CUSTOM_SCSS_ROOT = 'site/client_custom/scss'; const getFolders = path => { if (existsSync(path)) { @@ -41,8 +41,7 @@ module.exports = () => { moduleAliases['server'] = resolve('./server'); // aliases for configs - moduleAliases['@config'] = resolve('config'); - moduleAliases['@devConfig'] = resolve('devConfig'); + moduleAliases['@config'] = resolve('site/config'); // create specific aliases for locally defined components in the following folders moduleAliases = addAliasesForCustomComponentFolder('containers', moduleAliases); diff --git a/yarn.lock b/yarn.lock index b391bc0c..ce11ef46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -622,6 +622,10 @@ version "2.1.0" resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.0.tgz#4b7daf2c51696cfc70b942c11690528229d1a1ce" +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" + "@types/geojson@^1.0.0": version "1.0.6" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.6.tgz#3e02972728c69248c2af08d60a48cbb8680fffdf" @@ -906,6 +910,12 @@ async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" +async-hook-jl@^1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68" + dependencies: + stack-chain "^1.3.7" + async-limiter@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" @@ -1636,6 +1646,14 @@ cls-bluebird@^2.1.0: is-bluebird "^1.0.2" shimmer "^1.1.0" +cls-hooked@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908" + dependencies: + async-hook-jl "^1.7.6" + emitter-listener "^1.0.1" + semver "^5.4.1" + cmd-shim@^2.0.2, cmd-shim@~2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb" @@ -2088,7 +2106,7 @@ debug@^3.0.0, debug@^3.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -2373,6 +2391,12 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emitter-listener@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8" + dependencies: + shimmer "^1.2.0" + emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" @@ -2758,6 +2782,12 @@ express-handlebars@^3.0.0: object.assign "^4.0.3" promise "^7.0.0" +express-http-context@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/express-http-context/-/express-http-context-1.2.0.tgz#8e886838f9915b57a42870b8a0a9532a82511657" + dependencies: + cls-hooked "^4.2.2" + express@^4.15.2: version "4.16.3" resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53" @@ -3501,6 +3531,14 @@ hoek@4.x.x: version "4.2.1" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" +hoek@5.x.x: + version "5.0.4" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.4.tgz#0f7fa270a1cafeb364a4b2ddfaa33f864e4157da" + +hoek@6.x.x: + version "6.0.2" + resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.0.2.tgz#a79eac32bdc4fdd6ca056951e3066d84c229d228" + hoist-non-react-statics@^2.5.0: version "2.5.5" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" @@ -3661,7 +3699,7 @@ import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" @@ -4039,6 +4077,12 @@ isbinaryfile@^3.0.3: dependencies: buffer-alloc "^1.2.0" +isemail@3.x.x: + version "3.2.0" + resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c" + dependencies: + punycode "2.x.x" + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -4057,6 +4101,14 @@ isstream@0.1.x, isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" +joi@^13.0.0: + version "13.7.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f" + dependencies: + hoek "5.x.x" + isemail "3.x.x" + topo "3.x.x" + js-base64@^2.1.8, js-base64@^2.1.9: version "2.4.9" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" @@ -4310,10 +4362,6 @@ lodash-es@^4.17.5: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -4321,28 +4369,10 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - lodash._root@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" @@ -4371,10 +4401,6 @@ lodash.mergewith@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - lodash.tail@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" @@ -6093,14 +6119,14 @@ punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" +punycode@2.x.x, punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + punycode@^1.2.4, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - puppeteer@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.7.0.tgz#edcba2300a50847202c0f19fd15e7a96171ff3bd" @@ -6376,7 +6402,7 @@ readable-stream@~1.1.10: isarray "0.0.1" string_decoder "~0.10.x" -readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0: +readdir-scoped-modules@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" dependencies: @@ -6713,6 +6739,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rollup@^0.66.2: + version "0.66.6" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482" + dependencies: + "@types/estree" "0.0.39" + "@types/node" "*" + run-async@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" @@ -6735,6 +6768,10 @@ rx-lite@*, rx-lite@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" +rx@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" + rxjs@^5.5.2: version "5.5.12" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc" @@ -6973,7 +7010,7 @@ shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" -shimmer@^1.1.0: +shimmer@^1.1.0, shimmer@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.0.tgz#f966f7555789763e74d8841193685a5e78736665" @@ -7197,6 +7234,10 @@ ssri@^6.0.0: dependencies: figgy-pudding "^3.5.1" +stack-chain@^1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285" + stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -7575,6 +7616,12 @@ toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" +topo@3.x.x: + version "3.0.3" + resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c" + dependencies: + hoek "6.x.x" + toposort-class@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" @@ -7921,6 +7968,16 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" +wait-on@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-3.2.0.tgz#c83924df0fc42a675c678324c49c769d378bcb85" + dependencies: + core-js "^2.5.7" + joi "^13.0.0" + minimist "^1.2.0" + request "^2.88.0" + rx "^4.1.0" + warning@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"