@qualtrics/plugin-ui-react 1.4.0-alpha.0 → 1.4.0-alpha.2

package/jenkins.groovy

@@ -4,8 +4,6 @@ JOB_PARAMETER_RELEASE_STEP_PC_TICKETS = 'pc tickets'
 
 JOB_PARAMETER_PROJECT_PLUGIN_UI_REACT = 'plugin-ui-react'
 
-PUBLIC_REGISTRY = 'https://registry.npmjs.org'
-
 // Project Contstants
 SLACK_DEPLOY_CHANNEL = '#app-sdk-deploys'
 SLACK_MR_VALIDATION_CHANNEL = '#app-sdk-mr-validation'
@@ -30,7 +28,7 @@ JIRA_LABELS = ['DPEE']
 TEAM_RUNBOOK = 'https://odo.corp.qualtrics.com/wiki/index.php/AppSDK_Team_Runbook'
 TEAM_ROLLBACK = 'https://odo.corp.qualtrics.com/wiki/index.php/AppSDK_Team_Runbook#Task_Rollback'
 
-MAKE_PUBLISH_EXTERNAL = 'make publish-external'
+MAKE_PUBLISH = 'make publish'
 MAKE_BUILD = 'make build'
 MAKE_TEST = 'make test'
 MAKE_CLEAN = 'make clean'
@@ -203,13 +201,12 @@ def createPCReleaseTicket(project) {
 
 def publishToNpm(project) {
   def nameVersion = getProjectNameAndVersion(project.name, project.directory)
-  echo "publishing ${nameVersion}"
 
   if (hasVersionBeenPublished(project)) {
     def alreadyPublishedMessage = "${nameVersion} has already been published."
     if (isManualDeployJob()) {
       notifications.sendSlackFailedToPublishMessage(nameVersion, SLACK_DEPLOY_CHANNEL)
-      erorr alreadyPublishedMessage
+      error alreadyPublishedMessage
     }
     echo "${alreadyPublishedMessage} Skipping..."
     return
@@ -217,6 +214,8 @@ def publishToNpm(project) {
 
   def packageJsonPath = getPackageJsonPath(project.directory)
   def tag = pipelineControls.isAlphaVersion(packageJsonPath) ? 'alpha' : 'latest'
+
+  echo "publishing ${nameVersion}"
   def publishStatus = publishToPublicRegistry(project.directory, tag)
 
   if (publishStatus == 0) {
@@ -242,7 +241,7 @@ def publishToPublicRegistry(directory, tag) {
     ]],
   ]
   withVault([configuration: configuration, vaultSecrets: secrets]) {
-    publishStatus = sh(returnStatus: true, script: 'INT_NPM_TOKEN=$INT_NPM_TOKEN ' + "DIRECTORY=${directory} TAG=${tag} ${MAKE_PUBLISH_EXTERNAL}")
+    publishStatus = sh(returnStatus: true, script: 'INT_NPM_TOKEN=$INT_NPM_TOKEN ' + "DIRECTORY=${directory} TAG=${tag} ${MAKE_PUBLISH}")
   }
   return publishStatus
 }
@@ -263,6 +262,11 @@ def isDeploymentJob(jobParameterProject, directory) {
   return pipelineControls.isAlphaRelease(packageJsonPath, MAIN_BRANCH)
 }
 
+def getNpmrcPath(directory) {
+  def rootDir = pwd()
+  return "${rootDir}/${directory}/.npmrc"
+}
+
 def getPackageJsonPath(directory) {
   def rootDir = pwd()
   return "${rootDir}/${directory}/package.json"
@@ -280,5 +284,7 @@ def getPackageVersion(directory) {
 
 def hasVersionBeenPublished(project) {
   def version = getPackageVersion(project.directory)
-  return pipelineControls.hasPackageBeenPreviouslyPublished(project.name, version, PUBLIC_REGISTRY)
+  def npmrcPath = getNpmrcPath(project.directory)
+  def registryUrl = pipelineControls.parseRegistryUrl(npmrcPath)
+  return pipelineControls.hasPackageBeenPreviouslyPublished(project.name, version, registryUrl)
 }

package/jenkinsPipelineUtils/pipelineControls.groovy

@@ -12,6 +12,14 @@ def getJobDisplayName(currentBuildNumber, projectName, mainBranch) {
   }
 }
 
+def parseRegistryUrl(npmrcPath) {
+  def npmrcContents = readFile(npmrcPath)
+  def npmrcLines = npmrcContents.split('\n')
+  def registryLine = npmrcLines.find({line -> line.startsWith('registry=')})
+  def registryUrl = registryLine.minus('registry=')
+  return registryUrl
+}
+
 def parseVersionNumber(packageJsonPath) {
   def versionNumberPattern = /(\d+).(\d+).(\d+(-alpha.(\d)+)?)/
   def manifest = readFile(packageJsonPath)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qualtrics/plugin-ui-react",
-  "version": "1.4.0-alpha.0",
+  "version": "1.4.0-alpha.2",
   "description": "",
   "main": "dist/main.js",
   "module": "dist/main.es.js",
@@ -39,6 +39,7 @@
     "@testing-library/dom": "^7.30.3",
     "@testing-library/jest-dom": "^5.11.5",
     "@testing-library/react": "^11.1.0",
+    "@types/lodash.clonedeep": "^4.5.7",
     "@types/lodash.get": "^4.4.6",
     "@types/react": "^17.0.11",
     "@types/react-dom": "^17.0.8",