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.

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

Update from upstream repo wix/react-templates #16

Open
wants to merge 49 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c3a6e46
Updated to React v15.1.0 (#143)
nippur72 Jul 6, 2016
46caeea
Fix #138, #139, #134, #144, #145, #147, #157, #158, #161, #162 (#142)
nippur72 Jul 6, 2016
a993ebf
Fix #167 --native CLI behaviour
nippur72 Jul 6, 2016
5dcc94d
Multiple --native-target-version in command line argument
nippur72 Jul 7, 2016
305d132
Emit code with different react-native versions
nippur72 Jul 7, 2016
bde2f67
Support for react native 0.29.0
nippur72 Jul 7, 2016
fb8d402
Test for react-native 0.29.0
nippur72 Jul 7, 2016
c801cb6
Do not discard non breaking space (fix #151)
nippur72 Jul 8, 2016
4559fdf
refactored test code eliminating repeating functions
nippur72 Jul 8, 2016
9b8d15a
Restrict attributes on rt-virtual (fix #152)
nippur72 Jul 8, 2016
d80de30
Forbid rt-repeat in root nodes (fix #171)
nippur72 Jul 8, 2016
6348e53
Added --normalize-html-whitespace CLI option
nippur72 Jul 8, 2016
720db6c
Test for --normalize-html-whitespace CLI option
nippur72 Jul 8, 2016
6c7d032
Updated CLI doc file
nippur72 Jul 8, 2016
36d69bd
Added rt-pre attribute to README.md
nippur72 Jul 8, 2016
a6be6ff
Type in README.md
nippur72 Jul 8, 2016
6af5715
Do not normalize whitespaces within { } expressions
nippur72 Jul 9, 2016
854293c
code formatting
nippur72 Jul 9, 2016
b3cc40e
Moved function "jsonText" to be local to "convertText"
nippur72 Jul 9, 2016
556633d
compare html with cheerio
Jul 21, 2016
fb3afc9
update dependencies
Jul 21, 2016
4a403df
Fix code generation for rt-template siblings. (#164)
marcusrbrown Jul 21, 2016
f086cd6
fix test
Jul 21, 2016
a993f8b
update dependencies
Sep 28, 2016
7d69fd0
ignore temp playground web site
Sep 28, 2016
364a3e3
0.5.3
Sep 28, 2016
b657cb7
remove console.log
Sep 28, 2016
a4962c5
0.5.4
Sep 28, 2016
079f5da
fix #191, allow use of 'class' in custom-elements
nippur72 Sep 6, 2016
dd2fbae
fix #190: allow kebab-case names containing more than one '-'
nippur72 Sep 5, 2016
8623963
implements #175, better rt-scope syntax parser
nippur72 Jul 30, 2016
f3fc45f
fixed broken html tests
nippur72 Aug 2, 2016
5c730e8
updated comment explaining the regex
nippur72 Aug 2, 2016
9dbff14
do not use _() in rt-class, fixes #179
nippur72 Aug 3, 2016
b252500
fix tests
Dec 29, 2016
5ccbfec
removed some trainling spaces in docs/cli.md
nippur72 Aug 12, 2016
12998d1
fix broken --react-import-path when path is different from "react"
nippur72 Aug 15, 2016
d853510
trim some trailing spaces
nippur72 Aug 15, 2016
b125af0
fix eslint error
Jan 1, 2017
07547fd
fix eslint issue and lock versions
Jan 1, 2017
b78c3ca
use babel-node to fix node 4 issues
Jan 2, 2017
3eb8df6
0.6.0
Jan 2, 2017
6c5ea9e
fixed issue with globing pattern, allow glob pattern
Jan 4, 2017
696aa2b
0.6.1
Jan 4, 2017
d47ef7e
PR #131
Jan 9, 2017
6797ad9
Fixed error in documentation example of rt-virtual
jkurambhatti Feb 9, 2017
8e14935
fix #222
Jun 29, 2017
ee4508a
no semi
Jun 29, 2017
747304f
move to master
Jun 29, 2017
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: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ playground/**/*.rt.js
playground/dist/**
playground/libs/**

playground2/**
playground3/**
playground3/dist/**
playground3/libs/**
playground3/**/*.rt.js
playground4

web/**

Expand Down
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": ["wix-editor", "wix-editor/node", "plugin:lodash/recommended"],
"plugins": ["lodash", "wix-editor"],
"rules": {
"semi": [2, "always"],
"semi": [2, "never"],
"func-style": [2, "declaration", {"allowArrowFunctions": true}],
"prefer-spread": 0,
"prefer-template": 0,
Expand All @@ -13,7 +13,7 @@


"lodash/prefer-filter": 0,

"lodash/chaining": [2, "always"],
"lodash/prefer-map": 0,
"lodash/path-style": 0,
"lodash/no-extra-args": 2,
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ npm-debug.log
### Test Output ###
test/data/**/*.rt.actual.js
test/data/**/*.code.js
test/data/**/*.actual.html

44 changes: 22 additions & 22 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'use strict';
'use strict'
module.exports = function (grunt) {
grunt.initConfig({
clean: {
Expand Down Expand Up @@ -88,33 +88,33 @@ module.exports = function (grunt) {
options: readConfig('./playground.config.js')
}
}
});
})

function readConfig(file) {
return eval(require('fs').readFileSync(file).toString()); // eslint-disable-line no-eval
return eval(require('fs').readFileSync(file).toString()) // eslint-disable-line no-eval
}

grunt.loadNpmTasks('grunt-tape');
grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-requirejs');
grunt.loadNpmTasks('grunt-eslint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-tape')
grunt.loadNpmTasks('grunt-browserify')
grunt.loadNpmTasks('grunt-contrib-watch')
grunt.loadNpmTasks('grunt-contrib-requirejs')
grunt.loadNpmTasks('grunt-eslint')
grunt.loadNpmTasks('grunt-contrib-uglify')

grunt.registerTask('default', ['eslint:all']);
grunt.registerTask('lint', ['eslint:all']);
grunt.registerTask('test', ['tape']);
grunt.registerTask('default', ['eslint:all'])
grunt.registerTask('lint', ['eslint:all'])
grunt.registerTask('test', ['tape'])

grunt.registerTask('rt', () => {
const reactTemplates = require('./src/cli');
const files = grunt.file.expand('playground/*.rt');
const ret = reactTemplates.execute({modules: 'amd', force: true, _: files});
return ret === 0;
});
const reactTemplates = require('./src/cli')
const files = grunt.file.expand('playground/*.rt')
const ret = reactTemplates.execute({modules: 'amd', force: true, _: files})
return ret === 0
})

grunt.registerTask('build', ['rt', 'browserify:pg']);
grunt.registerTask('home', ['rt', 'browserify:home']);
grunt.registerTask('pgall', ['rt', 'browserify', 'uglify', 'requirejs']);
grunt.registerTask('build', ['rt', 'browserify:pg'])
grunt.registerTask('home', ['rt', 'browserify:home'])
grunt.registerTask('pgall', ['rt', 'browserify', 'uglify', 'requirejs'])

grunt.registerTask('all', ['default', 'test']);
};
grunt.registerTask('all', ['default', 'test'])
}
Loading