Merge pull request #597 from primer/fix-primerize

Fix primerize, add "fresh" run-script, etc.
primer · Nov 9, 2018 · d070918 · d070918
2 parents 04fbe82 + 7dbe4c4
commit d070918
Show file tree

Hide file tree

Showing 55 changed files with 26,033 additions and 39,807 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
+*.lerna_backup
+*.log
+*/*/package-lock.json
 .DS_Store
+.changelog
 .sass-cache
-node_modules
-*.log
-build
 _site
-*.lerna_backup
-.changelog
+build
+node_modules
diff --git a/DEVELOP.md b/DEVELOP.md
@@ -23,12 +23,18 @@ Run `npm install` to install the npm dependencies and automatically run link all
 If you run into trouble installing, it's always best to ensure that you're starting from a clean slate by running the following from the repository root directory:
 
 ```sh
-npx lerna clean --yes
+npm run fresh
+```
+
+If _that_ gives you problems, then you can try manually deleting everything and starting over:
+
+```
 rm -rf node_modules
+rm -f package-lock.json */*/package-lock.json
 npm install
 ```
 
-**You may need to do this whenever switching between branches with different dependencies, submodules, or versions of Node and/or npm.** The Primer core team generally uses the latest major version of Node (10 as of this writing), but we run our CI tests on Node 8 and npm 6. You can check which versions you're running with:
+**You may need to do this whenever switching between branches with different dependencies, submodules, or versions of Node and/or npm.** The Primer core team generally uses the latest major version of Node (10 as of this writing), but our CI tests run Node 8 and npm 6. You can check which versions you're running with:
 
 ```sh
 npm --version

diff --git a/lerna.json b/lerna.json
@@ -1,9 +1,12 @@
 {
   "lerna": "2.4.0",
+  "version": "independent",
   "packages": [
     "modules/*",
-    "tools/*"
+    "tools/*",
+    "!tools/generator-primer-module"
   ],
+  "npmClientArgs": ["--no-package-lock"],
   "changelog": {
     "repo": "primer/primer",
     "labels": {
@@ -15,6 +18,5 @@
       "Tag: Internal": ":house: Internal"
     },
     "cacheDir": ".changelog"
-  },
-  "version": "independent"
+  }
 }
diff --git a/modules/primer-alerts/package-lock.json b/modules/primer-alerts/package-lock.json
diff --git a/modules/primer-avatars/package-lock.json b/modules/primer-avatars/package-lock.json
diff --git a/modules/primer-base/package-lock.json b/modules/primer-base/package-lock.json
diff --git a/modules/primer-blankslate/package-lock.json b/modules/primer-blankslate/package-lock.json
diff --git a/modules/primer-box/package-lock.json b/modules/primer-box/package-lock.json
diff --git a/modules/primer-branch-name/package-lock.json b/modules/primer-branch-name/package-lock.json
diff --git a/modules/primer-breadcrumb/package-lock.json b/modules/primer-breadcrumb/package-lock.json
diff --git a/modules/primer-buttons/package-lock.json b/modules/primer-buttons/package-lock.json
diff --git a/modules/primer-core/package-lock.json b/modules/primer-core/package-lock.json
diff --git a/modules/primer-forms/package-lock.json b/modules/primer-forms/package-lock.json
diff --git a/modules/primer-labels/package-lock.json b/modules/primer-labels/package-lock.json
diff --git a/modules/primer-layout/package-lock.json b/modules/primer-layout/package-lock.json
diff --git a/modules/primer-markdown/package-lock.json b/modules/primer-markdown/package-lock.json
diff --git a/modules/primer-marketing-buttons/package-lock.json b/modules/primer-marketing-buttons/package-lock.json
diff --git a/modules/primer-marketing-buttons/package.json b/modules/primer-marketing-buttons/package.json
@@ -33,9 +33,6 @@
   "dependencies": {
     "primer-support": "4.6.1"
   },
-  "peerDependencies": {
-    "primer-buttons": "2.6.1"
-  },
   "keywords": [
     "css",
     "github",

diff --git a/modules/primer-marketing-support/package-lock.json b/modules/primer-marketing-support/package-lock.json