.eslintignore

@@ -14,3 +14,4 @@ spec/jasmine
 docs/src/js/dox-api@tradeshift.com/search/lunr.js
 docs/tasks/prism.js
 src/runtime/js/ts.ui/core/core-gui@tradeshift.com/dependencies/fastclick.js
+edbml/tasks/things/compiler.js

.eslintrc.json

@@ -1,7 +1,8 @@
 {
-	"parser": "babel-eslint",
+	"parser": "@babel/eslint-parser",
 	"parserOptions": {
-		"ecmaVersion": 5
+		"ecmaVersion": 5,
+		"requireConfigFile": false
 	},
 	"extends": "tradeshift",
 	"root": true,

.github/CODEOWNERS

@@ -1 +1 @@
-*		@Tradeshift/TradeshiftUI
+*		@Tradeshift/TradeshiftUI @tradeshift/ci-workers 

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: /
+    rebase-strategy: auto
+    schedule:
+      interval: weekly
+  - package-ecosystem: npm
+    directory: /docs
+    schedule:
+      interval: daily
+    registries:
+      - npm-tradeshift
+registries:
+  npm-tradeshift:
+    type: npm-registry
+    url: https://npm.pkg.github.com
+    token: ${{secrets.NPM_READ_TOKEN}}

.github/workflows/deploy-to-s3.yml

@@ -0,0 +1,30 @@
+name: Deploy to S3
+
+on: workflow_dispatch
+
+jobs:
+  deploy:
+    name: Build and deploy to s3
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v2
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18
+          cache: 'npm'
+
+      - name: 📥  Download deps
+        run: npm ci
+
+      - name: ▶️ Build
+        run: npm run build
+
+      - name: ▶️ Deploy to s3
+        run: npm run deploy-s3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.S3_CHROME_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_CHROME_SECRET_ACCESS_KEY }}

.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: Test & release
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - v11
+
+jobs:
+  validate:
+    name: Build and test
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v2
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ github.ref == 'refs/heads/v11' && 8 || 18 }}
+          cache: 'npm'
+
+      - name: 📥 Download deps
+        run: npm ci
+
+      - name: ▶️ Run tests
+        run: npm test
+        env:
+          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USER }}
+          BROWSERSTACK_KEY: ${{ secrets.BROWSERSTACK_KEY }}

.nvmrc

@@ -1 +1 @@
-8
+18.20.3

Gruntfile.js

@@ -1,4 +1,3 @@
-/* global process */
 const path = require('path');
 const { Locale } = require('@tradeshift/g11n-langneg');
 
@@ -11,6 +10,13 @@ module.exports = function(grunt) {
 	// load grunt tasks
 	require('load-grunt-tasks')(grunt);
 
+	// import edbml tasks
+	require('load-grunt-config')(grunt, {
+		jitGrunt: {
+			customTasksDir: 'edbml/tasks'
+		}
+	});
+
 	// default file encoding
 	grunt.file.defaultEncoding = 'utf8';
 
@@ -452,20 +458,10 @@ module.exports = function(grunt) {
 			}
 		},
 
