diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 31e2b43..0000000 --- a/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -index.html -diff merge=ours -spec.js -diff merge=ours -spec.css -diff merge=ours diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 0106f82..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Deploy spec - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: '12.x' - - run: npm install - - run: npm run build - - name: commit changes - uses: elstudio/actions-js-build/commit@v3 - with: - commitMessage: "fixup: [spec] `npm run build`" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..b749c4f --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,28 @@ +name: Build and Deploy to GitHub Pages +on: + push: + branches: + - master +jobs: + build-and-deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout 🛎️ + uses: actions/checkout@v2 + with: + persist-credentials: false + + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: '14.x' + + - name: Install and Build 🔧 + run: | + npm install + npm run build + - name: Deploy 🚀 + uses: peaceiris/actions-gh-pages@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./out diff --git a/.gitignore b/.gitignore index 1c8cdd1..d0ab8a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Output directory +/out + # Logs logs *.log diff --git a/README.md b/README.md index dd88f02..6fe5372 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,14 @@ A repository template for ECMAScript proposals. Please ensure the following: 1. You have read the [process document](https://tc39.github.io/process-document/) - 1. You have reviewed the [existing proposals](https://github.com/tc39/proposals/) + 1. You have reviewed the [existing proposals](https://github.com/tc39/proposals) 1. You are aware that your proposal requires being a member of TC39, or locating a TC39 delegate to "champion" your proposal ## Create your proposal repo Follow these steps: 1. Click the green ["use this template"](https://github.com/tc39/template-for-proposals/generate) button in the repo header. (Note: Do not fork this repo in GitHub's web interface, as that will later prevent transfer into the TC39 organization) - 1. Go to your repo settings “Options” page, under “GitHub Pages”, and set the source to the **master branch** (and click Save, if it does not autosave this setting) + 1. Go to your repo settings “Options” page, under “GitHub Pages”, and set the source to the **`gh-pages` branch** (and click Save, if it does not autosave this setting) 1. check "Enforce HTTPS" 1. On "Options", under "Features", Ensure "Issues" is checked, and disable "Wiki", and "Projects" (unless you intend to use Projects) 1. Under "Merge button", check "automatically delete head branches" @@ -56,5 +56,5 @@ Follow these steps: 1. Make your changes to `spec.emu` (ecmarkup uses HTML syntax, but is not HTML, so I strongly suggest not naming it ".html") 1. Any commit that makes meaningful changes to the spec, should run `npm run build` and commit the resulting output. 1. Whenever you update `ecmarkup`, run `npm run build` and commit any changes that come from that dependency. - - [explainer]: https://github.com/tc39/how-we-work/blob/master/explainer.md + +[explainer]: https://github.com/tc39/how-we-work/blob/master/explainer.md diff --git a/index.html b/index.html deleted file mode 100644 index c9c0329..0000000 --- a/index.html +++ /dev/null @@ -1,1844 +0,0 @@ - - - - - -Proposal Title Goes Here

Stage -1 Draft / April 15, 2020

Proposal Title Goes Here

- - -

1 This is an emu-clause

-

This is an algorithm:

-
  1. Let proposal be undefined.
  2. If IsAccepted(proposal),
    1. Let stage be 0.
  3. Else,
    1. Let stage be -1.
  4. Return ? ToString(proposal). -
- -

A Copyright & Software License

- -

Copyright Notice

-

© 2020 Your Name(s) Here

- -

Software License

-

All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

- -

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

- -
    -
  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    2. -
  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
    3. -
  3. Neither the name of the authors nor Ecma International may be used to endorse or promote products derived from this software without specific prior written permission.
    4. -
- -

THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- - -
\ No newline at end of file diff --git a/package.json b/package.json index 8f0d59e..351a4ee 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "A repository template for ECMAScript proposals.", "scripts": { "start": "npm run build -- --watch", - "build": "ecmarkup spec.emu index.html" + "prebuild": "mkdir out || exit 0", + "build": "ecmarkup --verbose spec.emu out/index.html --css out/ecmarkup.css --js out/ecmarkup.js" }, "homepage": "https://github.com/tc39/template-for-proposals#readme", "repository": { @@ -13,6 +14,6 @@ }, "license": "MIT", "devDependencies": { - "ecmarkup": "^3.19.1" + "ecmarkup": "^3.25.1" } } diff --git a/spec.emu b/spec.emu index 81dfaca..4d7cc0c 100644 --- a/spec.emu +++ b/spec.emu @@ -1,8 +1,8 @@ - + - + 
 title: Proposal Title Goes Here
 stage: -1