Update package name (#27970)

* Update package name * CI: bumps version to 23.1.0-rc.52 [skip ci] * Update build.gradle * dummy change in spec to trigger NPM * CI: bumps version to 23.1.0-rc.53 [skip ci] * change token * dummy change in spec to trigger NPM * CI: bumps version to 23.1.0-rc.54 [skip ci] * add --public to npm publish * dummy change in spec to trigger NPM * CI: bumps version to 23.1.0-rc.55 [skip ci] * add --public to npm publish * dummy change in spec to trigger NPM * CI: bumps version to 23.1.0-rc.56 [skip ci] * remove line * CI: bumps version to 23.1.0-rc.57 [skip ci] * rollback line, add access public * CI: bumps version to 23.1.0-rc.58 [skip ci] * add public to webcomponents * CI: bumps version to 23.1.0-rc.12 [skip ci] * add organization to webcomponents * add organization to webcomponents * CI: bumps version to 23.1.0-rc.13 [skip ci] * update core-web version, point to org --------- Co-authored-by: victoralfaro-dotcms <[email protected]> Co-authored-by: erickgonzalez <[email protected]>
dotCMS · Mar 14, 2024 · 302d16d · 302d16d
1 parent 1ff0559
commit 302d16d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 25 deletions.
diff --git a/.github/workflows/pre-release-process.yml b/.github/workflows/pre-release-process.yml
@@ -42,7 +42,7 @@ jobs:
           GITHUB_USER_TOKEN: ${{ secrets.CICD_GITHUB_TOKEN }}
           REPO_USERNAME: ${{ secrets.EE_REPO_USERNAME }}
           REPO_PASSWORD: ${{ secrets.EE_REPO_PASSWORD }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_ORG_TOKEN }}
           FROM_BRANCH: ${{ github.event.inputs.from_branch }}
           NODE_VERSION: ${{ github.event.inputs.node_version }}
   pre-release-process-image:

diff --git a/.github/workflows/publish_dotcms_ui.yml b/.github/workflows/publish_dotcms_ui.yml
@@ -111,11 +111,8 @@ jobs:
           mkdir dist/apps/core-web
           cp prepare.js ./dist/apps/core-web/prepare.js
 
-          npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
+          npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_ORG_TOKEN }}
           cd dist/apps/dotcms-ui
-          if [[ $(basename "${{ github.ref }}") =~ ^release-.* ]]; then
-            npm publish --tag rc
-          fi
-          if [[ $(basename "${{ github.ref }}") =~ ^master ]]; then
-            npm publish --tag next
-          fi
+          
+          npm publish --access public
+          
diff --git a/.github/workflows/publish_webcomponents.yml b/.github/workflows/publish_webcomponents.yml
@@ -99,11 +99,6 @@ jobs:
       - name: "Publish to npm"
         run: |
           cd core-web
-          npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
+          npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_ORG_TOKEN }}
           cd dist/libs/dotcms-webcomponents
-          if [[ $(basename "${{ github.ref }}") =~ ^release-.* ]]; then
-            npm publish --tag rc
-          fi
-          if [[ $(basename "${{ github.ref }}") =~ ^master ]]; then
-            npm publish --tag next
-          fi
+          npm publish --access public
diff --git a/core-web/apps/dotcms-ui/src/app/api/services/dot-contentlet/dot-contentlet-service.spec.ts b/core-web/apps/dotcms-ui/src/app/api/services/dot-contentlet/dot-contentlet-service.spec.ts
@@ -31,11 +31,11 @@ const mockContentletByInodeResponse = {
         languageId: 1,
         live: true,
         locked: false,
-        modDate: 1639784363639,
+        modDate: 1639784363633,
         modUser: 'dotcms.org.1',
         modUserName: 'Admin User',
         owner: 'dotcms.org.1',
-        publishDate: 1639784363639,
+        publishDate: 1639784363633,
         sortOrder: 0,
         stInode: '0121c052881956cd95bfe5dde968ca07',
         text: 'final value',

diff --git a/core-web/libs/dotcms-webcomponents/package.json b/core-web/libs/dotcms-webcomponents/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "dotcms-webcomponents",
-    "version": "23.1.0-rc.11",
+    "name": "@dotcms/dotcms-webcomponents",
+    "version": "23.1.0-rc.13",
     "main": "./dist/index.cjs.js",
     "module": "./dist/index.js",
     "es2015": "./dist/esm/index.mjs",

diff --git a/core-web/libs/dotcms-webcomponents/src/services/dot-asset/dot-asset.service.spec.ts b/core-web/libs/dotcms-webcomponents/src/services/dot-asset/dot-asset.service.spec.ts
@@ -38,7 +38,7 @@ xdescribe('DotAssetService', () => {
     const assetService = new DotAssetService();
 
     const mockSuccessResponse = {};
-    const mockJsonPromise = Promise.resolve(mockSuccessResponse); // 2
+    const mockJsonPromise = Promise.resolve(mockSuccessResponse);
     const mockFetchPromise = Promise.resolve({
         // 3
         json: () => mockJsonPromise,

diff --git a/core-web/package.json b/core-web/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "dotcms-ui",
-    "version": "23.1.0-rc.51",
+    "name": "@dotcms/dotcms-ui",
+    "version": "23.1.0-rc.58",
     "license": "MIT",
     "engines": {
         "node": ">=16.13.2"

diff --git a/dotCMS/build.gradle b/dotCMS/build.gradle
@@ -499,7 +499,7 @@ class DeployWarTomcatTask extends DefaultTask{
 
 abstract class NpmArtifactExtractTask extends DefaultTask {
     @Input
-    String url = 'https://registry.npmjs.org'
+    String url = 'https://registry.npmjs.org/@dotcms'
     @Input
     String artifactFolder = './tmp'
     @Input

diff --git a/dotCMS/gradle.properties b/dotCMS/gradle.properties
@@ -1,6 +1,6 @@
 dotcmsReleaseVersion=23.01.14
-coreWebReleaseVersion=23.1.0-rc.48
-webComponentsReleaseVersion=23.1.0-rc.4
+coreWebReleaseVersion=23.1.0-rc.58
+webComponentsReleaseVersion=23.1.0-rc.13
 
 tomcatInstallRepo=https://github.com/dotCMS/tomcat.git
 tomcatInstallBranch=9.0.60