Skip to content

Commit

Permalink
fix glob import
Browse files Browse the repository at this point in the history
  • Loading branch information
dskvr committed Dec 17, 2024
1 parent 92f2d24 commit 48ee354
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
with:
version: 9

- name: Install Dependencies
- name: Install
run: pnpm install --frozen-lockfile

- name: Build All Packages
run: pnpm -r run build
# - name: Build All Packages
# run: pnpm -r run build

- name: Upload Build Artifacts
uses: actions/upload-artifact@v4
Expand Down
4 changes: 3 additions & 1 deletion internal/logger/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import nodeResolve from '@rollup/plugin-node-resolve';
import json from '@rollup/plugin-json';
import { importMetaAssets } from '@web/rollup-plugin-import-meta-assets';

import * as glob from 'glob';
import { createRequire } from 'module';
const require = createRequire(import.meta.url);
const glob = require('glob');

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
Expand Down
5 changes: 3 additions & 2 deletions internal/utils/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import terser from '@rollup/plugin-terser';
import livereload from 'rollup-plugin-livereload';
import nodePolyfills from 'rollup-plugin-polyfill-node';
import nodeResolve from '@rollup/plugin-node-resolve';

import * as glob from 'glob';
import { createRequire } from 'module';
const require = createRequire(import.meta.url);
const glob = require('glob');import * as glob from 'glob';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
Expand Down
3 changes: 2 additions & 1 deletion libraries/nip66/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
"nostr-tools": "2.7.2",
"p-queue": "8.0.1",
"queue": "7.0.0",
"tseep": "^1.3.1"
"tseep": "^1.3.1",
"tslib": "^2.7.0"
},
"devDependencies": {
"@rollup/plugin-alias": "5.1.1",
Expand Down
9 changes: 7 additions & 2 deletions libraries/nip66/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ import livereload from 'rollup-plugin-livereload'
import webWorkerLoader from 'rollup-plugin-web-worker-loader'
import nodePolyfills from 'rollup-plugin-node-polyfills'
import offMainThread from '@surma/rollup-plugin-off-main-thread'
// import copy from 'rollup-plugin-copy';


import { createRequire } from 'module';
const require = createRequire(import.meta.url);
const glob = require('glob');


/**
* disallow circular deps
Expand All @@ -33,7 +38,7 @@ function onwarn(warning, warn) {
warn(warning);
}

import * as glob from 'glob'


const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
Expand Down
2 changes: 1 addition & 1 deletion libraries/nip66/tsconfig.server.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.base.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "dist/server",
"module": "CommonJS",
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 48ee354

Please sign in to comment.