Merge branch 'master' into update-deps

# Conflicts:
#	packages/google-closure-compiler/package.json

Author: ChadKillingsworth

.github/workflows/build.yml

@@ -87,7 +87,7 @@ jobs:
           architecture: x64
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Setup upx
@@ -153,7 +153,7 @@ jobs:
           architecture: x64
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Install upx
@@ -215,7 +215,7 @@ jobs:
           architecture: x64
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Download compiler jar
@@ -285,9 +285,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
+          registry-url: https://registry.npmjs.org/
       - name: Download compiler jar
         uses: actions/download-artifact@v2
         with:
@@ -339,5 +340,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Github Bot"
           ./build-scripts/create-nightly-version.js
+      - name: Configure yarn
+        run: yarn config set registry https://registry.npmjs.org/
       - name: Publish packages to npm
         run: yarn publish-packages

.github/workflows/release.yml

@@ -47,7 +47,17 @@ jobs:
         run: ./build-scripts/build_compiler.js
       - name: Create release commit and tag
         run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Github Bot"
           git add compiler
           yarn version --new-version ${{ github.event.inputs.COMPILER_VERSION_NUMBER }}.0.0
           git push origin master
-          git push origin v${{ github.event.inputs.COMPILER_VERSION_NUMBER }}
+          git push origin v${{ github.event.inputs.COMPILER_VERSION_NUMBER }}.0.0
+      - name: Create GitHub Release
+        run: |
+          curl \
+            -X POST \
+            -H 'Accept: application/vnd.github+json' \
+            -H 'Authorization: token ${{ secrets.GITHUB_TOKEN }}' \
+            https://api.github.com/repos/google/closure-compiler-npm/releases \
+            -d '{"tag_name":"v${{ github.event.inputs.COMPILER_VERSION_NUMBER }}.0.0","name":"${{ github.event.inputs.COMPILER_VERSION_NUMBER }}.0.0","body":"Closure-compiler ${{ github.event.inputs.COMPILER_VERSION_NUMBER }} release","draft":false,"prerelease":false,"generate_release_notes":true}'

.gitignore

@@ -12,3 +12,4 @@ yarn-error.log
 /packages/google-closure-compiler-js/jscomp.js
 /temp
 /publish-log.txt
+.npmrc

build-scripts/publish.js

@@ -29,6 +29,7 @@ const path = require('path');
 const runCommand = require('./run-command');
 
 const packagesDirPath = path.resolve(__dirname, '../packages');
+const npmrcPath = path.resolve(process.env.HOME, '.npmrc');
 
 async function isPackageVersionPublished(packageName, version) {
   return fetch(`https://registry.npmjs.org/${encodeURI(packageName)}/${version}`)
@@ -38,8 +39,9 @@ async function isPackageVersionPublished(packageName, version) {
 async function isValidPackagePath(packageDir) {
   const packageJsonPath = `${packageDir}/package.json`;
   try {
+    // check to see if the file already exists - if so do nothing
     await fs.stat(packageJsonPath);
-    return true
+    return true;
   } catch {
     return false;
   }
@@ -52,6 +54,20 @@ async function getPackageInfo(packageDir) {
   };
 }
 
+async function setupNpm() {
+  // For npm publication to work, the NPM token must be stored in the .npmrc file
+  if (process.env.GITHUB_ACTIONS && process.env.NPM_TOKEN) {
+    await fs.writeFile(
+        npmrcPath,
+        `//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\nregistry=https://registry.npmjs.org/`,
+        'utf8');
+  }
+}
+
+async function cleanupNpmrc() {
+  await fs.unlink(npmrcPath);
+}
+
 async function publishPackagesIfNeeded(packageInfo) {
   const pkgJson = packageInfo.pkg;
   const isAlreadyPublished = await isPackageVersionPublished(pkgJson.name, pkgJson.version);
@@ -60,16 +76,15 @@ async function publishPackagesIfNeeded(packageInfo) {
     return;
   }
   console.log('Publishing', pkgJson.name, pkgJson.version);
-  const publishArgs = [];
+  const publishArgs = ['workspace', pkgJson.name, 'publish', `--new-version=${pkgJson.version}`];
   if (process.env.COMPILER_NIGHTLY ) {
-    publishArgs.push('--npm-tag', 'nightly');
+    publishArgs.push('--tag', 'nightly');
   }
-  await runCommand('npm', ['publish'].concat(publishArgs), {
-    cwd: packageInfo.path
-  });
+  await runCommand('yarn', publishArgs);
 }
 
 (async () => {
+  await setupNpm();
   const packagesDirEntries = await fs.readdir(packagesDirPath);
   // build a graph of the interdependencies of projects and only publish
   const graph = new graphlib.Graph({directed: true, compound: false});
@@ -112,4 +127,6 @@ async function publishPackagesIfNeeded(packageInfo) {
       throw new Error('Unable to publish packages: cyclical dependencies encountered.');
     }
   }
-})().catch((e) => { throw e });
+})().catch((e) => {
+  throw e;
+}).finally(cleanupNpmrc);

compiler

@@ -1,6 +1,6 @@
 {
   "name": "closure-compiler-npm",
-  "version": "20220719.0.0",
+  "version": "20220803.0.0",
   "private": true,
   "workspaces": {
     "packages": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-closure-compiler-java",
-  "version": "20220719.0.0",
+  "version": "20220803.0.0",
   "description": "Check, compile, optimize and compress Javascript with Closure-Compiler using Java",
   "main": "index.js",
   "repository": "https://github.com/google/closure-compiler-npm/tree/master/packages/google-closure-compiler-java",

packages/google-closure-compiler-java/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-closure-compiler-linux",
-  "version": "20220719.0.0",
+  "version": "20220803.0.0",
   "description": "Check, compile, optimize and compress Javascript with Closure-Compiler using Java",
   "main": "index.js",
   "repository": "https://github.com/google/closure-compiler-npm/tree/master/packages/google-closure-compiler-linux",

packages/google-closure-compiler-linux/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-closure-compiler-osx",
-  "version": "20220719.0.0",
+  "version": "20220803.0.0",
   "description": "Check, compile, optimize and compress Javascript with Closure-Compiler using Java",
   "main": "index.js",
   "repository": "https://github.com/google/closure-compiler-npm/tree/master/packages/google-closure-compiler-osx",

packages/google-closure-compiler-osx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-closure-compiler-windows",
-  "version": "20220719.0.0",
+  "version": "20220803.0.0",
   "description": "Check, compile, optimize and compress Javascript with Closure-Compiler using Java",
   "main": "index.js",
   "repository": "https://github.com/google/closure-compiler-npm/tree/master/packages/google-closure-compiler-windows",