Skip to content

Commit

Permalink
Merge branch 'develop' into fix_newDate
Browse files Browse the repository at this point in the history
  • Loading branch information
alsundukov committed Jun 9, 2023
2 parents 82f66ed + 27848e7 commit e3b424e
Show file tree
Hide file tree
Showing 311 changed files with 98,450 additions and 45,660 deletions.
29 changes: 0 additions & 29 deletions .codeclimate.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
env:
node: true
es6: true
extends: 'eslint:recommended'
globals:
alasql: writable
Expand All @@ -8,6 +9,8 @@ overrides:
- files: 'test/**'
env:
mocha: true
parserOptions:
ecmaVersion: 2022
rules:
accessor-pairs: error
array-bracket-newline: error
Expand Down
26 changes: 15 additions & 11 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,26 @@
Got questions? [Tag a Stack Overflow question](http://stackoverflow.com/questions/ask?tags=AlaSQL) with `alasql`.


Inputs to improvement? [Open an issue](https://github.com/agershun/alasql/issues/new).
Inputs to improvement? [Open an issue](https://github.com/alasql/alasql/issues/new).


**All contributions are much welcome and greatly appreciated(!)**

- Fork the repo here on Github
- Clone your forked repo and install dependencies `git clone https://github.com/MYUSERNAME/alasql/ && cd alasql && npm install`
- Please work with the code from the develop branch `git checkout develop`
- Add a test for the issue: Copy `test/test000.js` and replace `000` with a new number.
- Impelement a test that reflects the issue.
- Run `npm test` to verify only the new test fails
- Make sure you have git, Node and yarn installed (`npm install -g yarn`)
- Fork the repo here on Github (button top right)
- Clone your forked repo and install dependencies `git clone https://github.com/MYUSERNAME/alasql/ --depth 1 && cd alasql && yarn`
- Make sure you work with the develop branch `git checkout develop`
- Run tests to verify all is good `yarn test`
- Implement a test that reflects the issue.
- Add a new test file for the issue: Copy `test/test000.js` and replace `000` with a new number. Preferably the number of the issue you are solving.
- Run `yarn test` to verify only the new test fails
- Implement your contributions in `src/`
- Run `npm test` and verify all tests are OK
- Run `yarn test` and verify all tests are OK
- Format the souce with `yarn format`
- Commit changes to git and push to your forked repo
- Click "Create Pull-request" when looking at your forked repo on Github

_Please note that `npm test` will compile from `src/` before running tests_


Please note that
- `npm test` will compile from `src/` and overwrite `dist/` before running all tests
- If you would like to change the alasql.org website please make a PR to https://github.com/alasql/alasql-org
- To help debug a problem you can see some advice on https://github.com/AlaSQL/alasql/issues/1415#issuecomment-1293335079
8 changes: 0 additions & 8 deletions .github/dependabot.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@
"automerge": true,
"automergeStrategy": "squash",
"dependencyDashboard": true,
"schedule": ["every weekend"],
"ignorePaths": ["modules/**"]

}
65 changes: 65 additions & 0 deletions .github/workflows/Build and test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: "CICD pipeline"

on:
push:
branches: '*'
pull_request:
branches: '*'

jobs:
Build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Bulid from src
uses: actions/setup-node@v3
with:
node-version: "latest"
- run: yarn install --frozen-lockfile
- run: npx gulp
- uses: actions/upload-artifact@master
with:
name: dist
path: dist/
- run: tar -cvf node_modules.tar node_modules
- uses: actions/upload-artifact@master
with:
name: node_modules
path: node_modules.tar

test_node:
needs: Build
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [15.x, 16.x, 17.x, 18.x, 19.x, latest]
steps:
- uses: actions/checkout@v3
- name: Run prod version with Node v${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- uses: actions/download-artifact@master
with:
name: dist
path: dist/
- uses: actions/download-artifact@master
with:
name: node_modules
path: ./
- run: tar -xvf node_modules.tar
- run: yarn test-only

test_browser:
needs: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@master
with:
name: dist
path: dist/
- run: echo '::warning ::Not able to automate browser tests yet'
- run: '# yarn test-browser-ci'


29 changes: 0 additions & 29 deletions .github/workflows/nodejs.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ test/test251.xlsx
*.log
yarn-error.log
package-lock.json
dist/
/dist/
pnpm-lock.yaml
3 changes: 0 additions & 3 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"browser" : true, // Standard browser globals e.g. `window`, `document`.
"node" : true,
"wsh" : true, // Windows Scripting Host.
"jquery" : true,
"mocha" : true,
"node" : true,
"worker" : true,

"predef" : [ // Custom globals.
Expand Down Expand Up @@ -68,7 +66,6 @@
"curly" : true, // Require {} for every new block or scope.
"eqeqeq" : true, // Require triple equals i.e. `===`.
"eqnull" : false, // Tolerate use of `== null`.
"evil" : true, // Tolerate use of `eval`.
"expr" : false, // Tolerate `ExpressionStatement` as Programs.
"forin" : false, // Tolerate `for in` loops without `hasOwnPrototype`.
"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
Expand Down
20 changes: 2 additions & 18 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,9 @@
console/
examples/
lib/
partners/
test/
src/
*.md
.codeclimate.yml
.gitattributes
.gitignore
.jshintrc
bower.json
gulpfile.js
inch.json
utils/
.npmignore
.travis.yml
.versions
.eslintrc.yml
.prettierignore
.prettierrc
yarn.lock
tslint.json
.husky
.github
.*
*.log
4 changes: 3 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ src/99worker-start.js

src/alasqlparser.js

src/97saveas.js
src/97saveas.js

modules/
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ useTabs: true
bracketSpacing: false
trailingComma: es5
singleQuote: true
arrowParens: "avoid"
28 changes: 15 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
# How to Contribute to the AlaSQL project
# How to Contribute to AlaSQL

Thank you very much for your interest! AlaSQL project still has a lot of thing to be improved, and your help is very appreciated!
Thank you very much for your interest! AlaSQL has a lot of thing to be improved, and your help is very appreciated!

For you to edit the source please do the following:
For you to submit a pull request:

- Make sure you have Node, npm and git installed
- Make sure you have git, Node and yarn installed (`npm install -g yarn`)
- Fork the repo here on Github (button top right)
- Clone your forked repo and install dependencies `git clone https://github.com/MYUSERNAME/alasql/ --depth 1 && cd alasql && npm install`
- Clone your forked repo and install dependencies `git clone https://github.com/MYUSERNAME/alasql/ --depth 1 && cd alasql && yarn`
- Make sure you work with the develop branch `git checkout develop`
- Install dependencies with `npm install` 
- Run tests to verify all is good `npm test`
- Add a test for the issue you have: Copy `test/test000.js` and replace `000` with a new number.
- Make sure you got dependencies installed `yarn`
- Run tests to verify all is good `yarn test`
- Implement a test that reflects the issue.
- Run `npm test` to verify only the new test fails
- Add a new test file for the issue: Copy `test/test000.js` and replace `000` with a new number. Preferably the number of the issue you are solving.
- Run `yarn test` to verify only the new test fails
- Implement your contributions in `src/`
- Run `npm test` and verify all tests are OK
- Run `yarn test` and verify all tests are OK
- Format the souce with `yarn format`
- Commit changes to git and push to your forked repo
- Click "Create Pull-request" when looking at your forked repo on Github

_Please note that `npm test` will compile from `src/` and overwrite `dist/` before running all tests_

If you would like to change the alasql.org website please make a PR to https://github.com/agershun/alasql-org
Please note that
- `yarn test` will compile from `src/` and overwrite `dist/` before running tests
- If you would like to change the alasql.org website please make a PR to https://github.com/alasql/alasql-org
- To help debug a problem you can see some advice on https://github.com/AlaSQL/alasql/issues/1415#issuecomment-1293335079

Loading

0 comments on commit e3b424e

Please sign in to comment.