From f7b39c0914017ca4d0aac41a8bd3cc2e1d236af8 Mon Sep 17 00:00:00 2001 From: Niklas von Hertzen Date: Sat, 8 Aug 2020 16:00:41 +0800 Subject: [PATCH] update npm build (#2316) --- .github/workflows/ci.yml | 2 +- .npmignore | 18 ++--- azure-pipelines.yml | 171 --------------------------------------- ci/browser-tests.yml | 55 ------------- 4 files changed, 10 insertions(+), 236 deletions(-) delete mode 100644 azure-pipelines.yml delete mode 100644 ci/browser-tests.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb714ca..4332264 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -231,7 +231,7 @@ jobs: node-version: 12 registry-url: 'https://registry.npmjs.org' - name: NPM Publish - run: cd npm/package && npm publish --dry-run + run: cd npm/package && npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} docs: diff --git a/.npmignore b/.npmignore index 6233870..9e5332a 100644 --- a/.npmignore +++ b/.npmignore @@ -1,4 +1,8 @@ +.github/ +.idea/ +.rpt2_cache build/ +configs/ docs/ examples/ scripts/ @@ -6,17 +10,13 @@ src/ tests/ www/ tmp/ -.github/ *.iml .babelrc -.idea/ .editorconfig -.npmignore .eslintrc -.travis.yml -azure-pipelines.yml -karma.js +.npmignore +.prettierrc +jest.config.js karma.conf.js -rollup.config.js -webpack.config.js -.rpt2_cache +karma.js +rollup.config.ts diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 34019b5..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,171 +0,0 @@ -trigger: -- master - -jobs: - - job: Build - displayName: Build - pool: - vmImage: 'Ubuntu-16.04' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' - - task: Npm@0 - inputs: - command: install - - script: npm run build - displayName: Build - - script: | - npm pack - mv html2canvas-*.tgz html2canvas.tgz - tar --list --verbose --file=html2canvas.tgz - displayName: Pack - name: pack - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: html2canvas.tgz - artifactName: npm - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: 'dist' - artifactName: dist - - task: PublishBuildArtifacts@1 - inputs: - PathtoPublish: 'build' - artifactName: build - - - job: Test - displayName: Tests - pool: - vmImage: 'Ubuntu-16.04' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' - - task: Npm@0 - inputs: - command: install - - script: npm run build - displayName: Build - - script: npm run lint - displayName: Lint - - script: npm run unittest - displayName: Unit tests - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_Linux_Firefox_Stable - displayName: Linux Firefox Stable - vmImage: 'ubuntu-16.04' - targetBrowser: Firefox_Stable - xvfb: true - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_Linux_Chrome_Stable - displayName: Linux Chrome Stable - vmImage: 'ubuntu-16.04' - targetBrowser: Chrome_Stable - xvfb: true - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_OSX_Safari_IOS_9 - displayName: iOS Simulator Safari 9 - vmImage: 'macOS-10.14' - targetBrowser: Safari_IOS_9 - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_OSX_Safari_IOS_10 - displayName: iOS Simulator Safari 10 - vmImage: 'macOS-10.14' - targetBrowser: Safari_IOS_10 - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_OSX_Safari_IOS_12 - displayName: iOS Simulator Safari 12 - vmImage: 'macOS-10.14' - targetBrowser: Safari_IOS_12 - xcodeSelection: '/Applications/Xcode_10.1.app' - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_OSX_Safari_Stable - displayName: OSX Safari Stable - vmImage: 'macOS-10.14' - targetBrowser: Safari_Stable - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_Windows_IE9 - displayName: Windows Internet Explorer 9 (Emulated) - vmImage: 'vs2017-win2016' - targetBrowser: IE_9 - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_Windows_IE10 - displayName: Windows Internet Explorer 10 (Emulated) - vmImage: 'vs2017-win2016' - targetBrowser: IE_10 - - - template: ci/browser-tests.yml - parameters: - name: Browser_Tests_Windows_IE11 - displayName: Windows Internet Explorer 11 - vmImage: 'vs2017-win2016' - targetBrowser: IE_11 - - - job: Build_docs - displayName: Build docs - pool: - vmImage: 'Ubuntu-16.04' - dependsOn: - - Browser_Tests_Linux_Firefox_Stable - - Browser_Tests_Linux_Chrome_Stable - - Browser_Tests_OSX_Safari_IOS_9 - - Browser_Tests_OSX_Safari_IOS_10 - - Browser_Tests_OSX_Safari_IOS_12 - - Browser_Tests_OSX_Safari_Stable - - Browser_Tests_Windows_IE9 - - Browser_Tests_Windows_IE10 - - Browser_Tests_Windows_IE11 - steps: - - task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' - - task: Npm@0 - inputs: - command: install - - task: DownloadBuildArtifacts@0 - displayName: 'Download test results' - inputs: - artifactName: ReftestResults - downloadPath: $(System.DefaultWorkingDirectory) - - task: DownloadBuildArtifacts@0 - displayName: 'Download dist' - inputs: - artifactName: dist - downloadPath: $(System.DefaultWorkingDirectory) - - script: cp -R tests/reftests www/static/tests/reftests && cp -R tests/assets www/static/tests/assets && cp tests/test.js www/static/tests/test.js && cp -R ReftestResults ./www/static/results - displayName: Copy reftests to docs website - - script: cp -R dist ./www/static/dist - displayName: Copy dist to docs website - - script: npm run build:reftest-result-list www/static/results/metadata www/src/results.json - displayName: Create reftest result index - - script: npm run build:reftest-preview - displayName: Create reftest previewer - - script: rm -rf www/static/results/metadata - displayName: Clean metadata folder - - script: npm run build && cd www && npm install && npm run build && cd .. - displayName: Build docs - - task: PublishBuildArtifacts@1 - displayName: Upload docs website artifact - inputs: - PathtoPublish: 'www/public' - artifactName: docs diff --git a/ci/browser-tests.yml b/ci/browser-tests.yml deleted file mode 100644 index 5ee2b91..0000000 --- a/ci/browser-tests.yml +++ /dev/null @@ -1,55 +0,0 @@ -parameters: - name: '' - vmImage: '' - targetBrowser: '' - xvfb: false - -jobs: - - job: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - pool: - vmImage: ${{ parameters.vmImage }} - variables: - TARGET_BROWSER: ${{ parameters.targetBrowser }} - dependsOn: Build - condition: succeeded() - steps: - - task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' - - task: Npm@0 - inputs: - command: install - - task: DownloadBuildArtifacts@0 - displayName: 'Download library' - inputs: - artifactName: dist - downloadPath: $(System.DefaultWorkingDirectory) - - task: DownloadBuildArtifacts@0 - displayName: 'Download testrunner' - inputs: - artifactName: build - downloadPath: $(System.DefaultWorkingDirectory) - - ${{ if ne(parameters.xcodeSelection, '') }}: - - script: sudo xcode-select -s "${{ parameters.xcodeSelection }}" - displayName: 'Switch Xcode' - - ${{ if not(eq(parameters.xvfb, 'true')) }}: - - script: npm run karma - displayName: 'Run browser tests' - - ${{ if eq(parameters.xvfb, 'true') }}: - - script: Xvfb :99 & - displayName: 'Start Xvfb' - - script: DISPLAY=:99 npm run karma - displayName: 'Run browser tests' - - task: PublishTestResults@2 - condition: succeededOrFailed() - inputs: - testRunner: JUnit - testResultsFiles: 'tmp/junit/*.xml' - - task: PublishBuildArtifacts@1 - displayName: Upload Screenshots - condition: succeededOrFailed() - inputs: - PathtoPublish: 'tmp/reftests' - artifactName: ReftestResults