Merge pull request #371 from ef4/v2-addon

Proposed ember-moment v10

.eslintignore

@@ -4,15 +4,18 @@
 
 # compiled output
 /dist/
-/tmp/
+/test-app/dist
+/test-app/tmp
 
 # dependencies
 /bower_components/
 /node_modules/
+/test-app/node_modules
 
 # misc
 /coverage/
 !.*
+.*/
 .eslintcache
 
 # ember-try

.eslintrc.js

@@ -19,10 +19,7 @@ module.exports = {
   env: {
     browser: true,
   },
-  rules: {
-    // TODO: remove these
-    'ember/no-jquery': 0,
-  },
+  rules: {},
   overrides: [
     // node files
     {
@@ -31,17 +28,7 @@ module.exports = {
         '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**',
+        'addon-main.js',
       ],
       parserOptions: {
         sourceType: 'script',

.github/workflows/ci.yml

@@ -1,65 +1,61 @@
-name: CI
+name: Node CI
 
 on:
-  pull_request:
   push:
     branches:
       - main
-      - master
-  schedule:
-    - cron: '0 3 * * 0' # every Sunday at 3am
-
-env:
-  CI: true
+    tags:
+      - 'v*'
+  pull_request:
 
 jobs:
-  tests:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: Base Tests
-    timeout-minutes: 5
+  test:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node:
-          - '12'
-          - '14'
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
       - uses: volta-cli/action@v1
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - uses: actions/cache@v2
+        id: yarn-cache
         with:
-          node-version: ${{ matrix.node }}
-
-      - run: yarn install
-
-      - name: Test with ${{ matrix.node }}
-        run: node_modules/.bin/ember test
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v2
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - run: yarn --frozen-lockfile
+      - name: lint
+        run: yarn lint
+      - name: test
+        run: yarn test:ember
+      - id: set-matrix
+        run: echo "::set-output name=matrix::$(yarn --silent scenario-tester list --files ./scenarios.js --matrix 'yarn qunit ./scenarios.js --filter %s:')"
+        working-directory: test-app
 
-  try-scenarios:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: 'Compatibility'
-    timeout-minutes: 7
+  compat-scenarios:
+    needs: test
+    name: ${{ matrix.name }}
     runs-on: ubuntu-latest
-    needs: tests
-
     strategy:
-      fail-fast: true
-      matrix:
-        ember-try-scenario:
-          - ember-classic
-          - ember-lts-3.16
-          - ember-lts-3.20
-          - ember-lts-3.24
-          - ember-release
-          - ember-beta
-          - ember-canary
-          - embroider-safe
-          - embroider-optimized
+      fail-fast: false
+      matrix: ${{fromJson(needs.test.outputs.matrix)}}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
       - uses: volta-cli/action@v1
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - uses: actions/cache@v2
+        id: yarn-cache
         with:
-          node-version: 12.x
-      - name: install dependencies
-        run: yarn install
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-v2
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - run: yarn install --no-lockfile
       - name: test
-        run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+        run: ${{ matrix.command }}
+        working-directory: test-app

.gitignore

@@ -1,12 +1,13 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist/
-/tmp/
+/dist
+/test-app/dist/
+/test-app/tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
+/test-app/node_modules
 
 # misc
 /.env*

.template-lintrc.js

@@ -2,4 +2,10 @@
 
 module.exports = {
   extends: 'octane',
+  rules: {
+    // temporarily disabling these because they were already failing
+    'no-implicit-this': 'off',
+    'no-curly-component-invocation': 'off',
+    'no-action': 'off',
+  },
 };

CHANGELOG.md

@@ -1,3 +1,9 @@
+### master
+
+ * [BREAKING] This addon no longer provides the `moment` library itself. Apps should depend directly on *either* `moment` or `moment-timezone` and import it via `ember-auto-import`. Apps should make sure to remove any dependencies on `ember-cli-moment-shim`. See "Using Moment in Ember Apps & Addons" in the README.
+ * [BREAKING] This is a v2 addon so your app must have `ember-auto-import` >= 2.
+ * [BREAKING] `includeTimezone`, `includeLocales`, and `localeOutputPath` options in `config/environment.js` are removed, since this addon is no longer responsible for providing `moment`.
+
 ### 9.0.1
 
 * @jfdnc fix error related to not having `defaultFormat` configured #363