Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 24
- name: Build JS bundle
run: npm install
- name: Build site
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 24
- name: Install dependencies
run: npm install
- name: Lints
Expand Down
69 changes: 61 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,72 @@ on: [pull_request, push]

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Chrome
run: sudo apt update && sudo apt install -y google-chrome-stable
- run: /usr/bin/google-chrome-stable --version
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20

- name: Cache node modules
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Install dependencies
run: npm install
- uses: jamesmortensen/chromedriver-matcher-action@v1
- name: Tests
run: npm test

- name: Setup Chrome
run: |
# Update package lists
sudo apt-get update

# Install Chrome stable
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
sudo apt-get update
sudo apt-get install -y google-chrome-stable

# Verify installation
google-chrome --version

# Install ChromeDriver using Chrome for Testing API (for Chrome 115+)
CHROME_VERSION=$(google-chrome --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+')
echo "Chrome version: $CHROME_VERSION"

# Use the new Chrome for Testing API for versions 115+
CHROMEDRIVER_URL="https://storage.googleapis.com/chrome-for-testing-public/${CHROME_VERSION}/linux64/chromedriver-linux64.zip"
echo "Downloading ChromeDriver from: $CHROMEDRIVER_URL"

wget -O /tmp/chromedriver.zip "$CHROMEDRIVER_URL" || {
echo "Failed to download from Chrome for Testing, trying fallback..."
# Fallback to latest stable if specific version fails
LATEST_VERSION=$(curl -s "https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json" | grep -o '"version":"[^"]*' | head -1 | cut -d'"' -f4)
wget -O /tmp/chromedriver.zip "https://storage.googleapis.com/chrome-for-testing-public/${LATEST_VERSION}/linux64/chromedriver-linux64.zip"
}

sudo unzip /tmp/chromedriver.zip -d /tmp/
sudo mv /tmp/chromedriver-linux64/chromedriver /usr/local/bin/
sudo chmod +x /usr/local/bin/chromedriver
chromedriver --version

- name: Setup display for headless testing
run: |
export DISPLAY=:99
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &

- name: Build project
run: npm run build

- name: Run tests
run: npm run test:ci
env:
CI: true
DISPLAY: :99
NODE_ENV: test
61 changes: 43 additions & 18 deletions docs/demos/1-simple/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -745,26 +745,51 @@ <h2>Simple</h2>
</tbody>
</table>

<script src="../dist/umd.js"></script>
<script type="module">
import {DataTable} from "../dist/module.js"
window.dt = new DataTable("#demo-table", {
perPageSelect: [5, 10, 15, ["All", -1]],
columns: [
{
select: 2,
sortSequence: ["desc", "asc"]
},
{
select: 3,
sortSequence: ["desc"]
},
{
select: 4,
cellClass: "green",
headerClass: "red"
(async () => {
try {
let DataTable

// Try ES module import first
try {
const module = await import("../dist/module.js")
DataTable = module.DataTable
} catch (moduleError) {
console.log("ES module import failed, falling back to UMD:", moduleError)
// Fallback to UMD
if (window.simpleDatatables && window.simpleDatatables.DataTable) {
DataTable = window.simpleDatatables.DataTable
} else {
throw new Error("DataTable not available in either ES module or UMD")
}
}
]
})

window.dt = new DataTable("#demo-table", {
perPageSelect: [5, 10, 15, ["All", -1]],
columns: [
{
select: 2,
sortSequence: ["desc", "asc"]
},
{
select: 3,
sortSequence: ["desc"]
},
{
select: 4,
cellClass: "green",
headerClass: "red"
}
]
})

console.log("DataTable initialized successfully")
} catch (error) {
console.error("Error initializing DataTable:", error)
window.lastError = error.message
}
})()
</script>
</body>
</html>
13 changes: 7 additions & 6 deletions docs/demos/11-export/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -786,33 +786,34 @@ <h2>Export</h2>
}
return str
}
const table = new DataTable("#demo-table")
const dataTable = new DataTable("#demo-table")
window.dataTable = dataTable
document.getElementById("export-csv").addEventListener("click", () => {
exportCSV(table, {
exportCSV(dataTable, {
download: true,
lineDelimiter: "\n",
columnDelimiter: ";"
})
})
document.getElementById("export-sql").addEventListener("click", () => {
exportSQL(table, {
exportSQL(dataTable, {
download: true,
tableName: "export_table"
})
})
document.getElementById("export-txt").addEventListener("click", () => {
exportTXT(table, {
exportTXT(dataTable, {
download: true
})
})
document.getElementById("export-json").addEventListener("click", () => {
exportJSON(table, {
exportJSON(dataTable, {
download: true,
space: 3
})
})
document.getElementById("export-custom").addEventListener("click", () => {
exportCustomCSV(table, {
exportCustomCSV(dataTable, {
download: true
})
})
Expand Down
Loading
Loading