now: fix automated mainnet nightly, upgrade to zero config settings (#…

…1250)
aragon · Jan 18, 2020 · c2178da · c2178da
1 parent 5dcb3d4
commit c2178da
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/.nowignore b/.nowignore
@@ -0,0 +1 @@
+package-lock.json
diff --git a/now-mainnet.json b/now-mainnet.json
@@ -3,7 +3,9 @@
   "public": true,
   "scope": "aragon",
   "alias": "nightly.aragon.org",
-  "builds": [
-    { "src": "package.json", "use": "@now/static-build", "config": { "distDir": "build" } }
-  ]
+  "build": {
+    "env": {
+      "ARAGON_ETH_NETWORK_TYPE": "main"
+    }
+  }
 }
diff --git a/now.json b/now.json
@@ -3,9 +3,6 @@
   "public": true,
   "scope": "aragon",
   "alias": "nightly-rinkeby.aragon.org",
-  "builds": [
-    { "src": "package.json", "use": "@now/static-build", "config": { "distDir": "build/rinkeby" } }
-  ],
   "github": {
     "silent": true
   }

diff --git a/package.json b/package.json
@@ -104,10 +104,9 @@
     "lint": "eslint ./src",
     "test": "npm run lint && npm run jest",
     "jest": "jest",
-    "now-build": "npm run build:mainnet -- build && npm run build -- build/rinkeby",
-    "publish:major": "node scripts/publish major --only-content --files build/",
-    "publish:minor": "node scripts/publish minor --only-content --files build/",
-    "publish:patch": "node scripts/publish patch --only-content --files build/",
+    "publish:major": "node scripts/publish major --only-content --files public/",
+    "publish:minor": "node scripts/publish minor --only-content --files public/",
+    "publish:patch": "node scripts/publish patch --only-content --files public/",
     "publish:mainnet:major": "npm run publish:major -- --environment mainnet --build-script build:mainnet",
     "publish:mainnet:minor": "npm run publish:minor -- --environment mainnet --build-script build:mainnet",
     "publish:mainnet:patch": "npm run publish:patch -- --environment mainnet --build-script build:mainnet",

diff --git a/scripts/build b/scripts/build
@@ -4,7 +4,7 @@ const version = require('../package.json').version
 const execute = require('child_process').execSync
 
 // First two arguments are node and script name
-const buildDir = process.argv[2] || 'build'
+const buildDir = process.argv[2] || 'public'
 
 execute(`rimraf ${buildDir}`, { stdio: 'inherit' })
 execute(`copy-aragon-ui-assets -n aragon-ui ./${buildDir}`, {

diff --git a/scripts/build-local b/scripts/build-local
@@ -7,8 +7,8 @@ const {
   DEFAULT_LOCAL_IPFS_GATEWAY,
 } = require('./config/local')
 
-execute('rimraf ./build', { stdio: 'inherit' })
-execute(`copy-aragon-ui-assets -n aragon-ui ./build`, {
+execute('rimraf ./public', { stdio: 'inherit' })
+execute(`copy-aragon-ui-assets -n aragon-ui ./public`, {
   stdio: 'inherit',
 })
 
@@ -19,6 +19,6 @@ process.env.ARAGON_IPFS_GATEWAY = DEFAULT_LOCAL_IPFS_GATEWAY
 process.env.ARAGON_APP_LOCATOR = 'ipfs'
 
 execute(
-  `parcel build src/index.html --out-dir ./build --public-url ./ --no-cache`,
+  `parcel build src/index.html --out-dir ./public --public-url ./ --no-cache`,
   { stdio: 'inherit' }
 )
diff --git a/scripts/start b/scripts/start
@@ -5,12 +5,12 @@ const execute = require('child_process').execSync
 
 const clientPort = process.env.ARAGON_PORT || process.env.REACT_APP_PORT || 3000
 
-execute(`copy-aragon-ui-assets -n aragon-ui ./build`, {
+execute(`copy-aragon-ui-assets -n aragon-ui ./public`, {
   stdio: 'inherit',
 })
 
 process.env.ARAGON_PACKAGE_VERSION = version
 execute(
-  `parcel serve src/index.html --port ${clientPort} --out-dir ./build --no-cache`,
+  `parcel serve src/index.html --port ${clientPort} --out-dir ./public --no-cache`,
   { stdio: 'inherit' }
 )