Merge pull request #440 from nyaggah/develop

feat: use setup-node and checkout actions v4
nyaggah · May 18, 2024 · 437d1a4 · 437d1a4
2 parents 47ed35d + ccf0d3d
commit 437d1a4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 222 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
 

diff --git a/packages/cli/src/commands/codemod.ts b/packages/cli/src/commands/codemod.ts
diff --git a/packages/cli/src/lib/codemod.ts b/packages/cli/src/lib/codemod.ts
diff --git a/packages/cli/src/lib/make/utils/write-mvp-workflow.ts b/packages/cli/src/lib/make/utils/write-mvp-workflow.ts
@@ -81,15 +81,29 @@ jobs:
     name: Make, Version & Publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Node 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x        
       ${
         pm === 'pnpm' || pm === 'bun'
-          ? `- run: npm install ${pm} -g
-      - run: ${pm} install`
+          ? `
+      - name: Install ${pm} & Deps
+        run: |
+          npm install ${pm} -g
+          ${pm} install`
           : pm === 'yarn'
-            ? `- run: corepack enable
-      - run: yarn`
-            : '- run: npm ci'
+            ? `
+      - name: Install ${pm} & Deps
+        run: |
+          corepack enable
+          yarn`
+            : `
+      - name: NPM clean install
+        run: npm ci`
       }
       
       - name: '[ M A K E ] : Build ${projectName} - all browsers'

diff --git a/packages/cli/src/lib/make/utils/write-package-json.ts b/packages/cli/src/lib/make/utils/write-package-json.ts
@@ -74,7 +74,7 @@ export function writePackageJson(response: prompts.Answers<string>): void {
     ${commitLint ? `"commit": "${lintFormat ? 'lint-staged && ' : ''}cz",` : ''}"zip": "bedframe zip",
     ${
       browsers.includes('safari')
-        ? `"convert:safari": "xcrun safari-web-extension-converter dist/safari --project-location . --app-name $npm_package_name@$npm_package_version-safari"`
+        ? `"convert:safari": "xcrun safari-web-extension-converter dist/safari --project-location . --app-name $npm_package_name-safari"`
         : ''
     }${browsers.includes('safari') && gitHooks ? ',' : ''} 
     ${gitHooks ? `"postinstall": "husky install"` : ''}
@@ -84,24 +84,16 @@ export function writePackageJson(response: prompts.Answers<string>): void {
     "react-dom": "^18.2.0"${
       isStyle.tailwind
         ? `,
-        "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-menubar": "^1.0.4",
-    "@radix-ui/react-navigation-menu": "^1.1.4",
-    "@radix-ui/react-slot": "^1.0.2",
-    "@radix-ui/react-tabs": "^1.0.4",
-    "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
-    "lucide-react": "^0.363.0",
     "react-icons": "^5.0.1",
     "tailwind-merge": "^2.2.2",
     "tailwindcss-animate": "^1.0.7"`
         : ''
     }
   },
   "devDependencies": {
-    "@bedframe/cli": "0.0.78",
-    "@bedframe/core": "0.0.42",
+    "@bedframe/cli": "0.0.79",
+    "@bedframe/core": "0.0.43",
 ${
   changesets
     ? `"@changesets/cli": "^2.27.1",
@@ -198,7 +190,7 @@ ${
     },
     "ignorePatterns": [
       "dist",
-      "${projectName}@*",
+      ${browsers.includes('safari') && `"${projectName}-safari",`}
       "node_modules"${
         hasTests
           ? `,