From 53cd99c8ba23f9e8b5846e766021407d589e7fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Andr=C3=A9?= Date: Thu, 20 May 2021 21:55:18 -0300 Subject: [PATCH 1/6] Fix regex in asset/resources' --- packages/toolkit/config/webpack/modules.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolkit/config/webpack/modules.js b/packages/toolkit/config/webpack/modules.js index d8ee5dcc..76601ff4 100644 --- a/packages/toolkit/config/webpack/modules.js +++ b/packages/toolkit/config/webpack/modules.js @@ -96,7 +96,7 @@ module.exports = ({ }, // when in package module only include referenced resources isPackage && { - test: /\.{jpg,jpeg,png,gif,svg,eot,ttf,woff,woff2}/, + test: /\.(woff(2)?|ttf|eot|svg|jpg|jpeg|png|giff|webp)(\?v=\d+\.\d+\.\d+)?$/, type: 'asset/resource', }, ].filter(Boolean), From 0824da3656eeb9e6a717bbd1f2f02f981f4152f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Andr=C3=A9?= Date: Fri, 21 May 2021 16:06:07 -0300 Subject: [PATCH 2/6] Updating snapshot tests and adding github actions to test building projects --- .github/workflows/build-test-projects.yml | 36 ++++++++++++++++++ .../__snapshots__/webpack.config.js.snap | 8 ++-- projects/library/package.json | 2 +- .../library/src/assets/fonts/MrGeorge.ttf | Bin 0 -> 49564 bytes .../src/assets/fonts/MrGeorgeHeavy.ttf | Bin 0 -> 49844 bytes projects/library/src/style.css | 16 ++++++++ 6 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/build-test-projects.yml create mode 100644 projects/library/src/assets/fonts/MrGeorge.ttf create mode 100644 projects/library/src/assets/fonts/MrGeorgeHeavy.ttf diff --git a/.github/workflows/build-test-projects.yml b/.github/workflows/build-test-projects.yml new file mode 100644 index 00000000..f14e65d9 --- /dev/null +++ b/.github/workflows/build-test-projects.yml @@ -0,0 +1,36 @@ +name: unit tests + +on: [pull_request] + +jobs: + unit-tests: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [12.x, 14.x, 15.x] + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Setup Node ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + + - name: Setup npm cache + uses: actions/cache@v1 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + - name: Install dependencies + run: npm install --legacy-peer-deps + - name: build 10up theme + run: (cd projects/10up-theme && npm run build) + - name: build library + run: (cd projects/library && npm run build) + - name: build ts library + run: (cd projects/library && npm run build) \ No newline at end of file diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap index cc933b05..238c3082 100644 --- a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap +++ b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap @@ -99,7 +99,7 @@ Object { ], }, Object { - "test": /\\\\\\.\\{jpg,jpeg,png,gif,svg,eot,ttf,woff,woff2\\}/, + "test": /\\\\\\.\\(woff\\(2\\)\\?\\|ttf\\|eot\\|svg\\|jpg\\|jpeg\\|png\\|giff\\|webp\\)\\(\\\\\\?v=\\\\d\\+\\\\\\.\\\\d\\+\\\\\\.\\\\d\\+\\)\\?\\$/, "type": "asset/resource", }, ], @@ -413,7 +413,7 @@ Object { ], }, Object { - "test": /\\\\\\.\\{jpg,jpeg,png,gif,svg,eot,ttf,woff,woff2\\}/, + "test": /\\\\\\.\\(woff\\(2\\)\\?\\|ttf\\|eot\\|svg\\|jpg\\|jpeg\\|png\\|giff\\|webp\\)\\(\\\\\\?v=\\\\d\\+\\\\\\.\\\\d\\+\\\\\\.\\\\d\\+\\)\\?\\$/, "type": "asset/resource", }, ], @@ -576,7 +576,7 @@ Object { ], }, Object { - "test": /\\\\\\.\\{jpg,jpeg,png,gif,svg,eot,ttf,woff,woff2\\}/, + "test": /\\\\\\.\\(woff\\(2\\)\\?\\|ttf\\|eot\\|svg\\|jpg\\|jpeg\\|png\\|giff\\|webp\\)\\(\\\\\\?v=\\\\d\\+\\\\\\.\\\\d\\+\\\\\\.\\\\d\\+\\)\\?\\$/, "type": "asset/resource", }, ], @@ -748,7 +748,7 @@ Object { ], }, Object { - "test": /\\\\\\.\\{jpg,jpeg,png,gif,svg,eot,ttf,woff,woff2\\}/, + "test": /\\\\\\.\\(woff\\(2\\)\\?\\|ttf\\|eot\\|svg\\|jpg\\|jpeg\\|png\\|giff\\|webp\\)\\(\\\\\\?v=\\\\d\\+\\\\\\.\\\\d\\+\\\\\\.\\\\d\\+\\)\\?\\$/, "type": "asset/resource", }, ], diff --git a/projects/library/package.json b/projects/library/package.json index b4d20323..9996327c 100644 --- a/projects/library/package.json +++ b/projects/library/package.json @@ -39,7 +39,7 @@ "10up-toolkit": "1.0.4", "concurrently": "^5.3.0" }, - "@10up/scripts": { + "10up-toolkit": { "libraryName": "TenUpAccordion" } } diff --git a/projects/library/src/assets/fonts/MrGeorge.ttf b/projects/library/src/assets/fonts/MrGeorge.ttf new file mode 100644 index 0000000000000000000000000000000000000000..965a1f0ce96ec951aeb54dad473ad245bc09e975 GIT binary patch literal 49564 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 literal 0 HcmV?d00001 diff --git a/projects/library/src/assets/fonts/MrGeorgeHeavy.ttf b/projects/library/src/assets/fonts/MrGeorgeHeavy.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3d0f623f82f637e2bb84bfd60e59512858efef82 GIT binary patch literal 49844 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 Date: Fri, 21 May 2021 16:07:38 -0300 Subject: [PATCH 3/6] Updating workflow name --- .github/workflows/build-test-projects.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-projects.yml b/.github/workflows/build-test-projects.yml index f14e65d9..0a8721f1 100644 --- a/.github/workflows/build-test-projects.yml +++ b/.github/workflows/build-test-projects.yml @@ -1,4 +1,4 @@ -name: unit tests +name: projects builds on: [pull_request] From e0c3b7aa0c27121e4eb65ca921e0f1e93d527dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Andr=C3=A9?= Date: Fri, 21 May 2021 17:50:45 -0300 Subject: [PATCH 4/6] Updates --- .github/workflows/build-test-projects.yml | 2 +- .../__snapshots__/webpack.config.js.snap | 84 +++++++++++++++---- packages/toolkit/config/webpack/externals.js | 2 +- .../10up-theme/assets/js/frontend/frontend.ts | 4 +- projects/10up-theme/package.json | 3 +- projects/library/package.json | 9 -- 6 files changed, 77 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build-test-projects.yml b/.github/workflows/build-test-projects.yml index 0a8721f1..0d914128 100644 --- a/.github/workflows/build-test-projects.yml +++ b/.github/workflows/build-test-projects.yml @@ -33,4 +33,4 @@ jobs: - name: build library run: (cd projects/library && npm run build) - name: build ts library - run: (cd projects/library && npm run build) \ No newline at end of file + run: (cd projects/library-ts && npm run build) \ No newline at end of file diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap index 238c3082..8bd3b4b3 100644 --- a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap +++ b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap @@ -21,10 +21,26 @@ Object { }, }, "externals": Object { - "lodash": "lodash", - "read-pkg": "read-pkg", - "read-pkg-up": "read-pkg-up", - "resolve-bin": "resolve-bin", + "lodash": Object { + "amd": "lodash", + "commonjs": "lodash", + "commonjs2": "lodash", + }, + "read-pkg": Object { + "amd": "read-pkg", + "commonjs": "read-pkg", + "commonjs2": "read-pkg", + }, + "read-pkg-up": Object { + "amd": "read-pkg-up", + "commonjs": "read-pkg-up", + "commonjs2": "read-pkg-up", + }, + "resolve-bin": Object { + "amd": "resolve-bin", + "commonjs": "resolve-bin", + "commonjs2": "resolve-bin", + }, }, "mode": "development", "module": Object { @@ -315,9 +331,21 @@ Object { }, }, "externals": Object { - "read-pkg": "read-pkg", - "read-pkg-up": "read-pkg-up", - "resolve-bin": "resolve-bin", + "read-pkg": Object { + "amd": "read-pkg", + "commonjs": "read-pkg", + "commonjs2": "read-pkg", + }, + "read-pkg-up": Object { + "amd": "read-pkg-up", + "commonjs": "read-pkg-up", + "commonjs2": "read-pkg-up", + }, + "resolve-bin": Object { + "amd": "resolve-bin", + "commonjs": "resolve-bin", + "commonjs2": "resolve-bin", + }, }, "mode": "development", "module": Object { @@ -478,9 +506,21 @@ Object { }, }, "externals": Object { - "read-pkg": "read-pkg", - "read-pkg-up": "read-pkg-up", - "resolve-bin": "resolve-bin", + "read-pkg": Object { + "amd": "read-pkg", + "commonjs": "read-pkg", + "commonjs2": "read-pkg", + }, + "read-pkg-up": Object { + "amd": "read-pkg-up", + "commonjs": "read-pkg-up", + "commonjs2": "read-pkg-up", + }, + "resolve-bin": Object { + "amd": "resolve-bin", + "commonjs": "resolve-bin", + "commonjs2": "resolve-bin", + }, }, "mode": "development", "module": Object { @@ -649,10 +689,26 @@ Object { }, }, "externals": Object { - "lodash": "lodash", - "read-pkg": "read-pkg", - "read-pkg-up": "read-pkg-up", - "resolve-bin": "resolve-bin", + "lodash": Object { + "amd": "lodash", + "commonjs": "lodash", + "commonjs2": "lodash", + }, + "read-pkg": Object { + "amd": "read-pkg", + "commonjs": "read-pkg", + "commonjs2": "read-pkg", + }, + "read-pkg-up": Object { + "amd": "read-pkg-up", + "commonjs": "read-pkg-up", + "commonjs2": "read-pkg-up", + }, + "resolve-bin": Object { + "amd": "resolve-bin", + "commonjs": "resolve-bin", + "commonjs2": "resolve-bin", + }, }, "mode": "development", "module": Object { diff --git a/packages/toolkit/config/webpack/externals.js b/packages/toolkit/config/webpack/externals.js index 885409a3..0a12403c 100644 --- a/packages/toolkit/config/webpack/externals.js +++ b/packages/toolkit/config/webpack/externals.js @@ -1,7 +1,7 @@ module.exports = ({ isPackage, packageConfig: { externals } }) => { if (isPackage) { return externals.reduce((acc, current) => { - acc[current] = current; + acc[current] = { commonjs: current, commonjs2: current, amd: current }; return acc; }, {}); } diff --git a/projects/10up-theme/assets/js/frontend/frontend.ts b/projects/10up-theme/assets/js/frontend/frontend.ts index 84e94fe5..b87ea70c 100755 --- a/projects/10up-theme/assets/js/frontend/frontend.ts +++ b/projects/10up-theme/assets/js/frontend/frontend.ts @@ -1,7 +1,9 @@ -// import foo from './components/bar'; +import { Accordion } from '@10up/component-accordion'; function helloTypeScript(name: string) { return `Hello ${name}, this is TypeScript!`; } document.write(helloTypeScript('10up')); + +new Accordion('.test', {}); diff --git a/projects/10up-theme/package.json b/projects/10up-theme/package.json index 51ca07dc..ca7b1817 100644 --- a/projects/10up-theme/package.json +++ b/projects/10up-theme/package.json @@ -18,7 +18,8 @@ }, "dependencies": { "normalize.css": "^8.0.1", - "prop-types": "^15.7.2" + "prop-types": "^15.7.2", + "@10up/component-accordion": "2.0.1" }, "@10up/scripts": { "devURL": "https://my-project.test", diff --git a/projects/library/package.json b/projects/library/package.json index 9996327c..1020b15a 100644 --- a/projects/library/package.json +++ b/projects/library/package.json @@ -4,24 +4,15 @@ "author": "10up", "description": "Accessible accordion component.", "main": "dist/index.js", - "exports": "./dist/index.modern.js", "umd:main": "dist/index.umd.js", - "module": "dist/index.module.js", "source": "src/index.js", "style": "./dist/index.css", - "types": "./index.d.ts", "scripts": { "watch": "concurrently \"npm run build:modern -- --watch\" \"npm run build:umd -- --watch\"", "build": "npm run build:modern && npm run build:umd", "build:modern": "10up-toolkit build -f=commonjs", "build:umd": "10up-toolkit build -f=umd -i=src/index.umd.js --name=TenUpAccordion --external=none" }, - "browserslist": [ - "> 1%", - "ie >= 11", - "last 2 versions", - "Firefox ESR" - ], "repository": { "type": "git", "url": "git+https://github.com/10up/component-accordion.git" From 8f23cf8a1ad20724ed18fd17a8c3f8d804907538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Andr=C3=A9?= Date: Fri, 21 May 2021 18:00:13 -0300 Subject: [PATCH 5/6] GH action: building library first --- .github/workflows/build-test-projects.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-projects.yml b/.github/workflows/build-test-projects.yml index 0d914128..885adb80 100644 --- a/.github/workflows/build-test-projects.yml +++ b/.github/workflows/build-test-projects.yml @@ -28,9 +28,9 @@ jobs: ${{ runner.os }}-node- - name: Install dependencies run: npm install --legacy-peer-deps - - name: build 10up theme - run: (cd projects/10up-theme && npm run build) - name: build library run: (cd projects/library && npm run build) - name: build ts library - run: (cd projects/library-ts && npm run build) \ No newline at end of file + run: (cd projects/library-ts && npm run build) + - name: build 10up theme + run: (cd projects/10up-theme && npm run build) \ No newline at end of file From 2e6031abed7c40fe42f9e5d1cee61155d9dd0121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=ADcholas=20Andr=C3=A9?= Date: Fri, 21 May 2021 23:14:10 -0300 Subject: [PATCH 6/6] Fix issue with babel and webpack integration --- .../config/__tests__/__snapshots__/webpack.config.js.snap | 4 ++++ packages/toolkit/config/webpack/modules.js | 1 + packages/toolkit/utils/config.js | 4 +++- projects/10up-theme/assets/js/frontend/frontend.ts | 4 +--- projects/10up-theme/assets/js/shared/shared.js | 4 +++- projects/library/package.json | 2 +- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap index 8bd3b4b3..d61ceccb 100644 --- a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap +++ b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap @@ -376,6 +376,7 @@ Object { }, ], ], + "sourceType": "unambiguous", }, }, ], @@ -551,6 +552,7 @@ Object { }, ], ], + "sourceType": "unambiguous", }, }, ], @@ -739,6 +741,7 @@ Object { }, ], ], + "sourceType": "unambiguous", }, }, ], @@ -897,6 +900,7 @@ Object { }, ], ], + "sourceType": "unambiguous", }, }, ], diff --git a/packages/toolkit/config/webpack/modules.js b/packages/toolkit/config/webpack/modules.js index 76601ff4..ef035784 100644 --- a/packages/toolkit/config/webpack/modules.js +++ b/packages/toolkit/config/webpack/modules.js @@ -56,6 +56,7 @@ module.exports = ({ ...(!hasBabelConfig() && { babelrc: false, configFile: false, + sourceType: 'unambiguous', presets: [ [ require.resolve('@10up/babel-preset-default'), diff --git a/packages/toolkit/utils/config.js b/packages/toolkit/utils/config.js index 4cced16d..871c268b 100644 --- a/packages/toolkit/utils/config.js +++ b/packages/toolkit/utils/config.js @@ -101,11 +101,13 @@ function getJestOverrideConfigFile(suffix) { const hasEslintignoreConfig = () => hasProjectFile('.eslintignore'); const getDefaultConfig = () => { + const wpMode = getArgFromCLI('--wp'); + return { entry: require(fromConfigRoot('buildfiles.config.js')), filenames: require(fromConfigRoot('filenames.config.js')), paths: require(fromConfigRoot('paths.config.js')), - wordpress: true, + wordpress: wpMode !== 'false', // true by default (if TENUP_NO_EXTERNALS is not set) // if TENUP_NO_EXTERNALS is truthy then dependecyExternals is false wpDependencyExternals: diff --git a/projects/10up-theme/assets/js/frontend/frontend.ts b/projects/10up-theme/assets/js/frontend/frontend.ts index b87ea70c..20f28d68 100755 --- a/projects/10up-theme/assets/js/frontend/frontend.ts +++ b/projects/10up-theme/assets/js/frontend/frontend.ts @@ -1,9 +1,7 @@ -import { Accordion } from '@10up/component-accordion'; - function helloTypeScript(name: string) { return `Hello ${name}, this is TypeScript!`; } document.write(helloTypeScript('10up')); -new Accordion('.test', {}); + diff --git a/projects/10up-theme/assets/js/shared/shared.js b/projects/10up-theme/assets/js/shared/shared.js index 3ad9e511..01336335 100755 --- a/projects/10up-theme/assets/js/shared/shared.js +++ b/projects/10up-theme/assets/js/shared/shared.js @@ -1 +1,3 @@ -// import foo from './bar' +import Accordion from '@10up/component-accordion'; + +new Accordion('.test', {}); diff --git a/projects/library/package.json b/projects/library/package.json index 1020b15a..b45cadfb 100644 --- a/projects/library/package.json +++ b/projects/library/package.json @@ -10,7 +10,7 @@ "scripts": { "watch": "concurrently \"npm run build:modern -- --watch\" \"npm run build:umd -- --watch\"", "build": "npm run build:modern && npm run build:umd", - "build:modern": "10up-toolkit build -f=commonjs", + "build:modern": "10up-toolkit build -f=commonjs --wp=false", "build:umd": "10up-toolkit build -f=umd -i=src/index.umd.js --name=TenUpAccordion --external=none" }, "repository": {