Merge remote-tracking branch 'upstream/main'

OpenSourceRaidGuild · Dec 28, 2023 · 3c6e01b · 3c6e01b
2 parents c75dfd1 + 8abca4b
commit 3c6e01b
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -44,8 +44,8 @@ jobs:
     runs-on: ubuntu-latest
     if:
       ${{ github.repository == 'OpenSourceRaidGuild/babel-vite' &&
-      contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha',
-      github.ref) && github.event_name == 'push' }}
+      contains('refs/heads/main,refs/heads/beta,refs/heads/next,refs/heads/alpha', github.ref) &&
+      github.event_name == 'push' }}
     steps:
       - name: 🛑 Cancel Previous Runs
         uses: styfle/[email protected]

diff --git a/.npmrc b/.npmrc
@@ -1,2 +1,3 @@
 package-lock=false
 legacy-peer-deps=true
+workspaces-update=false
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "format": "kcd-scripts format"
   },
   "devDependencies": {
-    "kcd-scripts": "^13.0.0",
+    "kcd-scripts": "^14.0.1",
     "multi-semantic-release": "^3.0.1",
     "npm-run-all": "^4.1.5",
     "typescript": "^5.0.3"

diff --git a/packages/babel-plugin-transform-vite-meta-env/package.json b/packages/babel-plugin-transform-vite-meta-env/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.13.8",
     "@types/babel-plugin-tester": "^9.0.1",
     "babel-plugin-tester": "^10.0.0",
-    "kcd-scripts": "^13.0.0",
+    "kcd-scripts": "^14.0.1",
     "typescript": "^5.0.3"
   },
   "dependencies": {

diff --git a/packages/babel-plugin-transform-vite-meta-glob/package.json b/packages/babel-plugin-transform-vite-meta-glob/package.json
@@ -36,12 +36,12 @@
     "@types/babel-plugin-tester": "^9.0.1",
     "@types/glob": "^8.0.1",
     "babel-plugin-tester": "^10.0.0",
-    "kcd-scripts": "^13.0.0",
+    "kcd-scripts": "^14.0.1",
     "typescript": "^5.0.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.13.9",
     "@types/babel__core": "^7.1.12",
-    "glob": "^8.0.1"
+    "glob": "^10.3.10"
   }
 }
diff --git a/packages/babel-plugin-transform-vite-meta-glob/src/index.ts b/packages/babel-plugin-transform-vite-meta-glob/src/index.ts
@@ -1,6 +1,6 @@
 import nodePath from 'path'
 import type babelCore from '@babel/core'
-import glob from 'glob'
+import { globSync } from 'glob'
 
 export default function viteMetaGlobBabelPlugin({
   types: t
@@ -42,7 +42,7 @@ export default function viteMetaGlobBabelPlugin({
           t.isStringLiteral(args[0])
         ) {
           const cwd = nodePath.dirname(sourceFile)
-          const globPaths = glob.sync(args[0].value, { cwd })
+          const globPaths = globSync(args[0].value, { cwd, dotRelative: true }).sort()
 
           const replacement = t.objectExpression(
             globPaths.map((globPath) =>
@@ -85,7 +85,7 @@ export default function viteMetaGlobBabelPlugin({
           t.isBooleanLiteral(eagerOption[0].value)
         ) {
           const cwd = nodePath.dirname(sourceFile)
-          const globPaths = glob.sync(args[0].value, { cwd })
+          const globPaths = globSync(args[0].value, { cwd, dotRelative: true }).sort()
 
           if (eagerOption[0].value.value) {
             const identifiers = globPaths.map((_, idx) => t.identifier(`__glob__0_${idx}`))

diff --git a/packages/babel-plugin-transform-vite-meta-hot/package.json b/packages/babel-plugin-transform-vite-meta-hot/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.13.8",
     "@types/babel-plugin-tester": "^9.0.1",
     "babel-plugin-tester": "^10.0.0",
-    "kcd-scripts": "^13.0.0",
+    "kcd-scripts": "^14.0.1",
     "typescript": "^5.0.3"
   },
   "dependencies": {

diff --git a/packages/babel-preset-vite/package.json b/packages/babel-preset-vite/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.13.8",
     "@types/babel-plugin-tester": "^9.0.1",
     "babel-plugin-tester": "^10.0.0",
-    "kcd-scripts": "^13.0.0",
+    "kcd-scripts": "^14.0.1",
     "typescript": "^5.0.3"
   },
   "dependencies": {

diff --git a/packages/babel-preset-vite/src/__tests__/__snapshots__/index.ts.snap b/packages/babel-preset-vite/src/__tests__/__snapshots__/index.ts.snap
@@ -14,10 +14,10 @@ export const hot = import.meta.hot
 
 export const envVar = process.env.VITE_VAR
 export const modules = {
-  'files/file1.ts': () => import('files/file1.ts')
+  './files/file1.ts': () => import('./files/file1.ts')
 }
 export const eagerModules = {
-  'files/file1.ts': require('files/file1.ts')
+  './files/file1.ts': require('./files/file1.ts')
 }
 export const hot = module.hot
 
@@ -38,10 +38,10 @@ export const hot = import.meta.hot
 
 export const envVar = process.env.VITE_VAR
 export const modules = {
-  'files/file1.ts': () => import('files/file1.ts')
+  './files/file1.ts': () => import('./files/file1.ts')
 }
 export const eagerModules = {
-  'files/file1.ts': require('files/file1.ts')
+  './files/file1.ts': require('./files/file1.ts')
 }
 export const hot = module.hot
 
@@ -82,10 +82,10 @@ export const hot = import.meta.hot
 
 export const envVar = import.meta.env.VITE_VAR
 export const modules = {
-  'files/file1.ts': () => import('files/file1.ts')
+  './files/file1.ts': () => import('./files/file1.ts')
 }
 export const eagerModules = {
-  'files/file1.ts': require('files/file1.ts')
+  './files/file1.ts': require('./files/file1.ts')
 }
 export const hot = import.meta.hot