Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Setup babel #614

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open

Setup babel #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b71d89d
rebase
jywarren Oct 13, 2020
6aad6fc
update dependencies
Shulammite-Aso Sep 13, 2020
0eb2000
update build script
Shulammite-Aso Sep 13, 2020
91faf09
update travis config
Shulammite-Aso Sep 14, 2020
2995436
update travis config
Shulammite-Aso Sep 14, 2020
7972d80
update travis config
Shulammite-Aso Sep 14, 2020
bf98f7e
Update package.json
jywarren Sep 15, 2020
ce0f31d
Update .travis.yml
jywarren Sep 15, 2020
3a7cb8c
Update .babelrc
jywarren Sep 15, 2020
41bc989
revert/remove "sourceType": "script"
jywarren Sep 17, 2020
2391707
bump resig-class to v2.0.0
jywarren Sep 17, 2020
ea0c3a3
new package-lock.json
jywarren Sep 17, 2020
66b3255
add "sourceType": "script" again
jywarren Sep 17, 2020
333b782
['@babel/preset-env', { targets: { node: 'current' } }],
jywarren Sep 17, 2020
a49037f
oops, add "presets":
jywarren Sep 17, 2020
aa4e8eb
Update .babelrc
jywarren Sep 17, 2020
b4e8518
Update .babelrc
jywarren Sep 17, 2020
c62fce0
update .babel
Shulammite-Aso Sep 21, 2020
e1f661b
gitpod dockerfile for puppeteer
jywarren Oct 13, 2020
458d4ec
built dist
jywarren Oct 13, 2020
7a2a4fb
puppeteer changes from https://github.com/puppeteer/puppeteer/blob/ma…
jywarren Oct 13, 2020
da79123
add lots of puppeteer stuff to Dockerfile
jywarren Oct 13, 2020
a9f13c9
removing the puppeteer stuff
jywarren Oct 13, 2020
a71bf41
working in-browser Jasmine tests at /tests.html
jywarren Oct 14, 2020
88271c6
all jasmine tests in browser
jywarren Oct 14, 2020
bf4b5c1
switch to grunt-contrib-jasmine v2 for headless chrome instead of pha…
jywarren Oct 14, 2020
bedfc0c
refactor button test into jest
jywarren Oct 14, 2020
23c62aa
split into jobs in travis
jywarren Oct 14, 2020
3902111
fix for new jest test
jywarren Oct 14, 2020
c2c363b
custom insert jest test fix
jywarren Oct 14, 2020
f730a88
more jest fixes
jywarren Oct 14, 2020
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
13 changes: 13 additions & 0 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"presets": [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trying babel.config.json instead of .babelrc in #639

["@babel/preset-env", {
"targets": {
"node": "current"
}
}]
],
"overrides": [{
"test": "./dist/PublicLab.Editor.js",
"sourceType": "script"
}]
}
2 changes: 1 addition & 1 deletion .gitpod.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ FROM gitpod/workspace-full

USER gitpod

RUN bash -c ". ~/.nvm/nvm-lazy.sh && npm install -g gulp-cli live-server"
RUN bash -c ". ~/.nvm/nvm-lazy.sh && npm install -g gulp-cli live-server"
12 changes: 8 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ language: node_js
node_js:
- '10'
- '12'
services: xvfb
before_install:
- npm install -g grunt-cli
before_script:
- grunt build
script:
- grunt jasmine --force
- npm run test-ui
- npm run build
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm going ot try this as a before_script so we are sure it's done before it tries the tests.

jobs:
include:
- name: "Jasmine tests"
script: grunt jasmine --force
- name: "Jest tests"
script: npm run test-ui
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = function(grunt) {

jasmine: {
publiclabeditor: {
src: 'dist/*.js',
src: 'dist/PublicLab.Editor.js',
options: {
specs: 'spec/javascripts/*spec.js',
vendor: [
Expand Down
Loading