[BUGFIX docs] ensure we publish docs

emberjs · Jul 18, 2019 · 7785d8a · 7785d8a
1 parent f66ed45
commit 7785d8a
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 13 deletions.
diff --git a/bin/publish.js b/bin/publish.js
@@ -248,6 +248,20 @@ function packAllPackages() {
     const pkgInfo = require(pkgPath);
     if (pkgInfo.private !== true) {
       // will pack into the project root directory
+      // due to an issue where npm does not run prepublishOnly for pack, we run it here
+      // however this is also a timing bug, as typically it would be run *after* prepublish
+      // and prepare and now it is run *before*
+      // we do not use `prepublish` or `prepare` so this should be fine for now.
+      // https://docs.npmjs.com/misc/scripts
+      // https://github.com/npm/npm/issues/15363
+      if (pkgInfo.scripts) {
+        if (pkgInfo.scripts.prepublishOnly) {
+          if (pkgInfo.scripts.prepublish || pkgInfo.scripts.prepare) {
+            console.log(`⚠️ ` + chalk.grey(`${pkgInfo.name} has both a 'prepublishOnly' and either 'prepare' or 'publish' scripts. Running prepublishOnly manually before instead of after publish and prepare. See https://github.com/npm/npm/issues/15363`));
+          }
+          execWithLog(`cd ${pkgDir} && npm run prepublishOnly`);
+        }
+      }
       execWithLog(`npm pack ${pkgDir}`);
     }
   });

diff --git a/packages/-ember-data/.npmignore b/packages/-ember-data/.npmignore
@@ -1,5 +1,6 @@
 # compiled output
 /dist/
+/dist/**/*
 /tmp/
 
 # dependencies

diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
@@ -16,8 +16,7 @@
     "test:production": "ember test -e production",
     "test:optional-features": "ember test",
     "test:try-one": "ember try:one",
-    "prepublishOnly": "ember build --environment=production && ember ts:precompile",
-    "postpublish": "ember ts:clean"
+    "prepublishOnly": "ember build --environment=production"
   },
   "author": "",
   "license": "MIT",

diff --git a/packages/adapter/.npmignore b/packages/adapter/.npmignore
@@ -1,5 +1,6 @@
 # compiled output
 /dist/
+/dist/**/*
 /tmp/
 
 # dependencies
@@ -31,4 +32,7 @@
 /package.json.ember-try
 
 # ember-data
-/node-tests
+/node-tests
+
+# whitelist yuidoc's data.json for api docs generation
+!/dist/docs/data.json
diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -18,8 +18,7 @@
     "test": "ember test",
     "test:all": "ember try:each",
     "test:node": "mocha",
-    "prepublishOnly": "ember build --environment=production && ember ts:precompile",
-    "postpublish": "ember ts:clean"
+    "prepublishOnly": "ember build --environment=production"
   },
   "dependencies": {
     "@ember-data/-build-infra": "^3.12.0-canary.2",

diff --git a/packages/model/.npmignore b/packages/model/.npmignore
@@ -1,5 +1,6 @@
 # compiled output
 /dist/
+/dist/**/*
 /tmp/
 
 # dependencies
@@ -31,4 +32,7 @@
 /package.json.ember-try
 
 # ember-data
-/node-tests
+/node-tests
+
+# whitelist yuidoc's data.json for api docs generation
+!/dist/docs/data.json
diff --git a/packages/model/package.json b/packages/model/package.json
@@ -19,8 +19,7 @@
     "test": "ember test",
     "test:all": "ember try:each",
     "test:node": "mocha",
-    "prepublishOnly": "ember build --environment=production && ember ts:precompile",
-    "postpublish": "ember ts:clean"
+    "prepublishOnly": "ember build --environment=production"
   },
   "dependencies": {
     "@ember-data/-build-infra": "^3.12.0-canary.2",

diff --git a/packages/serializer/.npmignore b/packages/serializer/.npmignore
@@ -1,5 +1,6 @@
 # compiled output
 /dist/
+/dist/**/*
 /tmp/
 
 # dependencies
@@ -31,4 +32,7 @@
 /package.json.ember-try
 
 # ember-data
-/node-tests
+/node-tests
+
+# whitelist yuidoc's data.json for api docs generation
+!/dist/docs/data.json
diff --git a/packages/serializer/package.json b/packages/serializer/package.json
@@ -19,8 +19,7 @@
     "test": "ember test",
     "test:all": "ember try:each",
     "test:node": "mocha",
-    "prepublishOnly": "ember build --environment=production && ember ts:precompile",
-    "postpublish": "ember ts:clean"
+    "prepublishOnly": "ember build --environment=production"
   },
   "dependencies": {
     "@ember-data/-build-infra": "^3.12.0-canary.2",

diff --git a/packages/store/.npmignore b/packages/store/.npmignore
@@ -1,5 +1,6 @@
 # compiled output
 /dist/
+/dist/**/*
 /tmp/
 
 # dependencies
@@ -29,3 +30,6 @@
 /.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try
+
+# whitelist yuidoc's data.json for api docs generation
+!/dist/docs/data.json
diff --git a/packages/store/package.json b/packages/store/package.json
@@ -18,8 +18,7 @@
     "start": "ember serve",
     "test": "ember test",
     "test:all": "ember try:each",
-    "prepublishOnly": "ember build --environment=production && ember ts:precompile",
-    "postpublish": "ember ts:clean"
+    "prepublishOnly": "ember build --environment=production"
   },
   "dependencies": {
     "@ember-data/-build-infra": "^3.12.0-canary.2",