-		asciify: {
-			banner: {
-				text: 'Tradeshift UI',
-				options: {
-					font: 'graffiti',
-					log: true
-				}
-			}
-		},
-
 		// serve, watch, generate concurrently
 		concurrent: {
 			docs: ['connect', 'watch', 'exec:docs_grunt'],
-			nodocs: ['connect', 'watch', 'asciify:banner'],
+			nodocs: ['connect', 'watch'],
 			// Build for CDN
 			cdn_generate_js: {
 				tasks: generateJsConcurrent('cdn')
@@ -534,7 +530,7 @@ module.exports = function(grunt) {
 	}
 
 	function compileAndMinifyLess(target = 'cdn') {
-		let out = [
+		const out = [
 			'exec:compile_less_to_css' // less -> css
 		];
 		if (target === 'cdn') {
@@ -549,7 +545,7 @@ module.exports = function(grunt) {
 	}
 
 	function build(target = 'cdn') {
-		let out = [
+		const out = [
 			`clean:${target}`, // remove files
 			'browserify', // transpiles commonjs-based dependencies into files readable by browsers
 			'concat:locales', // bundle locale files (synchronously BEFORE moment.js)
@@ -572,7 +568,7 @@ module.exports = function(grunt) {
 	}
 
 	function sizeReport(target = 'cdn') {
-		let out = [];
+		const out = [];
 		if (target === 'cdn') {
 			out.push('size_report:cdn_gzip_vs_normal');
 			out.push(`size_report:cdn_loaded`);
@@ -722,8 +718,7 @@ module.exports = function(grunt) {
 	function getlocalesprocessor(codes) {
 		return (src, file) => {
 			const code = file.match(/ts-lang-(.*)\.js/)[1];
-			let locale;
-
+			let locale = '';
 			try {
 				locale = Locale.parseStrict(code);
 			} catch (e) {

README.md

@@ -15,9 +15,11 @@ If you'd like to submit a feature request or report a bug, go to our [issues pag
 1. Clone this repository
 1. Install [NodeJS](https://nodejs.org/), either LTS or current.
 1. Install the Grunt Command Line Utility globally.
-   - `npm install -g grunt-cli`
+    - `npm install -g grunt-cli`
+1. Use the configured version of node
+    - `nvm use`
 1. Install the dependencies of this project.
-   - `npm install`
+    - `npm install`
 
 ## Usage (Local Development)
 
@@ -31,6 +33,10 @@ If you'd like to submit a feature request or report a bug, go to our [issues pag
 1. Run `grunt dev` (instead of just `grunt`) and the documentantion website will open up on [`http://localhost:10114/`](http://localhost:10114/)
 1. Whenever you modify the source files, the script will rebuild the documentation so you're always using the latest version.
 
+### Maintaining the v11 branch
+
+Check out the `v11` branch and create pull requests on that branch. Releasing: see [v11 instructions](/Tradeshift/tradeshift-ui/tree/v11#release--deployment).
+
 ## Git Hooks
 
 Watch out, whenever you create a commit, the pre-commit hook will lint all staged files and it might commit all changes in each staged file, not just the staged lines.
@@ -41,15 +47,40 @@ Our docs site is hosted by GitHub Pages at https://ui.tradeshift.com.
 
 ## Release & Deployment
 
-Make sure you are logged in to `npm` and you have the following environment variables set:
+### Manual Release:
+
+1. **Check out a feature branch**. Name it anything. The `master` branch is protected from being pushed to directly, and your code will get released to S3 but not to git/GitHub/npm.
+2. **`npm version ${increment || 'patch'}`**; Bumps the version in `package.json` and `package-lock.json`, and creates a commit and a tag for you. Examples: `npm version 12.8.4`, `npm version patch`, [see docs](https://docs.npmjs.com/cli/v8/commands/npm-version).
+3. **`nvm use`** (use the specified node and npm version)
+4. **`npm i`**
+5. **`npm run build`**
+6. **`npm run package-dist`**. That creates a `package.json` for the npm dist package.
+7. **`git push origin {branch}`**; pushes the newly created commit. Don't use a fork.
+8. **`git push origin {the new tag just created}`**. Example: `git push origin v12.8.4`. Run `git tag` to list tags and find the one just created.
+9. **Merge** the branch into the main branch, wait for the build to succeed. Then navigate to the tag on Github and create a release from it _(could be pre-release)_
+10. **Deploy** the files to S3 (no overwrites) running the Github action workflow "Deploy to S3". By default it will use the main branch. If you are releasing a `v11` release, you need to select that.
+11. Make sure you are logged in to npm (run **`npm login`**).
+12. **Use the right package registry**: You may have configured `@tradeshift:registry https://npm.pkg.github.com/` (run `npm config list` to check, `npm config delete @tradeshift:registry` to reset registry to default (registry.npmjs.org), `npm config set @tradeshift:registry https://npm.pkg.github.com/` to add it back). The package must be released to https://npm.pkg.github.com/, but if you want it to show up at https://www.npmjs.com/package/@tradeshift/tradeshift-ui, you must also publish using default/no config entry for `@tradeshift:registry`.
+13. Go to the dist dir: **`cd dist/npm`**. In there, run **`npm publish --tag {tag_name}`**. The tag name must be `next` for `v11` releases, `latest` or not specified for latest release. This pushes the package to registry. **Note the following**:
+  If the tagging goes wrong and a v11 release is marked as `latest` in npm (`npm show @tradeshift/tradeshift-ui` to check), run `npm dist-tag add @tradeshift/tradeshift-ui@{LATEST_TS-UI_RELEASE} latest` (again, be aware of `@tradeshift:registry` config).
+
+### Automatic Release
+
+**- Currently not working -**
+
+Alternatively, releasing can be started using one of the following commands (but release-it needs to be fixed):
+
+1. Create a new branch. It will not work on the main branch.
+
+2. Make sure you have the following environment variables set:
 
 ```sh
 export AWS_ACCESS_KEY_ID=[Your AWS access key id]
 export AWS_SECRET_ACCESS_KEY=[Your AWS secret access key]
 export GH_ACCESS_TOK=[Your GitHub personal access token]
 ```
 
-Releasing can be started using one of the following commands:
+3. Run one of the following commands:
 
 ```sh
 # Let's say the current version is v10.0.0
@@ -106,8 +137,6 @@ Any of these commands will essentially do the following steps:
 - Release to GitHub _(could be pre-release)_ # Mark the tag as a GitHub Release
 - `npm publish` _(tag is latest or next)_ # Push the package to registry.npmjs.org
 
-Make sure to not do this on the `master` branch because it is protected from being pushed to directly and your code will get released to S3 but not to git/GitHub/npm.
-
 ## Updating the docs
 
 We serve the docs site from the `gh-pages` branch and all generated files are present in the `.gitignore` of the `master`-style branches. The `gh-pages` branch only contains these generated files, one folder for each major version since we introduced versioning to the docs (`v10`).

Repofile

@@ -0,0 +1,13 @@
+{
+    "description": "The Tradeshift UI Library & Framework",
+    "topics": [
+        "JavaScript",
+        "UI"
+    ],
+    "extraProtectedBranches": [
+        "v11"
+    ],
+    "maintainers": [
+        "partner-enablement-and-apps"
+    ]
+}

catalog-info.yml

@@ -19,5 +19,5 @@ metadata:
     - npm
 spec:
   type: library
-  owner: tradeshiftui
+  owner: partner-enablement-and-apps
   lifecycle: production

docs/Gruntfile.js

@@ -5,7 +5,6 @@ const bsshooter = require('./tasks/shooter.js');
 const cheerio = require('cheerio');
 const path = require('path');
 const fs = require('fs');
-const S = require('string');
 
 var stackconf = {
 	username: process.env.BROWSERSTACK_USERNAME,
@@ -32,6 +31,13 @@ module.exports = function(grunt) {
 	// autoload everything that looks like Grunt tasks
 	require('load-grunt-tasks')(grunt);
 
+	// import edbml tasks
+	require('load-grunt-config')(grunt, {
+		jitGrunt: {
+			customTasksDir: '../edbml/tasks'
+		}
+	});
+
 	// read config and apply local overrides (gitignored!)
 	var config = require('./tasks/config')
 		.init(grunt)
@@ -131,7 +137,7 @@ module.exports = function(grunt) {
 						cwd: 'src/js/',
 						dest: 'dist/assets/',
 						src: [
-							'angular-1.3.6.min.js',
+							'angular-1.8.8-xlts.min.js',
 							'jquery-2.2.4.min.js',
 							'template.js',
 							'lunr.min.js',
@@ -265,7 +271,7 @@ module.exports = function(grunt) {
 
 		concurrent: {
 			localdev: {
-				tasks: ['connect', 'watch', 'asciify:banner'],
+				tasks: ['connect', 'watch'],
 				options: {
 					logConcurrentOutput: true
 				}
@@ -313,16 +319,6 @@ module.exports = function(grunt) {
 					differs: 'screenshots/diffs/'
 				}
 			}
-		},
-
-		asciify: {
-			banner: {
-				text: 'Tradeshift UI',
-				options: {
-					font: 'graffiti',
-					log: true
-				}
-			}
 		}
 	});
 
@@ -468,10 +464,13 @@ module.exports = function(grunt) {
 			});
 			return pagesIndex;
 		}
+		function isHTMLFile(filename) {
+			return filename.substring(filename.length - 5, filename.length) === '.html';
+		}
 		function processFile(abspath, filename) {
 			var pageIndex;
 
-			if (S(filename).endsWith('.html')) {
+			if (isHTMLFile(filename)) {
 				pageIndex = processHTMLFile(abspath, filename);
 			}
 			return pageIndex;
@@ -488,7 +487,6 @@ module.exports = function(grunt) {
 			if (!(raw.includes('robots') && raw.includes('noindex'))) {
 				var content = ignoreHTML(raw);
 
-				// var title = require('string')(raw).between('<title>', '</title>').s;
 				var title;
 				var left = '<title>';
 				var right = '</title>';
@@ -502,13 +500,11 @@ module.exports = function(grunt) {
 					title = raw.slice(startPos + left.length, endPos);
 				}
 
-				// var href = require('string')(abspath).chompLeft(prefix).s;
 				var href = abspath;
 				if (abspath.indexOf(prefix) === 0) {
 					href = abspath.slice(prefix.length);
 				}
 
-				// content = require('string')(content).trim().stripTags().stripPunctuation().s;
 				content = content
 					.trim()
 					.replace(RegExp('</?[^<>]*>', 'gi'), '')