Merge pull request #2325 from trufflesuite/org-scoping

Start switching to org-scoped packages

packages/truffle-solidity-utils/README.md → packages/solidity-utils/README.md

@@ -1,4 +1,4 @@
-# truffle-solidity-utils
+# @truffle/solidity-utils
 Utilities for solidity contracts
 
 # API

packages/truffle-solidity-utils/index.js → packages/solidity-utils/index.js

@@ -1,5 +1,4 @@
 var SolidityUtils = {
-
   getCharacterOffsetToLineAndColumnMapping: function(source) {
     var mapping = [];
 
@@ -31,7 +30,7 @@ var SolidityUtils = {
   },
 
   getHumanReadableSourceMap: function(sourceMap) {
-    var map = sourceMap.split(';');
+    var map = sourceMap.split(";");
 
     var last = {};
 
@@ -43,12 +42,12 @@ var SolidityUtils = {
         jump: last.jump
       };
 
-      current = current.split(':');
+      current = current.split(":");
 
-      if (current[0] && current[0] !== '-1' && current[0].length) {
+      if (current[0] && current[0] !== "-1" && current[0].length) {
         ret.start = parseInt(current[0]);
       }
-      if (current[1] && current[1] !== '-1' && current[1].length) {
+      if (current[1] && current[1] !== "-1" && current[1].length) {
         ret.length = parseInt(current[1]);
       }
       if (current[2] /*&& current[2] !== '-1'*/ && current[2].length) {

packages/truffle-solidity-utils/package.json → packages/solidity-utils/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "truffle-solidity-utils",
+  "name": "@truffle/solidity-utils",
   "version": "1.2.3",
   "description": "Utilities for Solidity contracts",
   "main": "index.js",
   "scripts": {},
-  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/truffle-solidity-utils",
+  "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/solidity-utils",
   "keywords": [
     "ethereum",
     "truffle",
@@ -14,9 +14,9 @@
   "author": "Tim Coulter <tim.coulter@consensys.net>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/trufflesuite/truffle-solidity-utils/issues"
+    "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "homepage": "https://github.com/trufflesuite/truffle-solidity-utils#readme",
+  "homepage": "https://github.com/trufflesuite/truffle/tree/master/packages/solidity-utils#readme",
   "publishConfig": {
     "access": "public"
   },

packages/truffle-compile/test/test_ordering.js

@@ -136,7 +136,7 @@ describe("Compile - solidity ^0.4.0", function() {
       assert.deepEqual(abi, expectedOrder);
     });
 
-    // Ported from `truffle-solidity-utils`
+    // Ported from `@truffle/solidity-utils`
     it("orders the ABI of a contract without functions", async function() {
       var sources = {};
       // ComplexOrdered.sol includes contract `Empty`

packages/truffle-core/package.json

@@ -61,7 +61,6 @@
     "truffle-provisioner": "^0.1.5",
     "truffle-require": "^2.0.18",
     "truffle-resolver": "^5.0.15",
-    "truffle-solidity-utils": "^1.2.3",
     "truffle-workflow-compile": "^2.1.2",
     "universal-analytics": "^0.4.17",
     "web3": "1.2.1",

packages/truffle-debugger/lib/solidity/selectors/index.js

@@ -2,7 +2,7 @@ import debugModule from "debug";
 const debug = debugModule("debugger:solidity:selectors");
 
 import { createSelectorTree, createLeaf } from "reselect-tree";
-import SolidityUtils from "truffle-solidity-utils";
+import SolidityUtils from "@truffle/solidity-utils";
 import CodeUtils from "truffle-code-utils";
 
 import { findRange } from "lib/ast/map";

packages/truffle-debugger/package.json

@@ -33,7 +33,7 @@
     "truffle-decode-utils": "^1.0.16",
     "truffle-decoder": "^3.0.9",
     "truffle-expect": "^0.0.9",
-    "truffle-solidity-utils": "^1.2.3",
+    "@truffle/solidity-utils": "^1.2.3",
     "web3": "1.2.1",
     "web3-eth-abi": "1.2.1"
   },

scripts/npm-access.js

@@ -6,20 +6,24 @@ const getPkgPermissions = userOrOrg => {
   return JSON.parse(stringResponse);
 };
 
-const truffleSuiteOrgPermissionsObject = getPkgPermissions("trufflesuite");
+const orgs = ["trufflesuite", "truffle"];
 
-const getNpmUsername = () => {
-  const bufferResponse = execSync("npm whoami");
-  return bufferResponse.toString();
-};
+for (let org of orgs) {
+  const permissions = getPkgPermissions(org);
+
+  const getNpmUsername = () => {
+    const bufferResponse = execSync("npm whoami");
+    return bufferResponse.toString();
+  };
 
-const username = getNpmUsername();
+  const username = getNpmUsername();
 
-const userPermissionsObject = getPkgPermissions(username);
+  const userPermissionsObject = getPkgPermissions(username);
 
-for (const pkg in truffleSuiteOrgPermissionsObject) {
-  if (!userPermissionsObject[pkg])
-    throw new Error(`You don't have permissions to publish ${pkg}`);
-  if (truffleSuiteOrgPermissionsObject[pkg] !== userPermissionsObject[pkg])
-    throw new Error(`Missing correct 'read-write' access to ${pkg}`);
+  for (const pkg in permissions) {
+    if (!userPermissionsObject[pkg])
+      throw new Error(`You don't have permissions to publish ${pkg}`);
+    if (permissions[pkg] !== userPermissionsObject[pkg])
+      throw new Error(`Missing correct 'read-write' access to ${pkg}`);
+  }
 }

scripts/publish-release.sh

@@ -5,7 +5,7 @@ set -ex
 
 npm login
 node ./scripts/npm-access.js
-lerna publish
+lerna publish -- --access=public
 git checkout master
 git merge develop
 git push origin master